updated Kotlin to 1.5.0, Android SDK/Gradle Plugin, dependencies, Gradle wrapper

Sebastian Owodzin · Sebastian Owodzin · commit 942348efe514 · 2021-05-05T13:51:53.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.4.31" apply false
+    kotlin("multiplatform") version "1.5.0" apply false
     id("base")
 }
 
@@ -18,12 +18,12 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.0.2")
+        classpath("com.android.tools.build:gradle:4.2.0")
         classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")
     }
 }
 
-val targetSdkVersion by extra(28)
+val targetSdkVersion by extra(30)
 val minSdkVersion by extra(16)
 
 // TODO: Hierarchical project structures are not fully supported in IDEA, enable only for a regular built (https://youtrack.jetbrains.com/issue/KT-35011)
@@ -198,15 +198,15 @@ subprojects {
 
         dependencies {
             "commonMainImplementation"(kotlin("stdlib-common"))
-            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
+            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-RC")
             "jsMainImplementation"(kotlin("stdlib-js"))
-            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.3")
+            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.0-RC")
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
-            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
+            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-RC")
             "jsTestImplementation"(kotlin("test-js"))
             "androidAndroidTestImplementation"(kotlin("test-junit"))
-            "androidAndroidTestImplementation"("junit:junit:4.13.1")
+            "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")
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -84,8 +84,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                apiVersion = "1.4"
-                languageVersion = "1.4"
+                apiVersion = "1.5"
+                languageVersion = "1.5"
                 progressiveMode = true
             }
         }
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.2.0",
-    "firebase": "8.2.10",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3"
+    "firebase": "8.4.3",
+    "kotlin": "1.5.0",
+    "kotlinx-coroutines-core": "1.5.0-RC"
   }
 }
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -109,8 +109,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                apiVersion = "1.4"
-                languageVersion = "1.4"
+                apiVersion = "1.5"
+                languageVersion = "1.5"
                 progressiveMode = true
                 useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
             }
@@ -125,7 +125,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-auth:20.0.3")
+                api("com.google.firebase:firebase-auth:20.0.4")
             }
         }
 
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.2.0",
-    "firebase": "8.2.10",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3"
+    "firebase": "8.4.3",
+    "kotlin": "1.5.0",
+    "kotlinx-coroutines-core": "1.5.0-RC"
   }
 }
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" == 7.7.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 7.11.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.4.31"
+    kotlin("plugin.serialization") version "1.5.0"
 }
 
 android {
@@ -65,8 +65,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                apiVersion = "1.4"
-                languageVersion = "1.4"
+                apiVersion = "1.5"
+                languageVersion = "1.5"
                 progressiveMode = true
                 useExperimentalAnnotation("kotlin.Experimental")
                 useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
@@ -77,7 +77,7 @@ kotlin {
 
         val commonMain by getting {
             dependencies {
-                api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.1.0")
+                api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.0")
             }
         }
 
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.2.10",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3",
+    "firebase": "8.4.3",
+    "kotlin": "1.5.0",
+    "kotlinx-coroutines-core": "1.5.0-RC",
     "kotlinx-serialization-kotlinx-serialization-runtime": "1.1.0"
   }
 }
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -85,8 +85,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                apiVersion = "1.4"
-                languageVersion = "1.4"
+                apiVersion = "1.5"
+                languageVersion = "1.5"
                 progressiveMode = true
                 useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 useExperimentalAnnotation("kotlinx.coroutines.FlowPreview")
@@ -103,7 +103,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-database:19.6.0")
+                api("com.google.firebase:firebase-database:19.7.0")
             }
         }
 
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.2.0",
-    "firebase": "8.2.10",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3"
+    "firebase": "8.4.3",
+    "kotlin": "1.5.0",
+    "kotlinx-coroutines-core": "1.5.0-RC"
   }
 }
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" == 7.7.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 7.11.0
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -9,7 +9,7 @@ version = project.property("firebase-firestore.version") as String
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
-    kotlin("plugin.serialization") version "1.4.31"
+    kotlin("plugin.serialization") version "1.5.0"
 }
 
 android {
@@ -87,8 +87,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                apiVersion = "1.4"
-                languageVersion = "1.4"
+                apiVersion = "1.5"
+                languageVersion = "1.5"
                 progressiveMode = true
                 useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 useExperimentalAnnotation("kotlinx.serialization.InternalSerializationApi")
@@ -104,7 +104,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-firestore:22.1.1")
+                api("com.google.firebase:firebase-firestore:22.1.2")
             }
         }
 
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.2.0",
-    "firebase": "8.2.10",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3"
+    "firebase": "8.4.3",
+    "kotlin": "1.5.0",
+    "kotlinx-coroutines-core": "1.5.0-RC"
   }
 }
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" == 7.7.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 7.11.0
diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -79,8 +79,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                apiVersion = "1.4"
-                languageVersion = "1.4"
+                apiVersion = "1.5"
+                languageVersion = "1.5"
                 progressiveMode = true
                 useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 useExperimentalAnnotation("kotlinx.serialization.InternalSerializationApi")
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.2.0",
-    "firebase": "8.2.10",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3"
+    "firebase": "8.4.3",
+    "kotlin": "1.5.0",
+    "kotlinx-coroutines-core": "1.5.0-RC"
   }
 }
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" == 7.7.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 7.11.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ kotlin {`
`84`	`84`	`sourceSets {`
`85`	`85`	`all {`
`86`	`86`	`languageSettings.apply {`
`87`		`- apiVersion = "1.4"`
`88`		`- languageVersion = "1.4"`
	`87`	`+ apiVersion = "1.5"`
	`88`	`+ languageVersion = "1.5"`
`89`	`89`	`progressiveMode = true`
`90`	`90`	`}`
`91`	`91`	`}`
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.2.0",`
`27`		`- "firebase": "8.2.10",`
`28`		`- "kotlin": "1.4.31",`
`29`		`- "kotlinx-coroutines-core": "1.4.3"`
	`27`	`+ "firebase": "8.4.3",`
	`28`	`+ "kotlin": "1.5.0",`
	`29`	`+ "kotlinx-coroutines-core": "1.5.0-RC"`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,8 @@ kotlin {`
`109`	`109`	`sourceSets {`
`110`	`110`	`all {`
`111`	`111`	`languageSettings.apply {`
`112`		`- apiVersion = "1.4"`
`113`		`- languageVersion = "1.4"`
	`112`	`+ apiVersion = "1.5"`
	`113`	`+ languageVersion = "1.5"`
`114`	`114`	`progressiveMode = true`
`115`	`115`	`useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")`
`116`	`116`	`}`
`@@ -125,7 +125,7 @@ kotlin {`
`125`	`125`
`126`	`126`	`val androidMain by getting {`
`127`	`127`	`dependencies {`
`128`		`- api("com.google.firebase:firebase-auth:20.0.3")`
	`128`	`+ api("com.google.firebase:firebase-auth:20.0.4")`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 7.7.0`
	`1`	`+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 7.11.0`
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.2.10",`
`27`		`- "kotlin": "1.4.31",`
`28`		`- "kotlinx-coroutines-core": "1.4.3",`
	`26`	`+ "firebase": "8.4.3",`
	`27`	`+ "kotlin": "1.5.0",`
	`28`	`+ "kotlinx-coroutines-core": "1.5.0-RC",`
`29`	`29`	`"kotlinx-serialization-kotlinx-serialization-runtime": "1.1.0"`
`30`	`30`	`}`
`31`	`31`	`}`