From 9464afc095ed72e4696c025da246f756278f8234 Mon Sep 17 00:00:00 2001
From: Andrew Reed <andrew_reed@hotmail.com>
Date: Mon, 2 Sep 2024 21:00:32 +0100
Subject: [PATCH 01/14] Added get reference from url
---
.../kotlin/dev/gitlive/firebase/storage/storage.kt | 2 ++
.../kotlin/dev/gitlive/firebase/storage/storage.kt | 10 ++++++++++
.../kotlin/dev/gitlive/firebase/storage/storage.kt | 2 ++
.../kotlin/dev/gitlive/firebase/storage/storage.kt | 2 ++
.../kotlin/dev/gitlive/firebase/storage/storage.jvm.kt | 4 ++++
5 files changed, 20 insertions(+)
diff --git a/firebase-storage/src/androidMain/kotlin/dev/gitlive/firebase/storage/storage.kt b/firebase-storage/src/androidMain/kotlin/dev/gitlive/firebase/storage/storage.kt
index 8d435afed..41c906c45 100644
--- a/firebase-storage/src/androidMain/kotlin/dev/gitlive/firebase/storage/storage.kt
+++ b/firebase-storage/src/androidMain/kotlin/dev/gitlive/firebase/storage/storage.kt
@@ -55,6 +55,8 @@ public actual class FirebaseStorage(internal val android: com.google.firebase.st
public actual val reference: StorageReference get() = StorageReference(android.reference)
public actual fun reference(location: String): StorageReference = StorageReference(android.getReference(location))
+
+ public actual fun getReferenceFromUrl(fullUrl: String): StorageReference = StorageReference(android.getReferenceFromUrl(fullUrl))
}
public val StorageReference.android: com.google.firebase.storage.StorageReference get() = android
diff --git a/firebase-storage/src/commonMain/kotlin/dev/gitlive/firebase/storage/storage.kt b/firebase-storage/src/commonMain/kotlin/dev/gitlive/firebase/storage/storage.kt
index 8485adc51..57d311fed 100644
--- a/firebase-storage/src/commonMain/kotlin/dev/gitlive/firebase/storage/storage.kt
+++ b/firebase-storage/src/commonMain/kotlin/dev/gitlive/firebase/storage/storage.kt
@@ -86,6 +86,16 @@ public expect class FirebaseStorage {
* @return An instance of [StorageReference] at the given child path.
*/
public fun reference(location: String): StorageReference
+
+ /**
+ * Creates a [StorageReference] given a gs:// or https:// URL pointing to a Firebase Storage location.
+ *
+ * @param fullUrl A gs:// or http[s]:// URL used to initialize the reference. For example, you can pass
+ * in a download URL retrieved from getDownloadUrl or the uri retrieved from toString An error is
+ * thrown if fullUrl is not associated with the FirebaseApp used to initialize this FirebaseStorage.
+ * @return An instance of [StorageReference] at the given url.
+ */
+ public fun getReferenceFromUrl(fullUrl: String): StorageReference
}
@Deprecated("Deprecated to use Kotlin Duration", replaceWith = ReplaceWith("maxOperationRetryTime"))
diff --git a/firebase-storage/src/iosMain/kotlin/dev/gitlive/firebase/storage/storage.kt b/firebase-storage/src/iosMain/kotlin/dev/gitlive/firebase/storage/storage.kt
index 0a0c1afab..46dcbe97e 100644
--- a/firebase-storage/src/iosMain/kotlin/dev/gitlive/firebase/storage/storage.kt
+++ b/firebase-storage/src/iosMain/kotlin/dev/gitlive/firebase/storage/storage.kt
@@ -67,6 +67,8 @@ public actual class FirebaseStorage(internal val ios: FIRStorage) {
public actual val reference: StorageReference get() = StorageReference(ios.reference())
public actual fun reference(location: String): StorageReference = StorageReference(ios.referenceWithPath(location))
+
+ public actual fun getReferenceFromUrl(fullUrl: String): StorageReference = StorageReference(ios.referenceForURL(fullUrl))
}
public val StorageReference.ios: FIRStorageReference get() = ios
diff --git a/firebase-storage/src/jsMain/kotlin/dev/gitlive/firebase/storage/storage.kt b/firebase-storage/src/jsMain/kotlin/dev/gitlive/firebase/storage/storage.kt
index 14a7897b3..5337601ae 100644
--- a/firebase-storage/src/jsMain/kotlin/dev/gitlive/firebase/storage/storage.kt
+++ b/firebase-storage/src/jsMain/kotlin/dev/gitlive/firebase/storage/storage.kt
@@ -51,6 +51,8 @@ public actual class FirebaseStorage(internal val js: dev.gitlive.firebase.storag
public actual val reference: StorageReference get() = StorageReference(ref(js))
public actual fun reference(location: String): StorageReference = rethrow { StorageReference(ref(js, location)) }
+
+ public actual fun getReferenceFromUrl(fullUrl: String): StorageReference = rethrow { StorageReference(ref(js, fullUrl)) }
}
public val StorageReference.js get() = js
diff --git a/firebase-storage/src/jvmMain/kotlin/dev/gitlive/firebase/storage/storage.jvm.kt b/firebase-storage/src/jvmMain/kotlin/dev/gitlive/firebase/storage/storage.jvm.kt
index 9d4f16ab8..c3674a728 100644
--- a/firebase-storage/src/jvmMain/kotlin/dev/gitlive/firebase/storage/storage.jvm.kt
+++ b/firebase-storage/src/jvmMain/kotlin/dev/gitlive/firebase/storage/storage.jvm.kt
@@ -37,6 +37,10 @@ public actual class FirebaseStorage {
public actual fun reference(location: String): StorageReference {
TODO("Not yet implemented")
}
+
+ public actual fun getReferenceFromUrl(fullUrl: String): StorageReference {
+ TODO("Not yet implemented")
+ }
}
public actual class StorageReference {
From 80f0ba0280cfc6f9818404ee178ed8815c34adf6 Mon Sep 17 00:00:00 2001
From: Andrew Reed <andrew_reed@hotmail.com>
Date: Mon, 2 Sep 2024 21:16:10 +0100
Subject: [PATCH 02/14] adjusted firebase storage api
---
firebase-storage/api/android/firebase-storage.api | 1 +
firebase-storage/api/jvm/firebase-storage.api | 1 +
2 files changed, 2 insertions(+)
diff --git a/firebase-storage/api/android/firebase-storage.api b/firebase-storage/api/android/firebase-storage.api
index 4715f8dcf..3613f5aab 100644
--- a/firebase-storage/api/android/firebase-storage.api
+++ b/firebase-storage/api/android/firebase-storage.api
@@ -13,6 +13,7 @@ public final class dev/gitlive/firebase/storage/FirebaseStorage {
public final fun getMaxOperationRetryTime-UwyO8pc ()J
public final fun getMaxUploadRetryTime-UwyO8pc ()J
public final fun getReference ()Ldev/gitlive/firebase/storage/StorageReference;
+ public final fun getReferenceFromUrl (Ljava/lang/String;)Ldev/gitlive/firebase/storage/StorageReference;
public final fun reference (Ljava/lang/String;)Ldev/gitlive/firebase/storage/StorageReference;
public final fun setMaxOperationRetryTime-LRDsOJo (J)V
public final fun setMaxUploadRetryTime-LRDsOJo (J)V
diff --git a/firebase-storage/api/jvm/firebase-storage.api b/firebase-storage/api/jvm/firebase-storage.api
index e94fb4ab9..eaa50149c 100644
--- a/firebase-storage/api/jvm/firebase-storage.api
+++ b/firebase-storage/api/jvm/firebase-storage.api
@@ -11,6 +11,7 @@ public final class dev/gitlive/firebase/storage/FirebaseStorage {
public final fun getMaxOperationRetryTime-UwyO8pc ()J
public final fun getMaxUploadRetryTime-UwyO8pc ()J
public final fun getReference ()Ldev/gitlive/firebase/storage/StorageReference;
+ public final fun getReferenceFromUrl (Ljava/lang/String;)Ldev/gitlive/firebase/storage/StorageReference;
public final fun reference (Ljava/lang/String;)Ldev/gitlive/firebase/storage/StorageReference;
public final fun setMaxOperationRetryTime-LRDsOJo (J)V
public final fun setMaxUploadRetryTime-LRDsOJo (J)V
From aa1fbb3a87d356742b9441fc480b5575c68fca31 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 22:08:38 +0000
Subject: [PATCH 03/14] Bump dev.gitlive:firebase-java-sdk from 0.4.5 to 0.4.6
Bumps [dev.gitlive:firebase-java-sdk](https://github.com/GitLiveApp/firebase-java-sdk) from 0.4.5 to 0.4.6.
- [Release notes](https://github.com/GitLiveApp/firebase-java-sdk/releases)
- [Commits](https://github.com/GitLiveApp/firebase-java-sdk/compare/v0.4.5...v0.4.6)
---
updated-dependencies:
- dependency-name: dev.gitlive:firebase-java-sdk
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
---
gradle/libs.versions.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c2a38ad9b..712b20d3a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ androidx-test-junit = "1.2.1"
androidx-test-runner = "1.6.2"
ben-manes-versions = "0.51.0"
firebase-bom = "33.2.0"
-gitlive-firebase-java-sdk = "0.4.5"
+gitlive-firebase-java-sdk = "0.4.6"
gson = "2.11.0"
junit = "4.13.2"
kotlin = "2.0.20"
From ccfec12e43a3b59503ffeea140547518545ab073 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 01:41:42 +0000
Subject: [PATCH 04/14] Bump org.jetbrains.kotlinx:kotlinx-serialization-core
Bumps [org.jetbrains.kotlinx:kotlinx-serialization-core](https://github.com/Kotlin/kotlinx.serialization) from 1.7.1 to 1.7.2.
- [Release notes](https://github.com/Kotlin/kotlinx.serialization/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.serialization/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Kotlin/kotlinx.serialization/compare/v1.7.1...v1.7.2)
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-serialization-core
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
---
gradle/libs.versions.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 712b20d3a..36bcf1e6e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ gson = "2.11.0"
junit = "4.13.2"
kotlin = "2.0.20"
kotlinx-coroutines = "1.9.0-RC.2"
-kotlinx-serialization = "1.7.1"
+kotlinx-serialization = "1.7.2"
kotlinx-binarycompatibilityvalidator = "0.16.3"
kotlinx-datetime = "0.6.1"
kotlinter = "4.4.1"
From 7af92d46fca228ab684abb062222a7018325b23f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 01:41:58 +0000
Subject: [PATCH 05/14] Bump agp from 8.5.2 to 8.6.0
Bumps `agp` from 8.5.2 to 8.6.0.
Updates `com.android.tools.build:gradle` from 8.5.2 to 8.6.0
Updates `com.android.application` from 8.5.2 to 8.6.0
---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.android.application
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
---
gradle/libs.versions.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 712b20d3a..fd87da287 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
[versions]
-agp = "8.5.2"
+agp = "8.6.0"
androidx-test-core = "1.6.1"
androidx-test-junit = "1.2.1"
androidx-test-runner = "1.6.2"
From d6e1a94ec0c437f5b5d55637793b3ee6f1dd8445 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 08:41:55 +0000
Subject: [PATCH 06/14] Bump com.android.tools:desugar_jdk_libs from 2.1.0 to
2.1.1 (#616)
Bumps [com.android.tools:desugar_jdk_libs](https://github.com/google/desugar_jdk_libs) from 2.1.0 to 2.1.1.
- [Changelog](https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/desugar_jdk_libs/commits)
---
updated-dependencies:
- dependency-name: com.android.tools:desugar_jdk_libs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Reed <andrew_reed@hotmail.com>
---
gradle/libs.versions.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 712b20d3a..7ea0120e9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ firebase-cocoapods = "11.1.0"
ios-deploymentTarget = "13.0"
test-logger-plugin = "4.0.0"
dokka = "1.9.20"
-desugar-libs = "2.1.0"
+desugar-libs = "2.1.1"
[libraries]
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
From 5535b9fe5d5572ad8eccb8e0e4b29002f264a371 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Tue, 3 Sep 2024 10:40:04 +0200
Subject: [PATCH 07/14] Disable Desugaring for the library itself
---
README.md | 6 +++++-
firebase-common-internal/package.json | 4 ++--
firebase-config/build.gradle.kts | 5 -----
gradle/libs.versions.toml | 2 --
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 2656b6ef0..eec45beb0 100644
--- a/README.md
+++ b/README.md
@@ -269,9 +269,13 @@ These properties are only accessible from the equivalent target's source set. Fo
.build()
```
+### Running on Android
+
+On android, some modules (`config`) require you to enable [Core library desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring) if you have a *minSDK lower than API 26*.
+
### Running on iOS
-On iOS the official [Firebase iOS SDK](https://github.com/firebase/firebase-ios-sdk) in not linked as a transtive dependency. Therefore, any project using this SDK needs to link the actual Firestore SDK as well. This can be done through your preferred installation method (Cocoapods/SPM).
+On iOS the official [Firebase iOS SDK](https://github.com/firebase/firebase-ios-sdk) in not linked as a transitive dependency. Therefore, any project using this SDK needs to link the actual Firestore SDK as well. This can be done through your preferred installation method (Cocoapods/SPM).
Similarly, tests require linking as well. Make sure to add the required frameworks to the search path of your test targets. This can be done by specifying a `cocoapods` block in your `build.gradle`:
```kotlin
diff --git a/firebase-common-internal/package.json b/firebase-common-internal/package.json
index c1a555b9e..9548da6c3 100644
--- a/firebase-common-internal/package.json
+++ b/firebase-common-internal/package.json
@@ -1,6 +1,6 @@
{
"name": "@gitlive/firebase-common-internal",
- "version": "2.0.0",
+ "version": "2.1.0",
"description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
"main": "firebase-common-internal.js",
"scripts": {
@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
"dependencies": {
- "@gitlive/firebase-common": "2.0.0",
+ "@gitlive/firebase-common": "2.1.0",
"firebase": "9.19.1",
"kotlin": "1.8.20",
"kotlinx-coroutines-core": "1.6.4",
diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts
index a28086463..f942264e4 100644
--- a/firebase-config/build.gradle.kts
+++ b/firebase-config/build.gradle.kts
@@ -29,7 +29,6 @@ android {
}
compileOptions {
- isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
@@ -45,10 +44,6 @@ android {
}
}
-dependencies {
- coreLibraryDesugaring(libs.android.desugarjdk)
-}
-
val supportIosTarget = project.property("skipIosTarget") != "true"
kotlin {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7ea0120e9..dc853f7e0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,7 +20,6 @@ firebase-cocoapods = "11.1.0"
ios-deploymentTarget = "13.0"
test-logger-plugin = "4.0.0"
dokka = "1.9.20"
-desugar-libs = "2.1.1"
[libraries]
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
@@ -50,7 +49,6 @@ kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
dokka-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka" }
-android-desugarjdk = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar-libs" }
[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
From c9754169c098e32fda222d94dfb1f869d8a0cd2d Mon Sep 17 00:00:00 2001
From: Nicholas Bransby-Williams <nbransby@gmail.com>
Date: Mon, 16 Sep 2024 08:12:19 +0100
Subject: [PATCH 08/14] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index eec45beb0..ee12d3d0a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<h1 align="left">Firebase Kotlin SDK <img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/gitliveapp/firebase-kotlin-sdk?style=flat-square"> <a href="https://git.live"><img src="https://img.shields.io/badge/GitLive-45_active_forks-blueviolet?style=flat-square"></a></h1>
+<h1 align="left">Firebase Kotlin SDK <img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/gitliveapp/firebase-kotlin-sdk?style=flat-square"> <a href="https://git.live"><img src="https://img.shields.io/endpoint?style=flatsquare&url=https%3A%2F%2Fteamhub-dev.web.app%2Fbadge%3Forg%3DGitLiveApp%26repo%3Dfirebase-kotlin-sdk"></a></h1>
<img align="left" width="75px" src="https://avatars2.githubusercontent.com/u/42865805?s=200&v=4">
<b>Built and maintained with 🧡 by <a href="https://git.live">GitLive</a></b><br/>
<i>Development teams merge faster with GitLive</i><br/>
From 11c352c26bd27cebaa968f7a4f1777f9e3c4c055 Mon Sep 17 00:00:00 2001
From: Siarhei Luskanau <siarhei.luskanau@gmail.com>
Date: Thu, 12 Sep 2024 07:38:44 +0200
Subject: [PATCH 09/14] Updated `firebase-cocoapods` to "11.2.0". It requires
to update iOS `firebase-ios-sdk` dependency to 11.2.0
---
gradle/libs.versions.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index df03f9ca0..2e2b4e51b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ kotlinx-datetime = "0.6.1"
kotlinter = "4.4.1"
settings-api = "2.0"
settings-language = "2.0"
-firebase-cocoapods = "11.1.0"
+firebase-cocoapods = "11.2.0"
ios-deploymentTarget = "13.0"
test-logger-plugin = "4.0.0"
dokka = "1.9.20"
From 43b3b3caf28ec942be406c6fa2f4f394d0be2371 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 5 Oct 2024 06:36:10 +0000
Subject: [PATCH 10/14] Bump kotlinx-coroutines from 1.9.0-RC.2 to 1.9.0
Bumps `kotlinx-coroutines` from 1.9.0-RC.2 to 1.9.0.
Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core` from 1.9.0-RC.2 to 1.9.0
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.9.0-RC.2...1.9.0)
Updates `org.jetbrains.kotlinx:kotlinx-coroutines-play-services` from 1.9.0-RC.2 to 1.9.0
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.9.0-RC.2...1.9.0)
Updates `org.jetbrains.kotlinx:kotlinx-coroutines-test` from 1.9.0-RC.2 to 1.9.0
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.9.0-RC.2...1.9.0)
Updates `org.jetbrains.kotlinx:kotlinx-coroutines-swing` from 1.9.0-RC.2 to 1.9.0
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.9.0-RC.2...1.9.0)
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-play-services
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-swing
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
---
gradle/libs.versions.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2e2b4e51b..590bbd9aa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ gitlive-firebase-java-sdk = "0.4.6"
gson = "2.11.0"
junit = "4.13.2"
kotlin = "2.0.20"
-kotlinx-coroutines = "1.9.0-RC.2"
+kotlinx-coroutines = "1.9.0"
kotlinx-serialization = "1.7.2"
kotlinx-binarycompatibilityvalidator = "0.16.3"
kotlinx-datetime = "0.6.1"
From dacb86ae242ee46f2af7dabfe9cc68f849a5c4d9 Mon Sep 17 00:00:00 2001
From: Kaido Tarma <kaido.tarma@gmail.com>
Date: Sun, 13 Oct 2024 17:27:06 +0300
Subject: [PATCH 11/14] Fix iOS setCustomKey wrong param order
Fixes https://github.com/GitLiveApp/firebase-kotlin-sdk/issues/520
According to the docs: https://firebase.google.com/docs/crashlytics/customize-crash-reports?platform=ios#add-keys
the order of the parameters is: value, key
setCustomKeysAndValues still expects to order of the map elements to be key, value - so no changes there.
---
.../dev/gitlive/firebase/crashlytics/crashlytics.kt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/firebase-crashlytics/src/iosMain/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt b/firebase-crashlytics/src/iosMain/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt
index 6c6d16bec..5445ceb6e 100644
--- a/firebase-crashlytics/src/iosMain/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt
+++ b/firebase-crashlytics/src/iosMain/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt
@@ -37,22 +37,22 @@ public actual class FirebaseCrashlytics internal constructor(internal val ios: F
}
public actual fun didCrashOnPreviousExecution(): Boolean = ios.didCrashDuringPreviousExecution()
public actual fun setCustomKey(key: String, value: String) {
- ios.setCustomValue(key, value)
+ ios.setCustomValue(value, key)
}
public actual fun setCustomKey(key: String, value: Boolean) {
- ios.setCustomValue(key, value.toString())
+ ios.setCustomValue(value.toString(), key)
}
public actual fun setCustomKey(key: String, value: Double) {
- ios.setCustomValue(key, value.toString())
+ ios.setCustomValue(value.toString(), key)
}
public actual fun setCustomKey(key: String, value: Float) {
- ios.setCustomValue(key, value.toString())
+ ios.setCustomValue(value.toString(), key)
}
public actual fun setCustomKey(key: String, value: Int) {
- ios.setCustomValue(key, value.toString())
+ ios.setCustomValue(value.toString(), key)
}
public actual fun setCustomKey(key: String, value: Long) {
- ios.setCustomValue(key, value.toString())
+ ios.setCustomValue(value.toString(), key)
}
@Suppress("UNCHECKED_CAST")
From 6287b166c435866110fe5da77fbbf4f10192e488 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 21:59:51 +0000
Subject: [PATCH 12/14] Bump kotlin from 2.0.20 to 2.0.21
Bumps `kotlin` from 2.0.20 to 2.0.21.
Updates `org.jetbrains.kotlin.plugin.serialization` from 2.0.20 to 2.0.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.20...v2.0.21)
Updates `org.jetbrains.kotlin.multiplatform` from 2.0.20 to 2.0.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.20...v2.0.21)
Updates `org.jetbrains.kotlin.native.cocoapods` from 2.0.20 to 2.0.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.21/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.20...v2.0.21)
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.plugin.serialization
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin.multiplatform
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin.native.cocoapods
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
---
gradle/libs.versions.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2e2b4e51b..8123749bc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ firebase-bom = "33.2.0"
gitlive-firebase-java-sdk = "0.4.6"
gson = "2.11.0"
junit = "4.13.2"
-kotlin = "2.0.20"
+kotlin = "2.0.21"
kotlinx-coroutines = "1.9.0-RC.2"
kotlinx-serialization = "1.7.2"
kotlinx-binarycompatibilityvalidator = "0.16.3"
From 848ab50e7a91d33048b2ec0171824adabd52f088 Mon Sep 17 00:00:00 2001
From: "Todd B. Smith" <elliptic1@gmail.com>
Date: Sun, 3 Nov 2024 13:49:24 -0500
Subject: [PATCH 13/14] Update README.md
Fixed typo
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ee12d3d0a..f0546c011 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ plugins {
}
```
-Then mark you custom classes `@Serializable`:
+Then mark your custom classes `@Serializable`:
```kotlin
@Serializable
From 845c0e0c1d9044ec020c895403367f39282f6ce2 Mon Sep 17 00:00:00 2001
From: Yahor <egorikftp@gmail.com>
Date: Mon, 14 Oct 2024 13:52:19 +0300
Subject: [PATCH 14/14] Bump firebase to 11.4.0
---
gradle/libs.versions.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2e2b4e51b..9d064703f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ kotlinx-datetime = "0.6.1"
kotlinter = "4.4.1"
settings-api = "2.0"
settings-language = "2.0"
-firebase-cocoapods = "11.2.0"
+firebase-cocoapods = "11.4.0"
ios-deploymentTarget = "13.0"
test-logger-plugin = "4.0.0"
dokka = "1.9.20"