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 #252

Merged
merged 4 commits into from
Dec 13, 2021
Merged

updated Firebase SDKs #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f309866
updated Firebase SDKs, fixed one missing -ktx dependency, fixed wrong…
suntrix Nov 16, 2021
9f614c7
updated minSdkVersion
suntrix Nov 16, 2021
7e7c78e
adjusting try-catch blocks in jsTest
suntrix Nov 18, 2021
f893aa4
removed -ktx dependencies
suntrix Nov 23, 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
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ buildscript {
}
}
dependencies {
classpath("com.android.tools.build:gradle:7.0.1")
classpath("com.android.tools.build:gradle:7.0.3")
classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")
}
}

val targetSdkVersion by extra(30)
val minSdkVersion by extra(16)
val minSdkVersion by extra(19)

tasks {
val updateVersions by registering {
Expand Down Expand Up @@ -196,7 +196,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.1"))
"androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.0"))
"commonTestImplementation"(kotlin("test-common"))
"commonTestImplementation"(kotlin("test-annotations-common"))
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
Expand Down
2 changes: 1 addition & 1 deletion firebase-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ kotlin {

val androidMain by getting {
dependencies {
api("com.google.firebase:firebase-common-ktx")
api("com.google.firebase:firebase-common")
}
}

Expand Down
2 changes: 1 addition & 1 deletion firebase-app/src/jsTest/kotlin/dev/gitlive/firebase/firebase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ actual fun runTest(test: suspend () -> Unit) = GlobalScope
try {
test()
} catch (e: dynamic) {
e.log()
(e as? Throwable)?.log()
throw e
}
}.asDynamic()
Expand Down
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.8.0
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.9.1
2 changes: 1 addition & 1 deletion firebase-auth/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ kotlin {

val androidMain by getting {
dependencies {
api("com.google.firebase:firebase-auth-ktx")
api("com.google.firebase:firebase-auth")
}
}

Expand Down
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.8.0
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.9.1
2 changes: 1 addition & 1 deletion firebase-common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ kotlin {

val androidMain by getting {
dependencies {
api("com.google.firebase:firebase-common-ktx")
api("com.google.firebase:firebase-common")
}
}

Expand Down
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.8.0
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" == 8.9.1
2 changes: 1 addition & 1 deletion firebase-database/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ kotlin {

val androidMain by getting {
dependencies {
api("com.google.firebase:firebase-database-ktx")
api("com.google.firebase:firebase-database")
}
}

Expand Down
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.8.0
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 8.9.1
2 changes: 1 addition & 1 deletion firebase-firestore/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ kotlin {

val androidMain by getting {
dependencies {
api("com.google.firebase:firebase-firestore-ktx")
api("com.google.firebase:firebase-firestore")
}
}

Expand Down
4 changes: 2 additions & 2 deletions firebase-firestore/src/jsTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ actual fun runTest(test: suspend CoroutineScope.() -> Unit) = GlobalScope
.promise {
try {
test()
} catch (e: Throwable) {
e.log()
} catch (e: dynamic) {
(e as? Throwable)?.log()
throw e
}
}.asDynamic()
Expand Down
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.8.0
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 8.9.1
2 changes: 1 addition & 1 deletion firebase-functions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ kotlin {

val androidMain by getting {
dependencies {
api("com.google.firebase:firebase-functions-ktx")
api("com.google.firebase:firebase-functions")
}
}

Expand Down
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.8.0
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 8.9.1