Skip to content

Commit a0de5dd

Browse files
joreillyjoreilly
authored
Merge pull request #1621 from joreilly/dependency_updates
dependency updates
2 parents 5b06cfc + 73d5412 commit a0de5dd

File tree

10 files changed

+82
-81
lines changed

10 files changed

+82
-81
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Confetti 🎊
22

3-
![kotlin-version](https://img.shields.io/badge/kotlin-2.1.0-blue?logo=kotlin)
3+
![kotlin-version](https://img.shields.io/badge/kotlin-2.2.0-blue?logo=kotlin)
44

55
[<img src="https://upload.wikimedia.org/wikipedia/commons/7/78/Google_Play_Store_badge_EN.svg"
66
alt="Get it on Google Play Store"

‎backend/service-graphql/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import compat.patrouille.configureJavaCompatibility
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
34

45
plugins {
@@ -35,7 +36,7 @@ dependencies {
3536
}
3637

3738
tasks.withType<KotlinCompile>().configureEach {
38-
kotlinOptions.jvmTarget = "17"
39+
compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
3940
}
4041

4142
springBoot {

‎compose-desktop/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23

34
plugins {
@@ -30,8 +31,8 @@ kotlin {
3031
}
3132

3233
tasks.withType<KotlinCompile> {
33-
kotlinOptions {
34-
jvmTarget = "17"
34+
compilerOptions {
35+
jvmTarget.set(JvmTarget.JVM_17)
3536
}
3637
}
3738

‎compose-web/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ version = "1.0-SNAPSHOT"
1010

1111
kotlin {
1212
wasmJs {
13-
moduleName = "confetti"
1413
browser {
1514
commonWebpackConfig {
1615
outputFileName = "confetti.js"

‎gradle/libs.versions.toml

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,59 @@
11
[versions]
2-
kotlin = "2.1.20"
3-
ksp = "2.1.20-2.0.0"
4-
kotlinx-coroutines = "1.10.1"
5-
kotlinx-datetime = "0.6.2"
2+
kotlin = "2.2.0"
3+
ksp = "2.2.0-2.0.2"
4+
kotlinx-coroutines = "1.10.2"
5+
kotlinx-datetime = "0.6.0"
6+
kotlinx-serialization = "1.9.0"
67
apollo-kotlin-execution = "0.1.1-SNAPSHOT-fd7fa806b95c5b9046494989a7dd478c47237e12"
78
compatPatrouille = "0.0.0"
89

9-
agp = "8.8.2"
10+
agp = "8.11.0"
1011
activity-compose = "1.10.1"
11-
androidx-lifecycle = "2.8.7"
12-
androidx-datastore = "1.1.5"
13-
apollo = "4.2.0"
14-
apollo-cache = "1.0.0-alpha.1"
15-
compose = "1.8.0"
16-
compose-hot-reload = "1.0.0-alpha09"
17-
composeLifecyleRuntime="2.9.0-alpha07"
18-
compose-multiplatform = "1.8.0"
12+
androidx-lifecycle = "2.9.1"
13+
androidx-datastore = "1.1.7"
14+
apollo = "4.3.1"
15+
apollo-cache = "1.0.0-alpha.4"
16+
compose = "1.8.3"
17+
compose-hot-reload = "1.0.0-beta03"
18+
composeLifecyleRuntime="2.9.1"
19+
compose-multiplatform = "1.8.2"
1920
compose-material3 = "1.3.2"
2021
composeWindowSize = "0.5.0"
2122
credentials = "1.5.0"
22-
decompose = "3.4.0-alpha01"
23+
decompose = "3.4.0-alpha03"
2324
doistx-normalize = "1.2.0"
2425
essenty = "2.5.0"
2526
googleid = "1.1.1"
2627
horologist = "0.7.10-alpha"
2728
io-coil-kt = "2.7.0"
28-
io-coil3-kt = "3.2.0-rc02"
29-
kermit = "2.0.5"
29+
io-coil3-kt = "3.2.0"
30+
kermit = "2.0.6"
3031
kmmbridge = "0.5.7"
31-
koin = "4.1.0-Beta8"
32-
kotlinx-coroutines-play-services = "1.10.1"
33-
lifecycle = "2.8.7"
34-
lifecycle-livedata-ktx = "2.8.7"
35-
materialkolor = "2.0.0"
32+
koin = "4.1.0"
33+
kotlinx-coroutines-play-services = "1.10.2"
34+
lifecycle = "2.9.1"
35+
lifecycle-livedata-ktx = "2.9.1"
36+
materialkolor = "2.1.1"
3637
multiplatform-settings = "1.3.0"
37-
nav-compose = "2.9.0-rc01"
38-
okio = "3.10.2"
38+
nav-compose = "2.9.1"
39+
okio = "3.15.0"
3940
permissions = "0.19.1"
4041
permissionsCompose = "0.19.1"
4142
permissionsNotifications = "0.19.1"
42-
protolayout = "1.3.0-beta01"
43-
robolectric = "4.14.1"
44-
room = "2.7.1"
45-
tiles-tooling-preview = "1.5.0-beta01"
43+
protolayout = "1.3.0"
44+
robolectric = "4.15.1"
45+
room = "2.7.2"
46+
tiles-tooling-preview = "1.5.0"
4647
wear = "1.3.0"
4748
wear-watchface = "1.3.0-alpha07"
4849
wear-compose = "1.5.0-alpha12"
4950
wearPhoneInteractions = "1.1.0"
50-
work-runtime-ktx = "2.10.1"
51-
spring = "3.4.4"
51+
work-runtime-ktx = "2.10.2"
52+
spring = "3.5.3"
5253
generativeai = "0.9.0-1.1.0"
53-
buildkonfig = "0.15.2"
54-
roborazzi = "1.43.1"
55-
screenshot = "0.0.1-alpha09"
54+
buildkonfig = "0.17.1"
55+
roborazzi = "1.46.1"
56+
screenshot = "0.0.1-alpha10"
5657

5758

5859
[libraries]
@@ -70,7 +71,7 @@ androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-view
7071
androidx-protolayout-expression = { module = "androidx.wear.protolayout:protolayout-expression", version.ref = "protolayout" }
7172
androidx-protolayout-expression-pipeline = { module = "androidx.wear.protolayout:protolayout-expression-pipeline", version.ref = "protolayout" }
7273
androidx-protolayout-material = { module = "androidx.wear.protolayout:protolayout-material", version.ref = "protolayout" }
73-
androidx-protolayout-material3 = { module = "androidx.wear.protolayout:protolayout-material3", version = "1.0.0-alpha27" }
74+
androidx-protolayout-material3 = { module = "androidx.wear.protolayout:protolayout-material3", version = "1.3.0" }
7475
androidx-protolayout-proto = { module = "androidx.wear.protolayout:protolayout-proto", version.ref = "protolayout" }
7576
androidx-tiles-tooling-preview = { module = "androidx.wear.tiles:tiles-tooling-preview", version.ref = "tiles-tooling-preview" }
7677
androidx-tiles-tooling = { module = "androidx.wear.tiles:tiles-tooling", version.ref = "tiles-tooling-preview" }
@@ -130,7 +131,7 @@ desugar = "com.android.tools:desugar_jdk_libs:2.1.3"
130131
firebase-admin = { module = "com.google.firebase:firebase-admin", version = "9.4.3" }
131132
firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
132133
firebase-auth = { module = "com.google.firebase:firebase-auth" }
133-
firebase-bom = "com.google.firebase:firebase-bom:33.12.0"
134+
firebase-bom = "com.google.firebase:firebase-bom:33.16.0"
134135
firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
135136
firebase-performance = { module = "com.google.firebase:firebase-perf" }
136137
firebase-mpp-auth = "dev.gitlive:firebase-auth:1.13.0"
@@ -169,7 +170,7 @@ kotlinx-coroutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutine
169170
kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines-play-services" }
170171
kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
171172
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
172-
kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1"
173+
kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
173174
ktor-cio = "io.ktor:ktor-server-cio:2.3.13"
174175
ktor-status-pages = "io.ktor:ktor-server-status-pages:2.3.13"
175176
lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" }
@@ -181,15 +182,15 @@ multiplatform-settings-serialization = { module = "com.russhwolf:multiplatform-s
181182
multiplatform-settings-coroutines = { module = "com.russhwolf:multiplatform-settings-serialization", version.ref = "multiplatform-settings" }
182183
multiplatform-settings-make-observable = { module = "com.russhwolf:multiplatform-settings-make-observable", version.ref = "multiplatform-settings" }
183184
multiplatform-settings-datastore = { module = "com.russhwolf:multiplatform-settings-datastore", version.ref = "multiplatform-settings" }
184-
okhttp = "com.squareup.okhttp3:okhttp:5.0.0-alpha.14"
185-
okhttp-coroutines = "com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14"
186-
okhttp-logging-interceptor = "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.14"
185+
okhttp = "com.squareup.okhttp3:okhttp:5.0.0"
186+
okhttp-coroutines = "com.squareup.okhttp3:okhttp-coroutines:5.0.0"
187+
okhttp-logging-interceptor = "com.squareup.okhttp3:logging-interceptor:5.0.0"
187188
play-services-auth = "com.google.android.gms:play-services-auth:21.3.0"
188189
plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
189190
plugin-android-application = { module = "com.android.tools.build:gradle", version.ref = "agp" }
190191
plugin-apollo = { module = "com.apollographql.apollo:apollo-gradle-plugin", version.ref = "apollo" }
191-
plugin-firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-gradle", version = "2.9.9" }
192-
plugin-google-services = "com.google.gms:google-services:4.4.2"
192+
plugin-firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-gradle", version = "3.0.4" }
193+
plugin-google-services = "com.google.gms:google-services:4.4.3"
193194
plugin-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
194195
plugin-kotlin-spring = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlin" }
195196
plugin-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }

‎iosApp/iosApp.xcodeproj/xcuserdata/joreilly.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,86 +12,86 @@
1212
<key>Promises (Playground) 1.xcscheme</key>
1313
<dict>
1414
<key>isShown</key>
15-
<false/>
15+
<false />
1616
<key>orderHint</key>
17-
<integer>2</integer>
17+
<integer>4</integer>
1818
</dict>
1919
<key>Promises (Playground) 2.xcscheme</key>
2020
<dict>
2121
<key>isShown</key>
22-
<false/>
22+
<false />
2323
<key>orderHint</key>
24-
<integer>3</integer>
24+
<integer>7</integer>
2525
</dict>
2626
<key>Promises (Playground).xcscheme</key>
2727
<dict>
2828
<key>isShown</key>
29-
<false/>
29+
<false />
3030
<key>orderHint</key>
31-
<integer>1</integer>
31+
<integer>2</integer>
3232
</dict>
3333
<key>Rx (Playground) 1.xcscheme</key>
3434
<dict>
3535
<key>isShown</key>
36-
<false/>
36+
<false />
3737
<key>orderHint</key>
38-
<integer>1</integer>
38+
<integer>3</integer>
3939
</dict>
4040
<key>Rx (Playground) 2.xcscheme</key>
4141
<dict>
4242
<key>isShown</key>
43-
<false/>
43+
<false />
4444
<key>orderHint</key>
45-
<integer>3</integer>
45+
<integer>8</integer>
4646
</dict>
4747
<key>Rx (Playground) 3.xcscheme</key>
4848
<dict>
4949
<key>isShown</key>
50-
<false/>
50+
<false />
5151
<key>orderHint</key>
52-
<integer>2</integer>
52+
<integer>5</integer>
5353
</dict>
5454
<key>Rx (Playground) 4.xcscheme</key>
5555
<dict>
5656
<key>isShown</key>
57-
<false/>
57+
<false />
5858
<key>orderHint</key>
59-
<integer>5</integer>
59+
<integer>9</integer>
6060
</dict>
6161
<key>Rx (Playground) 5.xcscheme</key>
6262
<dict>
6363
<key>isShown</key>
64-
<false/>
64+
<false />
6565
<key>orderHint</key>
66-
<integer>6</integer>
66+
<integer>10</integer>
6767
</dict>
6868
<key>Rx (Playground) 6.xcscheme</key>
6969
<dict>
7070
<key>isShown</key>
71-
<false/>
71+
<false />
7272
<key>orderHint</key>
73-
<integer>7</integer>
73+
<integer>11</integer>
7474
</dict>
7575
<key>Rx (Playground) 7.xcscheme</key>
7676
<dict>
7777
<key>isShown</key>
78-
<false/>
78+
<false />
7979
<key>orderHint</key>
80-
<integer>8</integer>
80+
<integer>12</integer>
8181
</dict>
8282
<key>Rx (Playground) 8.xcscheme</key>
8383
<dict>
8484
<key>isShown</key>
85-
<false/>
85+
<false />
8686
<key>orderHint</key>
87-
<integer>9</integer>
87+
<integer>13</integer>
8888
</dict>
8989
<key>Rx (Playground).xcscheme</key>
9090
<dict>
9191
<key>isShown</key>
92-
<false/>
92+
<false />
9393
<key>orderHint</key>
94-
<integer>2</integer>
94+
<integer>6</integer>
9595
</dict>
9696
<key>iosApp.xcscheme_^#shared#^_</key>
9797
<dict>

‎shared/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ dependencies {
2424

2525
kotlin {
2626
wasmJs {
27-
moduleName = "confetti"
2827
browser {
2928
commonWebpackConfig {
3029
outputFileName = "confetti.js"

‎shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ApolloClientCache.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class ApolloClientCache : KoinComponent {
149149
_clients.clear()
150150
}
151151

152-
fun clear() {
152+
suspend fun clear() {
153153
_clients.values.forEach {
154154
it.apolloStore.clearAll()
155155
it.close()

‎wearApp/src/main/java/dev/johnoreilly/confetti/wear/preview/TestFixtures.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ object TestFixtures {
1111
val sessionTime = LocalDateTime.parse("2023-04-13T14:00")
1212

1313
val kotlinConf2023 = GetConferencesQuery.Conference(
14+
__typename = "Conference",
1415
"kotlinconf2023",
1516
"",
1617
listOf(
@@ -20,67 +21,66 @@ object TestFixtures {
2021
),
2122
"KotlinConf 2023",
2223
"0xFF800000",
23-
__typename = "Conference",
2424
)
2525

2626
val kotlinConf2023Config = GetBookmarkedSessionsQuery.Config(
27+
__typename = "Conference",
2728
kotlinConf2023.id,
2829
"",
2930
kotlinConf2023.days,
3031
kotlinConf2023.name,
31-
__typename = "Conference"
3232
)
3333

3434
// Generate from FetchDataTest.fetchConferences
3535
val conferences = listOf(
3636
kotlinConf2023,
3737
GetConferencesQuery.Conference(
38+
__typename = "Conference",
3839
"fosdem2023",
3940
"",
4041
listOf(LocalDate.parse("2023-02-04"), LocalDate.parse("2023-02-05")),
4142
"Fosdem 2023",
4243
"0xFF008000",
43-
__typename = "Conference",
4444
),
4545
GetConferencesQuery.Conference(
46+
__typename = "Conference",
4647
"droidconlondon2022",
4748
"",
4849
listOf(LocalDate.parse("2022-10-27"), LocalDate.parse("2022-10-28")),
4950
"droidcon London",
5051
"0xFF800000",
51-
__typename = "Conference",
5252
),
5353
GetConferencesQuery.Conference(
54+
__typename = "Conference",
5455
"devfestnantes",
5556
"",
5657
listOf(LocalDate.parse("2022-10-20"), LocalDate.parse("2022-10-21")),
5758
"DevFest Nantes",
5859
"0xFF800000",
59-
__typename = "Conference",
6060
),
6161
GetConferencesQuery.Conference(
62+
__typename = "Conference",
6263
"graphqlsummit2022",
6364
"",
6465
listOf(LocalDate.parse("2022-10-04"), LocalDate.parse("2022-10-05")),
6566
"GraphQL Summit",
6667
"0xFF800000",
67-
__typename = "Conference",
6868
),
6969
GetConferencesQuery.Conference(
70+
__typename = "Conference",
7071
"frenchkit2022",
7172
"",
7273
listOf(LocalDate.parse("2022-09-29"), LocalDate.parse("2022-09-30")),
7374
"FrenchKit",
7475
"0xFF800000",
75-
__typename = "Conference",
7676
),
7777
GetConferencesQuery.Conference(
78+
__typename = "Conference",
7879
"droidconsf",
7980
"",
8081
listOf(LocalDate.parse("2022-06-02"), LocalDate.parse("2022-06-03")),
8182
"droidcon SF",
8283
"0xFF800000",
83-
__typename = "Conference",
8484
)
8585
)
8686

0 commit comments

Comments
 (0)