Skip to content

Commit 5332e61

Browse files
committed
Merge remote-tracking branch 'GitLiveApp/master' into feature/field-value-encoding
2 parents ebe3198 + 00968f7 commit 5332e61

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,13 @@ These properties are only accessible from the equivalent target's source set. Fo
278278
.build()
279279
```
280280

281+
### Running on Android
282+
283+
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*.
284+
281285
### Running on iOS
282286

283-
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).
287+
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).
284288

285289
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`:
286290
```kotlin

firebase-common-internal/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gitlive/firebase-common-internal",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
55
"main": "firebase-common-internal.js",
66
"scripts": {
@@ -23,7 +23,7 @@
2323
},
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
2525
"dependencies": {
26-
"@gitlive/firebase-common": "2.0.0",
26+
"@gitlive/firebase-common": "2.1.0",
2727
"firebase": "9.19.1",
2828
"kotlin": "1.8.20",
2929
"kotlinx-coroutines-core": "1.6.4",

firebase-config/build.gradle.kts

-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ android {
2929
}
3030

3131
compileOptions {
32-
isCoreLibraryDesugaringEnabled = true
3332
sourceCompatibility = JavaVersion.VERSION_17
3433
targetCompatibility = JavaVersion.VERSION_17
3534
}
@@ -45,10 +44,6 @@ android {
4544
}
4645
}
4746

48-
dependencies {
49-
coreLibraryDesugaring(libs.android.desugarjdk)
50-
}
51-
5247
val supportIosTarget = project.property("skipIosTarget") != "true"
5348

5449
kotlin {

gradle/libs.versions.toml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = "8.5.2"
2+
agp = "8.6.0"
33
androidx-test-core = "1.6.1"
44
androidx-test-junit = "1.2.1"
55
androidx-test-runner = "1.6.2"
@@ -10,7 +10,7 @@ gson = "2.11.0"
1010
junit = "4.13.2"
1111
kotlin = "2.0.20"
1212
kotlinx-coroutines = "1.9.0-RC.2"
13-
kotlinx-serialization = "1.7.1"
13+
kotlinx-serialization = "1.7.2"
1414
kotlinx-binarycompatibilityvalidator = "0.16.3"
1515
kotlinx-datetime = "0.6.1"
1616
kotlinter = "4.4.1"
@@ -20,7 +20,6 @@ firebase-cocoapods = "11.1.0"
2020
ios-deploymentTarget = "13.0"
2121
test-logger-plugin = "4.0.0"
2222
dokka = "1.9.20"
23-
desugar-libs = "2.1.1"
2423

2524
[libraries]
2625
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-
5049
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
5150
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
5251
dokka-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka" }
53-
android-desugarjdk = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar-libs" }
5452

5553
[plugins]
5654
android-application = { id = "com.android.application", version.ref = "agp" }

0 commit comments

Comments
 (0)