updated kotlin & dependencies, using Firebase Android BoM (https://firebase.google.com/docs/android/learn-more#bom)

suntrix · suntrix · commit 98be2c0cd233 · 2021-07-26T11:18:50.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    kotlin("multiplatform") version "1.5.10" apply false
+    kotlin("multiplatform") version "1.5.21" apply false
     id("base")
 }
 
@@ -18,7 +18,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.2.1")
+        classpath("com.android.tools.build:gradle:4.2.2")
         classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")
     }
 }
@@ -208,18 +208,19 @@ subprojects {
 
         dependencies {
             "commonMainImplementation"(kotlin("stdlib-common"))
-            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
+            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
             "jsMainImplementation"(kotlin("stdlib-js"))
-            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.0")
+            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.1")
+            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.3.0"))
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
-            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
+            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
             "jsTestImplementation"(kotlin("test-js"))
             "androidAndroidTestImplementation"(kotlin("test-junit"))
             "androidAndroidTestImplementation"("junit:junit:4.13.2")
-            "androidAndroidTestImplementation"("androidx.test:core:1.3.0")
-            "androidAndroidTestImplementation"("androidx.test.ext:junit:1.1.2")
-            "androidAndroidTestImplementation"("androidx.test:runner:1.3.0")
+            "androidAndroidTestImplementation"("androidx.test:core:1.4.0")
+            "androidAndroidTestImplementation"("androidx.test.ext:junit:1.1.3")
+            "androidAndroidTestImplementation"("androidx.test:runner:1.4.0")
         }
     }
 
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -127,7 +127,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-common:20.0.0")
+                api("com.google.firebase:firebase-common-ktx")
             }
         }
 
diff --git a/firebase-app/package.json b/firebase-app/package.json
@@ -24,8 +24,8 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-common": "1.4.1",
-    "firebase": "8.6.7",
-    "kotlin": "1.5.10",
-    "kotlinx-coroutines-core": "1.5.0"
+    "firebase": "8.8.0",
+    "kotlin": "1.5.21",
+    "kotlinx-coroutines-core": "1.5.1"
   }
 }
diff --git a/firebase-app/src/nativeInterop/cinterop/Cartfile b/firebase-app/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.1.1
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.4.0
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -145,7 +145,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-auth:21.0.1")
+                api("com.google.firebase:firebase-auth-ktx")
             }
         }
 
diff --git a/firebase-auth/package.json b/firebase-auth/package.json
@@ -24,8 +24,8 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.4.1",
-    "firebase": "8.6.7",
-    "kotlin": "1.5.10",
-    "kotlinx-coroutines-core": "1.5.0"
+    "firebase": "8.8.0",
+    "kotlin": "1.5.21",
+    "kotlinx-coroutines-core": "1.5.1"
   }
 }
diff --git a/firebase-auth/src/nativeInterop/cinterop/Cartfile b/firebase-auth/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.1.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.4.0
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -9,7 +9,7 @@ version = project.property("firebase-common.version") as String
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
-    kotlin("plugin.serialization") version "1.5.10"
+    kotlin("plugin.serialization") version "1.5.21"
 }
 
 android {
@@ -89,21 +89,21 @@ kotlin {
 
         val commonMain by getting {
             dependencies {
-                api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.0")
+                api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.2")
             }
         }
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-common:20.0.0")
+                api("com.google.firebase:firebase-common-ktx")
             }
         }
 
         val iosMain by getting
 
         val jsMain by getting {
             dependencies {
-                api(npm("firebase", "8.2.0"))
+                api(npm("firebase", "8.7.1"))
             }
         }
     }
diff --git a/firebase-common/package.json b/firebase-common/package.json
@@ -23,9 +23,9 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "firebase": "8.6.7",
-    "kotlin": "1.5.10",
-    "kotlinx-coroutines-core": "1.5.0",
-    "kotlinx-serialization-kotlinx-serialization-runtime": "1.2.0"
+    "firebase": "8.8.0",
+    "kotlin": "1.5.21",
+    "kotlinx-coroutines-core": "1.5.1",
+    "kotlinx-serialization-kotlinx-serialization-runtime": "1.2.2"
   }
 }
diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts
@@ -122,8 +122,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                apiVersion = "1.4"
-                languageVersion = "1.4"
+                apiVersion = "1.5"
+                languageVersion = "1.5"
                 progressiveMode = true
                 useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
             }
@@ -138,7 +138,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-config-ktx:21.0.0")
+                api("com.google.firebase:firebase-config-ktx")
             }
         }
 
diff --git a/firebase-config/package.json b/firebase-config/package.json
@@ -24,8 +24,8 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.4.1",
-    "firebase": "8.5.0",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3"
+    "firebase": "8.8.0",
+    "kotlin": "1.5.21",
+    "kotlinx-coroutines-core": "1.5.1"
   }
 }
diff --git a/firebase-config/src/nativeInterop/cinterop/Cartfile b/firebase-config/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" == 8.1.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" == 8.4.0
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -123,7 +123,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-database:20.0.0")
+                api("com.google.firebase:firebase-database-ktx")
             }
         }
 
diff --git a/firebase-database/package.json b/firebase-database/package.json
@@ -24,8 +24,8 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.4.1",
-    "firebase": "8.6.7",
-    "kotlin": "1.5.10",
-    "kotlinx-coroutines-core": "1.5.0"
+    "firebase": "8.8.0",
+    "kotlin": "1.5.21",
+    "kotlinx-coroutines-core": "1.5.1"
   }
 }
diff --git a/firebase-database/src/nativeInterop/cinterop/Cartfile b/firebase-database/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 8.1.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 8.4.0
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -10,7 +10,7 @@ version = project.property("firebase-firestore.version") as String
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
-    kotlin("plugin.serialization") version "1.5.10"
+    kotlin("plugin.serialization") version "1.5.21"
 }
 
 android {
@@ -128,7 +128,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-firestore:23.0.1")
+                api("com.google.firebase:firebase-firestore-ktx")
             }
         }
 
diff --git a/firebase-firestore/package.json b/firebase-firestore/package.json
@@ -24,8 +24,8 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.4.1",
-    "firebase": "8.6.7",
-    "kotlin": "1.5.10",
-    "kotlinx-coroutines-core": "1.5.0"
+    "firebase": "8.8.0",
+    "kotlin": "1.5.21",
+    "kotlinx-coroutines-core": "1.5.1"
   }
 }
diff --git a/firebase-firestore/src/nativeInterop/cinterop/Cartfile b/firebase-firestore/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 8.1.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 8.4.0
diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -117,7 +117,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-functions:20.0.0")
+                api("com.google.firebase:firebase-functions-ktx")
             }
         }
 
diff --git a/firebase-functions/package.json b/firebase-functions/package.json
@@ -24,8 +24,8 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.4.1",
-    "firebase": "8.6.7",
-    "kotlin": "1.5.0",
-    "kotlinx-coroutines-core": "1.5.0"
+    "firebase": "8.8.0",
+    "kotlin": "1.5.21",
+    "kotlinx-coroutines-core": "1.5.1"
   }
 }
diff --git a/firebase-functions/src/nativeInterop/cinterop/Cartfile b/firebase-functions/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 8.1.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 8.4.0

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat`
`4`	`4`	`import org.gradle.api.tasks.testing.logging.TestLogEvent`
`5`	`5`
`6`	`6`	`plugins {`
`7`		`- kotlin("multiplatform") version "1.5.10" apply false`
	`7`	`+ kotlin("multiplatform") version "1.5.21" apply false`
`8`	`8`	`id("base")`
`9`	`9`	`}`
`10`	`10`
`@@ -18,7 +18,7 @@ buildscript {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`dependencies {`
`21`		`- classpath("com.android.tools.build:gradle:4.2.1")`
	`21`	`+ classpath("com.android.tools.build:gradle:4.2.2")`
`22`	`22`	`classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")`
`23`	`23`	`}`
`24`	`24`	`}`
`@@ -208,18 +208,19 @@ subprojects {`
`208`	`208`
`209`	`209`	`dependencies {`
`210`	`210`	`"commonMainImplementation"(kotlin("stdlib-common"))`
`211`		`- "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")`
	`211`	`+ "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")`
`212`	`212`	`"jsMainImplementation"(kotlin("stdlib-js"))`
`213`		`- "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.0")`
	`213`	`+ "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.1")`
	`214`	`+ "androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.3.0"))`
`214`	`215`	`"commonTestImplementation"(kotlin("test-common"))`
`215`	`216`	`"commonTestImplementation"(kotlin("test-annotations-common"))`
`216`		`- "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")`
	`217`	`+ "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")`
`217`	`218`	`"jsTestImplementation"(kotlin("test-js"))`
`218`	`219`	`"androidAndroidTestImplementation"(kotlin("test-junit"))`
`219`	`220`	`"androidAndroidTestImplementation"("junit:junit:4.13.2")`
`220`		`- "androidAndroidTestImplementation"("androidx.test:core:1.3.0")`
`221`		`- "androidAndroidTestImplementation"("androidx.test.ext:junit:1.1.2")`
`222`		`- "androidAndroidTestImplementation"("androidx.test:runner:1.3.0")`
	`221`	`+ "androidAndroidTestImplementation"("androidx.test:core:1.4.0")`
	`222`	`+ "androidAndroidTestImplementation"("androidx.test.ext:junit:1.1.3")`
	`223`	`+ "androidAndroidTestImplementation"("androidx.test:runner:1.4.0")`
`223`	`224`	`}`
`224`	`225`	`}`
`225`	`226`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ kotlin {`
`127`	`127`
`128`	`128`	`val androidMain by getting {`
`129`	`129`	`dependencies {`
`130`		`- api("com.google.firebase:firebase-common:20.0.0")`
	`130`	`+ api("com.google.firebase:firebase-common-ktx")`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`	`"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",`
`25`	`25`	`"dependencies": {`
`26`	`26`	`"@gitlive/firebase-common": "1.4.1",`
`27`		`- "firebase": "8.6.7",`
`28`		`- "kotlin": "1.5.10",`
`29`		`- "kotlinx-coroutines-core": "1.5.0"`
	`27`	`+ "firebase": "8.8.0",`
	`28`	`+ "kotlin": "1.5.21",`
	`29`	`+ "kotlinx-coroutines-core": "1.5.1"`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.1.1`
	`1`	`+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.4.0`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ kotlin {`
`145`	`145`
`146`	`146`	`val androidMain by getting {`
`147`	`147`	`dependencies {`
`148`		`- api("com.google.firebase:firebase-auth:21.0.1")`
	`148`	`+ api("com.google.firebase:firebase-auth-ktx")`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ version = project.property("firebase-common.version") as String`
`9`	`9`	`plugins {`
`10`	`10`	`id("com.android.library")`
`11`	`11`	`kotlin("multiplatform")`
`12`		`- kotlin("plugin.serialization") version "1.5.10"`
	`12`	`+ kotlin("plugin.serialization") version "1.5.21"`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`android {`
`@@ -89,21 +89,21 @@ kotlin {`
`89`	`89`
`90`	`90`	`val commonMain by getting {`
`91`	`91`	`dependencies {`
`92`		`- api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.0")`
	`92`	`+ api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.2")`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`val androidMain by getting {`
`97`	`97`	`dependencies {`
`98`		`- api("com.google.firebase:firebase-common:20.0.0")`
	`98`	`+ api("com.google.firebase:firebase-common-ktx")`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`val iosMain by getting`
`103`	`103`
`104`	`104`	`val jsMain by getting {`
`105`	`105`	`dependencies {`
`106`		`- api(npm("firebase", "8.2.0"))`
	`106`	`+ api(npm("firebase", "8.7.1"))`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@`
`23`	`23`	`},`
`24`	`24`	`"homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",`
`25`	`25`	`"dependencies": {`
`26`		`- "firebase": "8.6.7",`
`27`		`- "kotlin": "1.5.10",`
`28`		`- "kotlinx-coroutines-core": "1.5.0",`
`29`		`- "kotlinx-serialization-kotlinx-serialization-runtime": "1.2.0"`
	`26`	`+ "firebase": "8.8.0",`
	`27`	`+ "kotlin": "1.5.21",`
	`28`	`+ "kotlinx-coroutines-core": "1.5.1",`
	`29`	`+ "kotlinx-serialization-kotlinx-serialization-runtime": "1.2.2"`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,8 @@ kotlin {`
`122`	`122`	`sourceSets {`
`123`	`123`	`all {`
`124`	`124`	`languageSettings.apply {`
`125`		`- apiVersion = "1.4"`
`126`		`- languageVersion = "1.4"`
	`125`	`+ apiVersion = "1.5"`
	`126`	`+ languageVersion = "1.5"`
`127`	`127`	`progressiveMode = true`
`128`	`128`	`useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")`
`129`	`129`	`}`
`@@ -138,7 +138,7 @@ kotlin {`
`138`	`138`
`139`	`139`	`val androidMain by getting {`
`140`	`140`	`dependencies {`
`141`		`- api("com.google.firebase:firebase-config-ktx:21.0.0")`
	`141`	`+ api("com.google.firebase:firebase-config-ktx")`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ kotlin {`
`123`	`123`
`124`	`124`	`val androidMain by getting {`
`125`	`125`	`dependencies {`
`126`		`- api("com.google.firebase:firebase-database:20.0.0")`
	`126`	`+ api("com.google.firebase:firebase-database-ktx")`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ version = project.property("firebase-firestore.version") as String`
`10`	`10`	`plugins {`
`11`	`11`	`id("com.android.library")`
`12`	`12`	`kotlin("multiplatform")`
`13`		`- kotlin("plugin.serialization") version "1.5.10"`
	`13`	`+ kotlin("plugin.serialization") version "1.5.21"`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`android {`
`@@ -128,7 +128,7 @@ kotlin {`
`128`	`128`
`129`	`129`	`val androidMain by getting {`
`130`	`130`	`dependencies {`
`131`		`- api("com.google.firebase:firebase-firestore:23.0.1")`
	`131`	`+ api("com.google.firebase:firebase-firestore-ktx")`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`