From f711a23d0276c6767b0c294900f2264b01e1287b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Owodzin=CC=81?= Date: Mon, 4 Oct 2021 12:14:02 +0100 Subject: [PATCH] updated Firebase SDKs & dependencies --- build.gradle.kts | 4 ++-- firebase-app/build.gradle.kts | 1 + firebase-app/package.json | 2 +- firebase-app/src/nativeInterop/cinterop/Cartfile | 2 +- firebase-app/src/nativeInterop/cinterop/FirebaseCore.def | 2 +- firebase-auth/build.gradle.kts | 1 + firebase-auth/package.json | 2 +- firebase-auth/src/nativeInterop/cinterop/Cartfile | 2 +- firebase-common/build.gradle.kts | 4 ++-- firebase-common/package.json | 4 ++-- firebase-config/build.gradle.kts | 1 + firebase-config/package.json | 2 +- firebase-config/src/nativeInterop/cinterop/Cartfile | 2 +- .../src/nativeInterop/cinterop/FirebaseRemoteConfig.def | 2 +- firebase-database/build.gradle.kts | 1 + firebase-database/package.json | 2 +- firebase-database/src/nativeInterop/cinterop/Cartfile | 2 +- firebase-firestore/build.gradle.kts | 5 +++-- firebase-firestore/package.json | 2 +- firebase-firestore/src/nativeInterop/cinterop/Cartfile | 2 +- firebase-functions/build.gradle.kts | 1 + firebase-functions/package.json | 2 +- firebase-functions/src/nativeInterop/cinterop/Cartfile | 2 +- 23 files changed, 28 insertions(+), 22 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9ab1f39bc..e512e1f2a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { - kotlin("multiplatform") version "1.5.30" apply false + kotlin("multiplatform") version "1.5.31" apply false id("base") } @@ -197,7 +197,7 @@ subprojects { dependencies { "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2") "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2") - "androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.4.0")) + "androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.4.1")) "commonTestImplementation"(kotlin("test-common")) "commonTestImplementation"(kotlin("test-annotations-common")) "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2") diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts index a45a18ca9..e1be0119c 100644 --- a/firebase-app/build.gradle.kts +++ b/firebase-app/build.gradle.kts @@ -67,6 +67,7 @@ kotlin { "FirebaseCoreDiagnostics", "FirebaseInstallations", "GoogleAppMeasurement", + "GoogleAppMeasurementIdentitySupport", "GoogleDataTransport", "GoogleUtilities", "nanopb", diff --git a/firebase-app/package.json b/firebase-app/package.json index 569347617..eb242fa03 100644 --- a/firebase-app/package.json +++ b/firebase-app/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-common": "1.4.2", "firebase": "8.10.0", - "kotlin": "1.5.30", + "kotlin": "1.5.31", "kotlinx-coroutines-core": "1.5.2" } } diff --git a/firebase-app/src/nativeInterop/cinterop/Cartfile b/firebase-app/src/nativeInterop/cinterop/Cartfile index 766237c1a..8d78efb90 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.6.0 +binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.8.0 diff --git a/firebase-app/src/nativeInterop/cinterop/FirebaseCore.def b/firebase-app/src/nativeInterop/cinterop/FirebaseCore.def index 4287b7982..ae9ff7d73 100644 --- a/firebase-app/src/nativeInterop/cinterop/FirebaseCore.def +++ b/firebase-app/src/nativeInterop/cinterop/FirebaseCore.def @@ -2,4 +2,4 @@ language = Objective-C package = cocoapods.FirebaseCore modules = FirebaseCore compilerOpts = -framework FirebaseCore -linkerOpts = -framework FirebaseCore -framework FirebaseCoreDiagnostics -framework FirebaseAnalytics -framework GoogleAppMeasurement -framework FirebaseInstallations -framework GoogleDataTransport -framework GoogleUtilities -framework PromisesObjC -framework nanopb -framework StoreKit -lsqlite3 +linkerOpts = -framework FirebaseAnalytics -framework FirebaseCore -framework FirebaseCoreDiagnostics -framework FirebaseInstallations -framework GoogleAppMeasurement -framework GoogleAppMeasurementIdentitySupport -framework GoogleDataTransport -framework GoogleUtilities -framework nanopb -framework PromisesObjC -framework StoreKit -lsqlite3 diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts index 54cb61fc2..e8bf6a2f6 100644 --- a/firebase-auth/build.gradle.kts +++ b/firebase-auth/build.gradle.kts @@ -90,6 +90,7 @@ kotlin { "FirebaseCoreDiagnostics", "FirebaseInstallations", "GoogleAppMeasurement", + "GoogleAppMeasurementIdentitySupport", "GoogleDataTransport", "GoogleUtilities", "nanopb", diff --git a/firebase-auth/package.json b/firebase-auth/package.json index ca07d0f26..1276ac831 100644 --- a/firebase-auth/package.json +++ b/firebase-auth/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-app": "1.4.2", "firebase": "8.10.0", - "kotlin": "1.5.30", + "kotlin": "1.5.31", "kotlinx-coroutines-core": "1.5.2" } } diff --git a/firebase-auth/src/nativeInterop/cinterop/Cartfile b/firebase-auth/src/nativeInterop/cinterop/Cartfile index 245d5135f..c9d68bb30 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.6.0 +binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.8.0 diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts index ee32e66bb..ac98f5b3d 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.30" + kotlin("plugin.serialization") version "1.5.31" } android { @@ -82,7 +82,7 @@ kotlin { val commonMain by getting { dependencies { - api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.0-RC") + api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.0") } } diff --git a/firebase-common/package.json b/firebase-common/package.json index aa15bf6fa..96cfb72d1 100644 --- 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.10.0", - "kotlin": "1.5.30", + "kotlin": "1.5.31", "kotlinx-coroutines-core": "1.5.2", - "kotlinx-serialization-kotlinx-serialization-runtime": "1.2.2" + "kotlinx-serialization-kotlinx-serialization-runtime": "1.3.0" } } diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts index fe19b5aa3..6c57abb9c 100644 --- a/firebase-config/build.gradle.kts +++ b/firebase-config/build.gradle.kts @@ -75,6 +75,7 @@ kotlin { "FirebaseCoreDiagnostics", "FirebaseAnalytics", "GoogleAppMeasurement", + "GoogleAppMeasurementIdentitySupport", "FirebaseInstallations", "GoogleDataTransport", "GoogleUtilities", diff --git a/firebase-config/package.json b/firebase-config/package.json index bf92a5db6..ccbacdad7 100644 --- a/firebase-config/package.json +++ b/firebase-config/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-app": "1.4.2", "firebase": "8.10.0", - "kotlin": "1.5.30", + "kotlin": "1.5.31", "kotlinx-coroutines-core": "1.5.2" } } diff --git a/firebase-config/src/nativeInterop/cinterop/Cartfile b/firebase-config/src/nativeInterop/cinterop/Cartfile index 2e485003c..a944bdb12 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.6.0 +binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" == 8.8.0 diff --git a/firebase-config/src/nativeInterop/cinterop/FirebaseRemoteConfig.def b/firebase-config/src/nativeInterop/cinterop/FirebaseRemoteConfig.def index 0d79ca265..366525c26 100644 --- a/firebase-config/src/nativeInterop/cinterop/FirebaseRemoteConfig.def +++ b/firebase-config/src/nativeInterop/cinterop/FirebaseRemoteConfig.def @@ -2,4 +2,4 @@ language = Objective-C package = cocoapods.FirebaseRemoteConfig modules = FirebaseRemoteConfig compilerOpts = -framework FirebaseRemoteConfig -linkerOpts = -framework FirebaseRemoteConfig -framework FirebaseABTesting +linkerOpts = -framework FirebaseABTesting -framework FirebaseRemoteConfig diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts index 352c3b304..bc194fcb5 100644 --- a/firebase-database/build.gradle.kts +++ b/firebase-database/build.gradle.kts @@ -66,6 +66,7 @@ kotlin { "FirebaseCoreDiagnostics", "FirebaseInstallations", "GoogleAppMeasurement", + "GoogleAppMeasurementIdentitySupport", "GoogleDataTransport", "GoogleUtilities", "nanopb", diff --git a/firebase-database/package.json b/firebase-database/package.json index 5ced5cf67..254323830 100644 --- a/firebase-database/package.json +++ b/firebase-database/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-app": "1.4.2", "firebase": "8.10.0", - "kotlin": "1.5.30", + "kotlin": "1.5.31", "kotlinx-coroutines-core": "1.5.2" } } diff --git a/firebase-database/src/nativeInterop/cinterop/Cartfile b/firebase-database/src/nativeInterop/cinterop/Cartfile index 05b39ac4d..48e590b2d 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.6.0 +binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 8.8.0 diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts index b3a2e30f2..a5ca33443 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.30" + kotlin("plugin.serialization") version "1.5.31" } android { @@ -69,6 +69,7 @@ kotlin { "FirebaseCoreDiagnostics", "FirebaseInstallations", "GoogleAppMeasurement", + "GoogleAppMeasurementIdentitySupport", "GoogleDataTransport", "GoogleUtilities", "nanopb", @@ -81,8 +82,8 @@ kotlin { "abseil", "BoringSSL-GRPC", "FirebaseFirestore", - "gRPC-Core", "gRPC-C++", + "gRPC-Core", "leveldb-library" ).map { projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}") diff --git a/firebase-firestore/package.json b/firebase-firestore/package.json index 5e888d979..5eb488417 100644 --- a/firebase-firestore/package.json +++ b/firebase-firestore/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-app": "1.4.2", "firebase": "8.10.0", - "kotlin": "1.5.30", + "kotlin": "1.5.31", "kotlinx-coroutines-core": "1.5.2" } } diff --git a/firebase-firestore/src/nativeInterop/cinterop/Cartfile b/firebase-firestore/src/nativeInterop/cinterop/Cartfile index aaf8803f4..d8580d2e9 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.6.0 +binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 8.8.0 diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts index efcb5016d..a5d77ffa7 100644 --- a/firebase-functions/build.gradle.kts +++ b/firebase-functions/build.gradle.kts @@ -61,6 +61,7 @@ kotlin { "FirebaseCoreDiagnostics", "FirebaseInstallations", "GoogleAppMeasurement", + "GoogleAppMeasurementIdentitySupport", "GoogleDataTransport", "GoogleUtilities", "nanopb", diff --git a/firebase-functions/package.json b/firebase-functions/package.json index 52318978d..a169180a2 100644 --- a/firebase-functions/package.json +++ b/firebase-functions/package.json @@ -25,7 +25,7 @@ "dependencies": { "@gitlive/firebase-app": "1.4.2", "firebase": "8.10.0", - "kotlin": "1.5.30", + "kotlin": "1.5.31", "kotlinx-coroutines-core": "1.5.2" } } diff --git a/firebase-functions/src/nativeInterop/cinterop/Cartfile b/firebase-functions/src/nativeInterop/cinterop/Cartfile index 1bd88ed9d..04b616b81 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.6.0 +binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 8.8.0