Skip to content

Commit 18711c1

Browse files
Daeda88Daeda88
committed
Ugrade to Kotlin 1.9.10 & fix tracking issues
1 parent 87d408f commit 18711c1

File tree

19 files changed

+253
-148
lines changed

19 files changed

+253
-148
lines changed

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Firebase as a backend for <a href="https://www.jetbrains.com/lp/compose-multipla
1414

1515
The following libraries are available for the various Firebase products.
1616

17-
| Service or Product | Gradle Dependency | API Coverage |
18-
|---------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
17+
| Service or Product | Gradle Dependency | API Coverage |
18+
|---------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
1919
| [Authentication](https://firebase.google.com/docs/auth) | [`dev.gitlive:firebase-auth:1.10.0`](https://search.maven.org/artifact/dev.gitlive/firebase-auth/1.10.0/pom) | [![80%](https://img.shields.io/badge/-80%25-green?style=flat-square)](/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt) |
2020
| [Realtime Database](https://firebase.google.com/docs/database) | [`dev.gitlive:firebase-database:1.10.0`](https://search.maven.org/artifact/dev.gitlive/firebase-database/1.10.0/pom) | [![70%](https://img.shields.io/badge/-70%25-orange?style=flat-square)](/firebase-database/src/commonMain/kotlin/dev/gitlive/firebase/database/database.kt) |
2121
| [Cloud Firestore](https://firebase.google.com/docs/firestore) | [`dev.gitlive:firebase-firestore:1.10.0`](https://search.maven.org/artifact/dev.gitlive/firebase-firestore/1.10.0/pom) | [![60%](https://img.shields.io/badge/-60%25-orange?style=flat-square)](/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt) |
@@ -161,17 +161,17 @@ To reduce boilerplate, default arguments are used in the places where the Fireba
161161
UserProfileChangeRequest profileUpdates = new UserProfileChangeRequest.Builder()
162162
.setDisplayName("Jane Q. User")
163163
.setPhotoUri(Uri.parse("https://example.com/jane-q-user/profile.jpg"))
164-
.build();
164+
.build()
165165

166166
user.updateProfile(profileUpdates)
167167
.addOnCompleteListener(new OnCompleteListener<Void>() {
168168
@Override
169169
public void onComplete(@NonNull Task<Void> task) {
170170
if (task.isSuccessful()) {
171-
Log.d(TAG, "User profile updated.");
171+
Log.d(TAG, "User profile updated.")
172172
}
173173
}
174-
});
174+
})
175175

176176
//...becomes...
177177

‎firebase-app/build.gradle.kts

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ val supportIosTarget = project.property("skipIosTarget") != "true"
4646

4747
kotlin {
4848

49-
android {
49+
androidTarget() {
5050
publishAllLibraryVariants()
5151
}
5252

5353
jvm {
54-
val main by compilations.getting {
54+
compilations.getByName("main") {
5555
kotlinOptions {
5656
jvmTarget = "17"
5757
}
@@ -77,18 +77,22 @@ kotlin {
7777
js(IR) {
7878
useCommonJs()
7979
nodejs {
80-
testTask {
81-
useKarma {
82-
useChromeHeadless()
80+
testTask(
81+
Action {
82+
useKarma {
83+
useChromeHeadless()
84+
}
8385
}
84-
}
86+
)
8587
}
8688
browser {
87-
testTask {
88-
useKarma {
89-
useChromeHeadless()
89+
testTask(
90+
Action {
91+
useKarma {
92+
useChromeHeadless()
93+
}
9094
}
91-
}
95+
)
9296
}
9397
}
9498

@@ -127,7 +131,7 @@ kotlin {
127131
}
128132
}
129133

130-
val jvmMain by getting {
134+
getByName("jvmMain") {
131135
kotlin.srcDir("src/androidMain/kotlin")
132136
}
133137

‎firebase-auth/build.gradle.kts

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ val supportIosTarget = project.property("skipIosTarget") != "true"
6060

6161
kotlin {
6262

63-
android {
63+
androidTarget {
6464
publishAllLibraryVariants()
6565
}
6666

@@ -82,23 +82,27 @@ kotlin {
8282
js(IR) {
8383
useCommonJs()
8484
nodejs {
85-
testTask {
86-
useKarma {
87-
useChromeHeadless()
85+
testTask(
86+
Action {
87+
useKarma {
88+
useChromeHeadless()
89+
}
8890
}
89-
}
91+
)
9092
}
9193
browser {
92-
testTask {
93-
useKarma {
94-
useChromeHeadless()
94+
testTask(
95+
Action {
96+
useKarma {
97+
useChromeHeadless()
98+
}
9599
}
96-
}
100+
)
97101
}
98102
}
99103

100104
jvm {
101-
val main by compilations.getting {
105+
compilations.getByName("main") {
102106
kotlinOptions {
103107
jvmTarget = "17"
104108
}
@@ -114,6 +118,9 @@ kotlin {
114118
this.languageVersion = languageVersion
115119
progressiveMode = true
116120
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
121+
if (name.lowercase().contains("ios")) {
122+
optIn("kotlinx.cinterop.ExperimentalForeignApi")
123+
}
117124
}
118125
}
119126

@@ -142,7 +149,7 @@ kotlin {
142149
}
143150
}
144151

145-
val jvmMain by getting {
152+
getByName("jvmMain") {
146153
kotlin.srcDir("src/androidMain/kotlin")
147154
}
148155

‎firebase-common/build.gradle.kts

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ android {
4343

4444
kotlin {
4545

46-
android {
46+
androidTarget {
4747
publishAllLibraryVariants()
4848
}
4949

5050
jvm {
51-
val main by compilations.getting {
51+
compilations.getByName("main") {
5252
kotlinOptions {
5353
jvmTarget = "17"
5454
}
5555
}
56-
val test by compilations.getting {
56+
compilations.getByName("test") {
5757
kotlinOptions {
5858
jvmTarget = "17"
5959
}
@@ -70,18 +70,22 @@ kotlin {
7070
js(IR) {
7171
useCommonJs()
7272
nodejs {
73-
testTask {
74-
useKarma {
75-
useChromeHeadless()
73+
testTask(
74+
Action {
75+
useKarma {
76+
useChromeHeadless()
77+
}
7678
}
77-
}
79+
)
7880
}
7981
browser {
80-
testTask {
81-
useKarma {
82-
useChromeHeadless()
82+
testTask(
83+
Action {
84+
useKarma {
85+
useChromeHeadless()
86+
}
8387
}
84-
}
88+
)
8589
}
8690
}
8791

@@ -140,11 +144,11 @@ kotlin {
140144
}
141145
}
142146

143-
val jvmMain by getting {
147+
getByName("jvmMain") {
144148
kotlin.srcDir("src/androidMain/kotlin")
145149
}
146150

147-
val jvmTest by getting {
151+
getByName("jvmTest") {
148152
dependencies {
149153
implementation(kotlin("test-junit"))
150154
}

‎firebase-config/build.gradle.kts

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@ val supportIosTarget = project.property("skipIosTarget") != "true"
6060

6161
kotlin {
6262

63-
android {
63+
androidTarget {
6464
publishAllLibraryVariants()
6565
}
6666

6767
jvm {
68-
val main by compilations.getting {
68+
compilations.getByName("main") {
6969
kotlinOptions {
7070
jvmTarget = "17"
7171
}
7272
}
73-
val test by compilations.getting {
73+
compilations.getByName("test") {
7474
kotlinOptions {
7575
jvmTarget = "17"
7676
}
@@ -95,11 +95,13 @@ kotlin {
9595
js(IR) {
9696
useCommonJs()
9797
browser {
98-
testTask {
99-
useKarma {
100-
useChromeHeadless()
98+
testTask(
99+
Action {
100+
useKarma {
101+
useChromeHeadless()
102+
}
101103
}
102-
}
104+
)
103105
}
104106
}
105107

@@ -112,6 +114,9 @@ kotlin {
112114
this.languageVersion = languageVersion
113115
progressiveMode = true
114116
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
117+
if (name.lowercase().contains("ios")) {
118+
optIn("kotlinx.cinterop.ExperimentalForeignApi")
119+
}
115120
}
116121
}
117122

@@ -140,7 +145,7 @@ kotlin {
140145
}
141146
}
142147

143-
val jvmMain by getting {
148+
getByName("jvmMain") {
144149
kotlin.srcDir("src/androidMain/kotlin")
145150
}
146151

‎firebase-crashlytics/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ val supportIosTarget = project.property("skipIosTarget") != "true"
4747

4848
kotlin {
4949

50-
android {
50+
androidTarget {
5151
publishAllLibraryVariants()
5252
}
5353

5454
// jvm {
55-
// val main by compilations.getting {
55+
// compilations.getByName("main") {
5656
// kotlinOptions {
5757
// jvmTarget = "17"
5858
// }
5959
// }
60-
// val test by compilations.getting {
60+
// compilations.getByName("test") {
6161
// kotlinOptions {
6262
// jvmTarget = "17"
6363
// }
@@ -116,7 +116,7 @@ kotlin {
116116
}
117117
}
118118

119-
// val jvmMain by getting {
119+
// getByName("jvmMain") {
120120
// kotlin.srcDir("src/androidMain/kotlin")
121121
// }
122122

‎firebase-database/build.gradle.kts

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ val supportIosTarget = project.property("skipIosTarget") != "true"
5151

5252
kotlin {
5353

54-
android {
54+
androidTarget {
5555
publishAllLibraryVariants()
5656
}
5757

5858
jvm {
59-
val main by compilations.getting {
59+
compilations.getByName("main") {
6060
kotlinOptions {
6161
jvmTarget = "17"
6262
}
6363
}
64-
val test by compilations.getting {
64+
compilations.getByName("test") {
6565
kotlinOptions {
6666
jvmTarget = "17"
6767
}
@@ -86,18 +86,22 @@ kotlin {
8686
js(IR) {
8787
useCommonJs()
8888
nodejs {
89-
testTask {
90-
useKarma {
91-
useChromeHeadless()
89+
testTask(
90+
Action {
91+
useKarma {
92+
useChromeHeadless()
93+
}
9294
}
93-
}
95+
)
9496
}
9597
browser {
96-
testTask {
97-
useKarma {
98-
useChromeHeadless()
98+
testTask(
99+
Action {
100+
useKarma {
101+
useChromeHeadless()
102+
}
99103
}
100-
}
104+
)
101105
}
102106
}
103107

@@ -127,7 +131,7 @@ kotlin {
127131
implementation(project(":test-utils"))
128132
}
129133
}
130-
val jvmMain by getting {
134+
getByName("jvmMain") {
131135
kotlin.srcDir("src/androidMain/kotlin")
132136
}
133137

0 commit comments

Comments
 (0)