Merge pull request #215 from suntrix/updates

Reedyuk · web-flow · commit e9dc4b2101cb · 2021-09-07T14:07:49.000+01:00
Updates
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.21" apply false
+    kotlin("multiplatform") version "1.5.30" apply false
     id("base")
 }
 
@@ -18,7 +18,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.0")
+        classpath("com.android.tools.build:gradle:7.0.1")
         classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")
     }
 }
@@ -209,7 +209,7 @@ subprojects {
         dependencies {
             "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
             "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.1")
-            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.3.1"))
+            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.4.0"))
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
             "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
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.8.1",
-    "kotlin": "1.5.21",
+    "firebase": "8.10.0",
+    "kotlin": "1.5.30",
     "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.5.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.6.0
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -148,7 +148,7 @@ kotlin {
                 apiVersion = "1.5"
                 languageVersion = "1.5"
                 progressiveMode = true
-                useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
+                optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
             }
         }
 
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.8.1",
-    "kotlin": "1.5.21",
+    "firebase": "8.10.0",
+    "kotlin": "1.5.30",
     "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.5.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.6.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.21"
+    kotlin("plugin.serialization") version "1.5.30"
 }
 
 android {
@@ -80,10 +80,10 @@ kotlin {
                 apiVersion = "1.5"
                 languageVersion = "1.5"
                 progressiveMode = true
-                useExperimentalAnnotation("kotlin.Experimental")
-                useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
-                useExperimentalAnnotation("kotlinx.serialization.ExperimentalSerializationApi")
-                useExperimentalAnnotation("kotlinx.serialization.InternalSerializationApi")
+                optIn("kotlin.Experimental")
+                optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+                optIn("kotlinx.serialization.ExperimentalSerializationApi")
+                optIn("kotlinx.serialization.InternalSerializationApi")
             }
         }
 
diff --git a/firebase-common/package.json b/firebase-common/package.json
@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "firebase": "8.8.1",
-    "kotlin": "1.5.21",
+    "firebase": "8.10.0",
+    "kotlin": "1.5.30",
     "kotlinx-coroutines-core": "1.5.1",
     "kotlinx-serialization-kotlinx-serialization-runtime": "1.2.2"
   }
diff --git a/firebase-common/src/commonMain/kotlin/dev/gitlive/firebase/serializers.kt b/firebase-common/src/commonMain/kotlin/dev/gitlive/firebase/serializers.kt
@@ -36,7 +36,6 @@ class FirebaseMapSerializer : KSerializer<Map<String, Any?>> {
         override fun isElementOptional(index: Int) = false
     }
 
-    @InternalSerializationApi
     @Suppress("UNCHECKED_CAST")
     override fun serialize(encoder: Encoder, value: Map<String, Any?>) {
         map = value
@@ -81,7 +80,6 @@ class FirebaseListSerializer : KSerializer<Iterable<Any?>> {
         override fun isElementOptional(index: Int) = false
     }
 
-    @InternalSerializationApi
     @Suppress("UNCHECKED_CAST")
     override fun serialize(encoder: Encoder, value: Iterable<Any?>) {
         list = value.toList()
diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts
@@ -125,7 +125,7 @@ kotlin {
                 apiVersion = "1.5"
                 languageVersion = "1.5"
                 progressiveMode = true
-                useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
+                optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
             }
         }
 
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.8.1",
-    "kotlin": "1.5.21",
+    "firebase": "8.10.0",
+    "kotlin": "1.5.30",
     "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.5.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" == 8.6.0
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -124,9 +124,9 @@ kotlin {
                 apiVersion = "1.5"
                 languageVersion = "1.5"
                 progressiveMode = true
-                useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
-                useExperimentalAnnotation("kotlinx.coroutines.FlowPreview")
-                useExperimentalAnnotation("kotlinx.serialization.InternalSerializationApi")
+                optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+                optIn("kotlinx.coroutines.FlowPreview")
+                optIn("kotlinx.serialization.InternalSerializationApi")
             }
         }
 
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.8.1",
-    "kotlin": "1.5.21",
+    "firebase": "8.10.0",
+    "kotlin": "1.5.30",
     "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.5.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 8.6.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.21"
+    kotlin("plugin.serialization") version "1.5.30"
 }
 
 android {
@@ -131,8 +131,8 @@ kotlin {
                 apiVersion = "1.5"
                 languageVersion = "1.5"
                 progressiveMode = true
-                useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
-                useExperimentalAnnotation("kotlinx.serialization.InternalSerializationApi")
+                optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+                optIn("kotlinx.serialization.InternalSerializationApi")
             }
         }
 
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.8.1",
-    "kotlin": "1.5.21",
+    "firebase": "8.10.0",
+    "kotlin": "1.5.30",
     "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.5.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 8.6.0
diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -119,8 +119,8 @@ kotlin {
                 apiVersion = "1.5"
                 languageVersion = "1.5"
                 progressiveMode = true
-                useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")
-                useExperimentalAnnotation("kotlinx.serialization.InternalSerializationApi")
+                optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+                optIn("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.4.1",
-    "firebase": "8.8.1",
-    "kotlin": "1.5.21",
+    "firebase": "8.10.0",
+    "kotlin": "1.5.30",
     "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.5.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 8.6.0
diff --git a/gradle.properties b/gradle.properties
@@ -8,14 +8,14 @@ kotlin.js.experimental.generateKotlinExternals=false
 #kotlin.mpp.enableCompatibilityMetadataVariant=true
 #kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.stability.nowarn=true
-#kotlin.native.cacheKind=none
+kotlin.native.cacheKind.iosX64=none
 #kotlin.native.enableDependencyPropagation=false
 kotlin.native.enableParallelExecutionCheck=false
 kotlin.setJvmTargetFromAndroidCompileOptions=true
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.parallel=true
-testOptions.unitTests.isIncludeAndroidResources = true
-kotlin.native.cacheKind.iosX64=none
+#systemProp.org.gradle.internal.publish.checksums.insecure=true  enable if https://github.com/gradle/gradle/issues/11308 happens during publishing
+testOptions.unitTests.isIncludeAndroidResources=true
 
 # Versions:
 firebase-app.version=1.4.1
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-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip

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.21" apply false`
	`7`	`+ kotlin("multiplatform") version "1.5.30" 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:7.0.0")`
	`21`	`+ classpath("com.android.tools.build:gradle:7.0.1")`
`22`	`22`	`classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")`
`23`	`23`	`}`
`24`	`24`	`}`
`@@ -209,7 +209,7 @@ subprojects {`
`209`	`209`	`dependencies {`
`210`	`210`	`"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")`
`211`	`211`	`"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.1")`
`212`		`- "androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.3.1"))`
	`212`	`+ "androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.4.0"))`
`213`	`213`	`"commonTestImplementation"(kotlin("test-common"))`
`214`	`214`	`"commonTestImplementation"(kotlin("test-annotations-common"))`
`215`	`215`	`"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")`
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.8.1",`
`28`		`- "kotlin": "1.5.21",`
	`27`	`+ "firebase": "8.10.0",`
	`28`	`+ "kotlin": "1.5.30",`
`29`	`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.5.0`
	`1`	`+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.6.0`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ kotlin {`
`148`	`148`	`apiVersion = "1.5"`
`149`	`149`	`languageVersion = "1.5"`
`150`	`150`	`progressiveMode = true`
`151`		`- useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")`
	`151`	`+ optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ class FirebaseMapSerializer : KSerializer<Map<String, Any?>> {`
`36`	`36`	`override fun isElementOptional(index: Int) = false`
`37`	`37`	`}`
`38`	`38`
`39`		`- @InternalSerializationApi`
`40`	`39`	`@Suppress("UNCHECKED_CAST")`
`41`	`40`	`override fun serialize(encoder: Encoder, value: Map<String, Any?>) {`
`42`	`41`	`map = value`
`@@ -81,7 +80,6 @@ class FirebaseListSerializer : KSerializer<Iterable<Any?>> {`
`81`	`80`	`override fun isElementOptional(index: Int) = false`
`82`	`81`	`}`
`83`	`82`
`84`		`- @InternalSerializationApi`
`85`	`83`	`@Suppress("UNCHECKED_CAST")`
`86`	`84`	`override fun serialize(encoder: Encoder, value: Iterable<Any?>) {`
`87`	`85`	`list = value.toList()`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ kotlin {`
`125`	`125`	`apiVersion = "1.5"`
`126`	`126`	`languageVersion = "1.5"`
`127`	`127`	`progressiveMode = true`
`128`		`- useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")`
	`128`	`+ optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -124,9 +124,9 @@ kotlin {`
`124`	`124`	`apiVersion = "1.5"`
`125`	`125`	`languageVersion = "1.5"`
`126`	`126`	`progressiveMode = true`
`127`		`- useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")`
`128`		`- useExperimentalAnnotation("kotlinx.coroutines.FlowPreview")`
`129`		`- useExperimentalAnnotation("kotlinx.serialization.InternalSerializationApi")`
	`127`	`+ optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")`
	`128`	`+ optIn("kotlinx.coroutines.FlowPreview")`
	`129`	`+ optIn("kotlinx.serialization.InternalSerializationApi")`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
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.21"`
	`13`	`+ kotlin("plugin.serialization") version "1.5.30"`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`android {`
`@@ -131,8 +131,8 @@ kotlin {`
`131`	`131`	`apiVersion = "1.5"`
`132`	`132`	`languageVersion = "1.5"`
`133`	`133`	`progressiveMode = true`
`134`		`- useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")`
`135`		`- useExperimentalAnnotation("kotlinx.serialization.InternalSerializationApi")`
	`134`	`+ optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")`
	`135`	`+ optIn("kotlinx.serialization.InternalSerializationApi")`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,8 @@ kotlin {`
`119`	`119`	`apiVersion = "1.5"`
`120`	`120`	`languageVersion = "1.5"`
`121`	`121`	`progressiveMode = true`
`122`		`- useExperimentalAnnotation("kotlinx.coroutines.ExperimentalCoroutinesApi")`
`123`		`- useExperimentalAnnotation("kotlinx.serialization.InternalSerializationApi")`
	`122`	`+ optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")`
	`123`	`+ optIn("kotlinx.serialization.InternalSerializationApi")`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`