Merge pull request #189 from shepeliev/kotlin_1_5

nbransby · web-flow · commit eb682a43ccb7 · 2021-06-04T12:06:42.000+01:00
Updated Kotlin to 1.5.10, Android SDK/Gradle Plugin, dependencies, Gradle wrapper
diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ The Firebase Kotlin SDK uses Kotlin serialization to read and write custom class
 ```groovy
 plugins {
     kotlin("multiplatform") // or kotlin("jvm") or any other kotlin plugin
-    kotlin("plugin.serialization") version "1.4.10"
+    kotlin("plugin.serialization") version "1.5.10"
 }
 ```
 
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.10" 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.1")
         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)
@@ -55,7 +55,7 @@ subprojects {
     group = "dev.gitlive"
 
     apply(plugin="com.adarshr.test-logger")
-    
+
     repositories {
         mavenLocal()
         mavenCentral()
@@ -208,15 +208,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")
             "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")
             "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")
             "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
@@ -22,6 +22,7 @@ android {
     defaultConfig {
         minSdkVersion(property("minSdkVersion") as Int)
         targetSdkVersion(property("targetSdkVersion") as Int)
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     sourceSets {
         getByName("main") {
@@ -96,8 +97,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
@@ -25,7 +25,7 @@
   "dependencies": {
     "@gitlive/firebase-common": "1.3.1",
     "firebase": "8.5.0",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3"
+    "kotlin": "1.5.10",
+    "kotlinx-coroutines-core": "1.5.0"
   }
 }
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -121,8 +121,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                apiVersion = "1.4"
-                languageVersion = "1.4"
+                apiVersion = "1.5"
+                languageVersion = "1.5"
                 progressiveMode = true
                 useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
             }
@@ -137,7 +137,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
@@ -25,7 +25,7 @@
   "dependencies": {
     "@gitlive/firebase-app": "1.3.1",
     "firebase": "8.5.0",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3"
+    "kotlin": "1.5.10",
+    "kotlinx-coroutines-core": "1.5.0"
   }
 }
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.10"
 }
 
 android {
@@ -77,8 +77,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")
@@ -89,7 +89,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
@@ -24,8 +24,8 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
     "firebase": "8.5.0",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3",
+    "kotlin": "1.5.10",
+    "kotlinx-coroutines-core": "1.5.0",
     "kotlinx-serialization-kotlinx-serialization-runtime": "1.1.0"
   }
 }
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -97,8 +97,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")
@@ -115,7 +115,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
@@ -25,7 +25,7 @@
   "dependencies": {
     "@gitlive/firebase-app": "1.3.1",
     "firebase": "8.5.0",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3"
+    "kotlin": "1.5.10",
+    "kotlinx-coroutines-core": "1.5.0"
   }
 }
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.10"
 }
 
 android {
@@ -99,8 +99,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")
@@ -116,7 +116,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
@@ -25,7 +25,7 @@
   "dependencies": {
     "@gitlive/firebase-app": "1.3.1",
     "firebase": "8.5.0",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3"
+    "kotlin": "1.5.10",
+    "kotlinx-coroutines-core": "1.5.0"
   }
 }
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
@@ -91,8 +91,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
@@ -25,7 +25,7 @@
   "dependencies": {
     "@gitlive/firebase-app": "1.3.1",
     "firebase": "8.5.0",
-    "kotlin": "1.4.31",
-    "kotlinx-coroutines-core": "1.4.3"
+    "kotlin": "1.5.0",
+    "kotlinx-coroutines-core": "1.5.0"
   }
 }
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
`@@ -63,7 +63,7 @@ The Firebase Kotlin SDK uses Kotlin serialization to read and write custom class`
`63`	`63`	```groovy
`64`	`64`	`plugins {`
`65`	`65`	`kotlin("multiplatform") // or kotlin("jvm") or any other kotlin plugin`
`66`		`- kotlin("plugin.serialization") version "1.4.10"`
	`66`	`+ kotlin("plugin.serialization") version "1.5.10"`
`67`	`67`	`}`
`68`	`68`	```
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ android {`
`22`	`22`	`defaultConfig {`
`23`	`23`	`minSdkVersion(property("minSdkVersion") as Int)`
`24`	`24`	`targetSdkVersion(property("targetSdkVersion") as Int)`
	`25`	`+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`25`	`26`	`}`
`26`	`27`	`sourceSets {`
`27`	`28`	`getByName("main") {`
`@@ -96,8 +97,8 @@ kotlin {`
`96`	`97`	`sourceSets {`
`97`	`98`	`all {`
`98`	`99`	`languageSettings.apply {`
`99`		`- apiVersion = "1.4"`
`100`		`- languageVersion = "1.4"`
	`100`	`+ apiVersion = "1.5"`
	`101`	`+ languageVersion = "1.5"`
`101`	`102`	`progressiveMode = true`
`102`	`103`	`}`
`103`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"dependencies": {`
`26`	`26`	`"@gitlive/firebase-common": "1.3.1",`
`27`	`27`	`"firebase": "8.5.0",`
`28`		`- "kotlin": "1.4.31",`
`29`		`- "kotlinx-coroutines-core": "1.4.3"`
	`28`	`+ "kotlin": "1.5.10",`
	`29`	`+ "kotlinx-coroutines-core": "1.5.0"`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,8 @@ kotlin {`
`121`	`121`	`sourceSets {`
`122`	`122`	`all {`
`123`	`123`	`languageSettings.apply {`
`124`		`- apiVersion = "1.4"`
`125`		`- languageVersion = "1.4"`
	`124`	`+ apiVersion = "1.5"`
	`125`	`+ languageVersion = "1.5"`
`126`	`126`	`progressiveMode = true`
`127`	`127`	`useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")`
`128`	`128`	`}`
`@@ -137,7 +137,7 @@ kotlin {`
`137`	`137`
`138`	`138`	`val androidMain by getting {`
`139`	`139`	`dependencies {`
`140`		`- api("com.google.firebase:firebase-auth:20.0.3")`
	`140`	`+ api("com.google.firebase:firebase-auth:20.0.4")`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
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
`@@ -24,8 +24,8 @@`
`24`	`24`	`"homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",`
`25`	`25`	`"dependencies": {`
`26`	`26`	`"firebase": "8.5.0",`
`27`		`- "kotlin": "1.4.31",`
`28`		`- "kotlinx-coroutines-core": "1.4.3",`
	`27`	`+ "kotlin": "1.5.10",`
	`28`	`+ "kotlinx-coroutines-core": "1.5.0",`
`29`	`29`	`"kotlinx-serialization-kotlinx-serialization-runtime": "1.1.0"`
`30`	`30`	`}`
`31`	`31`	`}`