From f490224f46d9edb1ee3d5a5979c988330c932bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Owodzin=CC=81?= Date: Sat, 28 Aug 2021 15:41:54 +0100 Subject: [PATCH 1/3] updated AGP plugin & Firebase SDKs --- build.gradle.kts | 4 ++-- firebase-app/package.json | 2 +- firebase-app/src/nativeInterop/cinterop/Cartfile | 2 +- firebase-auth/package.json | 2 +- firebase-auth/src/nativeInterop/cinterop/Cartfile | 2 +- firebase-common/package.json | 2 +- firebase-config/package.json | 2 +- firebase-config/src/nativeInterop/cinterop/Cartfile | 2 +- firebase-database/package.json | 2 +- firebase-database/src/nativeInterop/cinterop/Cartfile | 2 +- firebase-firestore/package.json | 2 +- firebase-firestore/src/nativeInterop/cinterop/Cartfile | 2 +- firebase-functions/package.json | 2 +- firebase-functions/src/nativeInterop/cinterop/Cartfile | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bf5a782b3..a0f7c0f9c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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 index cd1916bca..e434eac21 100644 --- a/firebase-app/package.json +++ b/firebase-app/package.json @@ -24,7 +24,7 @@ "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk", "dependencies": { "@gitlive/firebase-common": "1.4.1", - "firebase": "8.8.1", + "firebase": "8.10.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 index e0f994544..766237c1a 100644 --- 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/package.json b/firebase-auth/package.json index 393cdbfbb..d91be2f65 100644 --- a/firebase-auth/package.json +++ b/firebase-auth/package.json @@ -24,7 +24,7 @@ "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk", "dependencies": { "@gitlive/firebase-app": "1.4.1", - "firebase": "8.8.1", + "firebase": "8.10.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 index c87f8aa12..245d5135f 100644 --- 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/package.json b/firebase-common/package.json index 885ace498..0f5b83575 100644 --- a/firebase-common/package.json +++ b/firebase-common/package.json @@ -23,7 +23,7 @@ }, "homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk", "dependencies": { - "firebase": "8.8.1", + "firebase": "8.10.0", "kotlin": "1.5.21", "kotlinx-coroutines-core": "1.5.1", "kotlinx-serialization-kotlinx-serialization-runtime": "1.2.2" diff --git a/firebase-config/package.json b/firebase-config/package.json index ed179cfcb..3d217efa2 100644 --- a/firebase-config/package.json +++ b/firebase-config/package.json @@ -24,7 +24,7 @@ "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk", "dependencies": { "@gitlive/firebase-app": "1.4.1", - "firebase": "8.8.1", + "firebase": "8.10.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 index 525ebedd6..2e485003c 100644 --- 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/package.json b/firebase-database/package.json index c2eedf3cd..8ed86a02d 100644 --- a/firebase-database/package.json +++ b/firebase-database/package.json @@ -24,7 +24,7 @@ "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk", "dependencies": { "@gitlive/firebase-app": "1.4.1", - "firebase": "8.8.1", + "firebase": "8.10.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 index 3391e187f..05b39ac4d 100644 --- 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/package.json b/firebase-firestore/package.json index b06b89a2b..6c4d3a84f 100644 --- a/firebase-firestore/package.json +++ b/firebase-firestore/package.json @@ -24,7 +24,7 @@ "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk", "dependencies": { "@gitlive/firebase-app": "1.4.1", - "firebase": "8.8.1", + "firebase": "8.10.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 index f8ef0e3ab..aaf8803f4 100644 --- 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/package.json b/firebase-functions/package.json index a2e96aec7..6ea89f89d 100644 --- a/firebase-functions/package.json +++ b/firebase-functions/package.json @@ -24,7 +24,7 @@ "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk", "dependencies": { "@gitlive/firebase-app": "1.4.1", - "firebase": "8.8.1", + "firebase": "8.10.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 index 75898582b..1bd88ed9d 100644 --- 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 From fba539d48355dd87411a6cec0d3a78391cfde737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Owodzin=CC=81?= Date: Sat, 28 Aug 2021 16:04:06 +0100 Subject: [PATCH 2/3] updated Kotlin to 1.5.30 --- build.gradle.kts | 2 +- firebase-app/package.json | 2 +- firebase-auth/build.gradle.kts | 2 +- firebase-auth/package.json | 2 +- firebase-common/build.gradle.kts | 10 +++++----- firebase-common/package.json | 2 +- .../kotlin/dev/gitlive/firebase/serializers.kt | 2 -- firebase-config/build.gradle.kts | 2 +- firebase-config/package.json | 2 +- firebase-database/build.gradle.kts | 6 +++--- firebase-database/package.json | 2 +- firebase-firestore/build.gradle.kts | 6 +++--- firebase-firestore/package.json | 2 +- firebase-functions/build.gradle.kts | 4 ++-- firebase-functions/package.json | 2 +- 15 files changed, 23 insertions(+), 25 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a0f7c0f9c..a456986f2 100644 --- 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") } diff --git a/firebase-app/package.json b/firebase-app/package.json index e434eac21..78f59672f 100644 --- a/firebase-app/package.json +++ b/firebase-app/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-common": "1.4.1", "firebase": "8.10.0", - "kotlin": "1.5.21", + "kotlin": "1.5.30", "kotlinx-coroutines-core": "1.5.1" } } diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts index 51bff83d9..2c3e7df74 100644 --- 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 index d91be2f65..d801f5cbf 100644 --- a/firebase-auth/package.json +++ b/firebase-auth/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-app": "1.4.1", "firebase": "8.10.0", - "kotlin": "1.5.21", + "kotlin": "1.5.30", "kotlinx-coroutines-core": "1.5.1" } } diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts index 3a2f2282d..041a0e065 100644 --- 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 index 0f5b83575..7fca97b3d 100644 --- a/firebase-common/package.json +++ b/firebase-common/package.json @@ -24,7 +24,7 @@ "homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk", "dependencies": { "firebase": "8.10.0", - "kotlin": "1.5.21", + "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 index 32ca42c38..43461fa15 100644 --- 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> { override fun isElementOptional(index: Int) = false } - @InternalSerializationApi @Suppress("UNCHECKED_CAST") override fun serialize(encoder: Encoder, value: Map) { map = value @@ -81,7 +80,6 @@ class FirebaseListSerializer : KSerializer> { override fun isElementOptional(index: Int) = false } - @InternalSerializationApi @Suppress("UNCHECKED_CAST") override fun serialize(encoder: Encoder, value: Iterable) { list = value.toList() diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts index 117069ab5..e35024c74 100644 --- 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 index 3d217efa2..47b05ea3a 100644 --- a/firebase-config/package.json +++ b/firebase-config/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-app": "1.4.1", "firebase": "8.10.0", - "kotlin": "1.5.21", + "kotlin": "1.5.30", "kotlinx-coroutines-core": "1.5.1" } } diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts index bc10120a3..3fc78b104 100644 --- 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 index 8ed86a02d..d836c1f61 100644 --- a/firebase-database/package.json +++ b/firebase-database/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-app": "1.4.1", "firebase": "8.10.0", - "kotlin": "1.5.21", + "kotlin": "1.5.30", "kotlinx-coroutines-core": "1.5.1" } } diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts index bafa41f76..5aac4fda9 100644 --- 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 index 6c4d3a84f..86dc54ab2 100644 --- a/firebase-firestore/package.json +++ b/firebase-firestore/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-app": "1.4.1", "firebase": "8.10.0", - "kotlin": "1.5.21", + "kotlin": "1.5.30", "kotlinx-coroutines-core": "1.5.1" } } diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts index 5d4f7454a..065542772 100644 --- 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 index 6ea89f89d..dab55aa87 100644 --- a/firebase-functions/package.json +++ b/firebase-functions/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-app": "1.4.1", "firebase": "8.10.0", - "kotlin": "1.5.21", + "kotlin": "1.5.30", "kotlinx-coroutines-core": "1.5.1" } } From 178827003bace863a6ed0ad5ea3197669423afb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Owodzin=CC=81?= Date: Wed, 1 Sep 2021 10:51:28 +0100 Subject: [PATCH 3/3] Gradle update --- gradle.properties | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index a0ae5bd10..b95709a69 100644 --- 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 index 469b8ac11..760721ee7 100644 --- 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