Skip to content

Commit 39c2ecb

Browse files
mikehardymikehardy
committed
fix(android): use = assignment vs deprecated space-assignment
gradle 10 will remove space-assignment, so we need to forward port note that the Invertase gradle plugin still uses space assignment, so this work is not complete yet
1 parent 1187d45 commit 39c2ecb

File tree

20 files changed

+132
-132
lines changed

20 files changed

+132
-132
lines changed

‎packages/analytics/android/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ if (rootProject.ext && rootProject.ext.firebaseJson) {
119119
android {
120120
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
121121
if (agpVersion >= 7) {
122-
namespace 'io.invertase.firebase.analytics'
122+
namespace = 'io.invertase.firebase.analytics'
123123
}
124124

125125
defaultConfig {
126-
multiDexEnabled true
126+
multiDexEnabled = true
127127
manifestPlaceholders = [
128128
firebaseJsonAutoCollectionEnabled: dataCollectionEnabled,
129129
firebaseJsonCollectionDeactivated: collectionDeactivated,
@@ -139,18 +139,18 @@ android {
139139

140140
buildFeatures {
141141
// AGP 8 no longer builds config by default
142-
buildConfig true
142+
buildConfig = true
143143
}
144144

145145
lintOptions {
146146
disable 'GradleCompatible'
147-
abortOnError false
147+
abortOnError = false
148148
}
149149

150150
if (agpVersion < 8) {
151151
compileOptions {
152-
sourceCompatibility JavaVersion.VERSION_11
153-
targetCompatibility JavaVersion.VERSION_11
152+
sourceCompatibility = JavaVersion.VERSION_11
153+
targetCompatibility = JavaVersion.VERSION_11
154154
}
155155
}
156156

‎packages/app-check/android/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,29 +62,29 @@ project.ext {
6262
android {
6363
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
6464
if (agpVersion >= 7) {
65-
namespace 'io.invertase.firebase.appcheck'
65+
namespace = 'io.invertase.firebase.appcheck'
6666
}
6767

6868
defaultConfig {
69-
multiDexEnabled true
69+
multiDexEnabled = true
7070
// Here we add a build config field to allow devs to provide a
7171
// FIREBASE_APP_CHECK_DEBUG_TOKEN to be used in debug mode.
7272
buildConfigField "String", "FIREBASE_APP_CHECK_DEBUG_TOKEN", "\"${System.env.FIREBASE_APP_CHECK_DEBUG_TOKEN}\""
7373
}
7474

7575
buildFeatures {
7676
// AGP 8 no longer builds config by default
77-
buildConfig true
77+
buildConfig = true
7878
}
7979

8080
lintOptions {
8181
disable 'GradleCompatible'
82-
abortOnError false
82+
abortOnError = false
8383
}
8484
if (agpVersion < 8) {
8585
compileOptions {
86-
sourceCompatibility JavaVersion.VERSION_11
87-
targetCompatibility JavaVersion.VERSION_11
86+
sourceCompatibility = JavaVersion.VERSION_11
87+
targetCompatibility = JavaVersion.VERSION_11
8888
}
8989
}
9090
sourceSets {

‎packages/app-distribution/android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,21 @@ project.ext {
6262
android {
6363
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
6464
if (agpVersion >= 7) {
65-
namespace 'io.invertase.firebase.appdistribution'
65+
namespace = 'io.invertase.firebase.appdistribution'
6666
}
6767

6868
defaultConfig {
69-
multiDexEnabled true
69+
multiDexEnabled = true
7070
}
7171
lintOptions {
7272
disable 'GradleCompatible'
73-
abortOnError false
73+
abortOnError = false
7474
}
7575

7676
if (agpVersion < 8) {
7777
compileOptions {
78-
sourceCompatibility JavaVersion.VERSION_11
79-
targetCompatibility JavaVersion.VERSION_11
78+
sourceCompatibility = JavaVersion.VERSION_11
79+
targetCompatibility = JavaVersion.VERSION_11
8080
}
8181
}
8282

‎packages/app/android/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,29 +62,29 @@ if (rootProject.ext && rootProject.ext.firebaseJson) {
6262
android {
6363
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
6464
if (agpVersion >= 7) {
65-
namespace 'io.invertase.firebase'
65+
namespace = 'io.invertase.firebase'
6666
}
6767

6868
defaultConfig {
69-
multiDexEnabled true
69+
multiDexEnabled = true
7070
manifestPlaceholders = [
7171
firebaseJsonDataCollectionDefaultEnabled: dataCollectionDefaultEnabled
7272
]
7373
}
7474

7575
buildFeatures {
7676
// AGP 8 no longer builds config by default
77-
buildConfig true
77+
buildConfig = true
7878
}
7979

8080
lintOptions {
8181
disable 'GradleCompatible'
82-
abortOnError false
82+
abortOnError = false
8383
}
8484
if (agpVersion < 8) {
8585
compileOptions {
86-
sourceCompatibility JavaVersion.VERSION_11
87-
targetCompatibility JavaVersion.VERSION_11
86+
sourceCompatibility = JavaVersion.VERSION_11
87+
targetCompatibility = JavaVersion.VERSION_11
8888
}
8989
}
9090

‎packages/auth/android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,20 @@ project.ext {
6161
android {
6262
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
6363
if (agpVersion >= 7) {
64-
namespace 'io.invertase.firebase.auth'
64+
namespace = 'io.invertase.firebase.auth'
6565
}
6666

6767
defaultConfig {
68-
multiDexEnabled true
68+
multiDexEnabled = true
6969
}
7070
lintOptions {
7171
disable 'GradleCompatible'
72-
abortOnError false
72+
abortOnError = false
7373
}
7474
if (agpVersion < 8) {
7575
compileOptions {
76-
sourceCompatibility JavaVersion.VERSION_11
77-
targetCompatibility JavaVersion.VERSION_11
76+
sourceCompatibility = JavaVersion.VERSION_11
77+
targetCompatibility = JavaVersion.VERSION_11
7878
}
7979
}
8080
}

‎packages/crashlytics/android/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,26 @@ project.ext {
6262
android {
6363
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
6464
if (agpVersion >= 7) {
65-
namespace 'io.invertase.firebase.crashlytics'
65+
namespace = 'io.invertase.firebase.crashlytics'
6666
}
6767

6868
defaultConfig {
69-
multiDexEnabled true
69+
multiDexEnabled = true
7070
}
7171

7272
buildFeatures {
7373
// AGP 8 no longer builds config by default
74-
buildConfig true
74+
buildConfig = true
7575
}
7676

7777
lintOptions {
7878
disable 'GradleCompatible'
79-
abortOnError false
79+
abortOnError = false
8080
}
8181
if (agpVersion < 8) {
8282
compileOptions {
83-
sourceCompatibility JavaVersion.VERSION_11
84-
targetCompatibility JavaVersion.VERSION_11
83+
sourceCompatibility = JavaVersion.VERSION_11
84+
targetCompatibility = JavaVersion.VERSION_11
8585
}
8686
}
8787
}

‎packages/database/android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,20 @@ project.ext {
6262
android {
6363
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
6464
if (agpVersion >= 7) {
65-
namespace 'io.invertase.firebase.database'
65+
namespace = 'io.invertase.firebase.database'
6666
}
6767

6868
defaultConfig {
69-
multiDexEnabled true
69+
multiDexEnabled = true
7070
}
7171
lintOptions {
7272
disable 'GradleCompatible'
73-
abortOnError false
73+
abortOnError = false
7474
}
7575
if (agpVersion < 8) {
7676
compileOptions {
77-
sourceCompatibility JavaVersion.VERSION_11
78-
targetCompatibility JavaVersion.VERSION_11
77+
sourceCompatibility = JavaVersion.VERSION_11
78+
targetCompatibility = JavaVersion.VERSION_11
7979
}
8080
}
8181
sourceSets {

‎packages/dynamic-links/android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,21 @@ project.ext {
6262
android {
6363
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
6464
if (agpVersion >= 7) {
65-
namespace 'io.invertase.firebase.dynamiclinks'
65+
namespace = 'io.invertase.firebase.dynamiclinks'
6666
}
6767

6868
defaultConfig {
69-
multiDexEnabled true
69+
multiDexEnabled = true
7070
}
7171
lintOptions {
7272
disable 'GradleCompatible'
73-
abortOnError false
73+
abortOnError = false
7474
}
7575

7676
if (agpVersion < 8) {
7777
compileOptions {
78-
sourceCompatibility JavaVersion.VERSION_11
79-
targetCompatibility JavaVersion.VERSION_11
78+
sourceCompatibility = JavaVersion.VERSION_11
79+
targetCompatibility= JavaVersion.VERSION_11
8080
}
8181
}
8282
}

‎packages/firestore/android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,20 @@ project.ext {
6262
android {
6363
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
6464
if (agpVersion >= 7) {
65-
namespace 'io.invertase.firebase.firestore'
65+
namespace = 'io.invertase.firebase.firestore'
6666
}
6767

6868
defaultConfig {
69-
multiDexEnabled true
69+
multiDexEnabled = true
7070
}
7171
lintOptions {
7272
disable 'GradleCompatible'
73-
abortOnError false
73+
abortOnError = false
7474
}
7575
if (agpVersion < 8) {
7676
compileOptions {
77-
sourceCompatibility JavaVersion.VERSION_11
78-
targetCompatibility JavaVersion.VERSION_11
77+
sourceCompatibility = JavaVersion.VERSION_11
78+
targetCompatibility = JavaVersion.VERSION_11
7979
}
8080
}
8181
sourceSets {

‎packages/functions/android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,21 @@ project.ext {
6262
android {
6363
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
6464
if (agpVersion >= 7) {
65-
namespace 'io.invertase.firebase.functions'
65+
namespace = 'io.invertase.firebase.functions'
6666
}
6767

6868
defaultConfig {
69-
multiDexEnabled true
69+
multiDexEnabled = true
7070
}
7171
lintOptions {
7272
disable 'GradleCompatible'
73-
abortOnError false
73+
abortOnError = false
7474
}
7575

7676
if (agpVersion < 8) {
7777
compileOptions {
78-
sourceCompatibility JavaVersion.VERSION_11
79-
targetCompatibility JavaVersion.VERSION_11
78+
sourceCompatibility = JavaVersion.VERSION_11
79+
targetCompatibility = JavaVersion.VERSION_11
8080
}
8181
}
8282

‎packages/in-app-messaging/android/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,30 +84,30 @@ if (rootProject.ext && rootProject.ext.firebaseJson) {
8484
android {
8585
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
8686
if (agpVersion >= 7) {
87-
namespace 'io.invertase.firebase.fiam'
87+
namespace = 'io.invertase.firebase.fiam'
8888
}
8989

9090
defaultConfig {
91-
multiDexEnabled true
91+
multiDexEnabled = true
9292
manifestPlaceholders = [
9393
firebaseJsonAutoInitEnabled: dataCollectionEnabled
9494
]
9595
}
9696

9797
buildFeatures {
9898
// AGP 8 no longer builds config by default
99-
buildConfig true
99+
buildConfig = true
100100
}
101101

102102
lintOptions {
103103
disable 'GradleCompatible'
104-
abortOnError false
104+
abortOnError = false
105105
}
106106

107107
if (agpVersion < 8) {
108108
compileOptions {
109-
sourceCompatibility JavaVersion.VERSION_11
110-
targetCompatibility JavaVersion.VERSION_11
109+
sourceCompatibility = JavaVersion.VERSION_11
110+
targetCompatibility = JavaVersion.VERSION_11
111111
}
112112
}
113113

‎packages/installations/android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,21 @@ project.ext {
6262
android {
6363
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
6464
if (agpVersion >= 7) {
65-
namespace 'io.invertase.firebase.installations'
65+
namespace = 'io.invertase.firebase.installations'
6666
}
6767

6868
defaultConfig {
69-
multiDexEnabled true
69+
multiDexEnabled = true
7070
}
7171
lintOptions {
7272
disable 'GradleCompatible'
73-
abortOnError false
73+
abortOnError = false
7474
}
7575

7676
if (agpVersion < 8) {
7777
compileOptions {
78-
sourceCompatibility JavaVersion.VERSION_11
79-
targetCompatibility JavaVersion.VERSION_11
78+
sourceCompatibility = JavaVersion.VERSION_11
79+
targetCompatibility = JavaVersion.VERSION_11
8080
}
8181
}
8282

0 commit comments

Comments
 (0)