Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updated Firebase SDKs & dependencies #228

Merged
merged 2 commits into from
Oct 11, 2021
Merged

updated Firebase SDKs & dependencies #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b4fb79
updated Firebase SDKs & dependencies
suntrix Oct 4, 2021
1eb08db
gradle update
suntrix Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseInstallations",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"GoogleDataTransport",
"GoogleUtilities",
"nanopb",
Expand Down
2 changes: 1 addition & 1 deletion firebase-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"@gitlive/firebase-common": "1.4.3",
"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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseInstallations",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"GoogleDataTransport",
"GoogleUtilities",
"nanopb",
Expand Down
2 changes: 1 addition & 1 deletion firebase-auth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"@gitlive/firebase-app": "1.4.3",
"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
View file
Open in desktop
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
View file
Open in desktop
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 @@ -86,7 +86,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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseAnalytics",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"FirebaseInstallations",
"GoogleDataTransport",
"GoogleUtilities",
Expand Down
2 changes: 1 addition & 1 deletion firebase-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"@gitlive/firebase-app": "1.4.3",
"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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion firebase-config/src/nativeInterop/cinterop/FirebaseRemoteConfig.def
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseInstallations",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"GoogleDataTransport",
"GoogleUtilities",
"nanopb",
Expand Down
2 changes: 1 addition & 1 deletion firebase-database/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"@gitlive/firebase-app": "1.4.3",
"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
View file
Open in desktop
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
View file
Open in desktop
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 @@ -71,6 +71,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseInstallations",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"GoogleDataTransport",
"GoogleUtilities",
"nanopb",
Expand All @@ -83,8 +84,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"@gitlive/firebase-app": "1.4.3",
"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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ kotlin {
"FirebaseCoreDiagnostics",
"FirebaseInstallations",
"GoogleAppMeasurement",
"GoogleAppMeasurementIdentitySupport",
"GoogleDataTransport",
"GoogleUtilities",
"nanopb",
Expand Down
2 changes: 1 addition & 1 deletion firebase-functions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"@gitlive/firebase-app": "1.4.3",
"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
View file
Open in desktop
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
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Wed May 20 18:31:34 BST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
Loading