Skip to content

Commit

Permalink
updated Firebase SDKs & dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
suntrix committed Oct 4, 2021
1 parent 6ac7a83 commit f711a23
Show file tree
Hide file tree
Showing 23 changed files with 28 additions and 22 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions firebase-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseInstallations",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"GoogleDataTransport",
"GoogleUtilities",
"nanopb",
Expand Down
2 changes: 1 addition & 1 deletion firebase-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion firebase-app/src/nativeInterop/cinterop/Cartfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion firebase-app/src/nativeInterop/cinterop/FirebaseCore.def
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions firebase-auth/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseInstallations",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"GoogleDataTransport",
"GoogleUtilities",
"nanopb",
Expand Down
2 changes: 1 addition & 1 deletion firebase-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion firebase-auth/src/nativeInterop/cinterop/Cartfile
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions firebase-common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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")
}
}

Expand Down
4 changes: 2 additions & 2 deletions firebase-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
1 change: 1 addition & 0 deletions firebase-config/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseAnalytics",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"FirebaseInstallations",
"GoogleDataTransport",
"GoogleUtilities",
Expand Down
2 changes: 1 addition & 1 deletion firebase-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion firebase-config/src/nativeInterop/cinterop/Cartfile
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions firebase-database/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseInstallations",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"GoogleDataTransport",
"GoogleUtilities",
"nanopb",
Expand Down
2 changes: 1 addition & 1 deletion firebase-database/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion firebase-database/src/nativeInterop/cinterop/Cartfile
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions firebase-firestore/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -69,6 +69,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseInstallations",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"GoogleDataTransport",
"GoogleUtilities",
"nanopb",
Expand All @@ -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}")
Expand Down
2 changes: 1 addition & 1 deletion firebase-firestore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion firebase-firestore/src/nativeInterop/cinterop/Cartfile
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions firebase-functions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseInstallations",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"GoogleDataTransport",
"GoogleUtilities",
"nanopb",
Expand Down
2 changes: 1 addition & 1 deletion firebase-functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion firebase-functions/src/nativeInterop/cinterop/Cartfile
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit f711a23

Please sign in to comment.