GitLiveApp · Reedyuk · Sep 7, 2021 · Aug 28, 2021 · Aug 28, 2021 · Sep 1, 2021
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
		@@ -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