Skip to content

Commit f3ec864

Browse files
authored
Merge pull request #1608 from joreilly/dependency_updates
Compose Multiplatform 1.8.0-rc01 + other dependency updates
2 parents c2bb3d2 + 257c94c commit f3ec864

File tree

3 files changed

+24
-28
lines changed

3 files changed

+24
-28
lines changed

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ org.gradle.parallel=true
55

66
#Kotlin
77
kotlin.code.style=official
8+
kotlin.native.cacheKind=none
89

910
#Android
1011
android.useAndroidX=true

gradle/libs.versions.toml

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ kotlinx-datetime = "0.6.2"
66
apollo-kotlin-execution = "0.1.1-SNAPSHOT-fd7fa806b95c5b9046494989a7dd478c47237e12"
77
compatPatrouille = "0.0.0"
88

9-
agp = "8.8.0"
9+
agp = "8.8.2"
1010
activity-compose = "1.10.1"
1111
androidx-lifecycle = "2.8.7"
12-
androidx-datastore = "1.1.4"
12+
androidx-datastore = "1.1.5"
1313
apollo = "4.1.1"
1414
apollo-cache = "0.0.8"
15-
compose = "1.7.8"
15+
compose = "1.8.0"
1616
compose-hot-reload = "1.0.0-alpha05"
17-
composeLifecyleRuntime="2.8.4"
18-
compose-multiplatform = "1.7.3"
19-
compose-material3 = "1.3.1"
17+
composeLifecyleRuntime="2.9.0-alpha07"
18+
compose-multiplatform = "1.8.0-rc01"
19+
compose-material3 = "1.3.2"
2020
composeWindowSize = "0.5.0"
2121
credentials = "1.5.0"
2222
decompose = "3.3.0"
@@ -28,39 +28,39 @@ io-coil-kt = "2.7.0"
2828
io-coil3-kt = "3.1.0"
2929
kermit = "2.0.5"
3030
kmmbridge = "0.5.7"
31-
koin-android = "4.0.0"
32-
koin-android-compose = "4.0.0"
31+
koin-android = "4.0.4"
32+
koin-android-compose = "4.0.4"
3333
koin-compose-multiplatform = "4.0.4"
3434
koin-core = "4.0.4"
3535
kotlinx-coroutines-play-services = "1.10.1"
3636
lifecycle = "2.8.7"
3737
lifecycle-livedata-ktx = "2.8.7"
3838
materialkolor = "2.0.0"
3939
multiplatform-settings = "1.3.0"
40-
nav-compose = "2.8.9"
40+
nav-compose = "2.9.0-rc01"
4141
okio = "3.10.2"
4242
permissions = "0.19.1"
4343
permissionsCompose = "0.19.1"
4444
permissionsNotifications = "0.19.1"
45-
protolayout = "1.3.0-alpha10"
45+
protolayout = "1.3.0-beta01"
4646
robolectric = "4.14.1"
47-
room = "2.6.1"
48-
tiles-tooling-preview = "1.5.0-alpha10"
47+
room = "2.7.1"
48+
tiles-tooling-preview = "1.5.0-beta01"
4949
wear = "1.3.0"
50-
wear-watchface = "1.3.0-alpha06"
50+
wear-watchface = "1.3.0-alpha07"
5151
wear-compose = "1.5.0-alpha12"
5252
wearPhoneInteractions = "1.1.0"
53-
work-runtime-ktx = "2.10.0"
53+
work-runtime-ktx = "2.10.1"
5454
spring = "3.4.4"
55-
generativeai = "0.9.0-1.0.1-wasm"
55+
generativeai = "0.9.0-1.1.0"
5656
buildkonfig = "0.15.2"
5757
roborazzi = "1.43.1"
5858
screenshot = "0.0.1-alpha09"
5959

6060

6161
[libraries]
6262
activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
63-
androidx-benchmarkmacro = "androidx.benchmark:benchmark-macro-junit4:1.3.3"
63+
androidx-benchmarkmacro = "androidx.benchmark:benchmark-macro-junit4:1.3.4"
6464
androidx-complications-rendering = { module = "androidx.wear.watchface:watchface-complications-rendering", version.ref = "wear-watchface"}
6565
androidx-compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "wear-compose" }
6666
androidx-credentials = { module = "androidx.credentials:credentials", version.ref = "credentials" }
@@ -103,7 +103,7 @@ apollo-annotations = { module = "com.apollographql.apollo:apollo-annotations", v
103103
apollo-tooling = { module = "com.apollographql.apollo:apollo-tooling", version.ref = "apollo" }
104104
apollo-testing = { module = "com.apollographql.apollo:apollo-testing-support" }
105105
apollo-debug-server = { module = "com.apollographql.apollo:apollo-debug-server" }
106-
atomicfu = "org.jetbrains.kotlinx:atomicfu:0.26.1"
106+
atomicfu = "org.jetbrains.kotlinx:atomicfu:0.27.0"
107107
bare-graphQL = "net.mbonnin.bare-graphql:bare-graphql:0.0.2"
108108
car-app-auto = "androidx.car.app:app:1.4.0"
109109
car-app-automotive = "androidx.car.app:app-automotive:1.4.0"
@@ -116,7 +116,7 @@ coil3-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.r
116116
materialkolor = { module = "com.materialkolor:material-kolor", version.ref = "materialkolor" }
117117

118118
compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
119-
compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version = "1.7.6" }
119+
compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version = "1.7.8" }
120120
compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "nav-compose" }
121121
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
122122
compose-ui-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" }
@@ -133,11 +133,11 @@ desugar = "com.android.tools:desugar_jdk_libs:2.1.3"
133133
firebase-admin = { module = "com.google.firebase:firebase-admin", version = "9.4.3" }
134134
firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
135135
firebase-auth = { module = "com.google.firebase:firebase-auth" }
136-
firebase-bom = "com.google.firebase:firebase-bom:33.9.0"
136+
firebase-bom = "com.google.firebase:firebase-bom:33.12.0"
137137
firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
138138
firebase-performance = { module = "com.google.firebase:firebase-perf" }
139139
firebase-mpp-auth = "dev.gitlive:firebase-auth:1.13.0"
140-
google-cloud-bom = "com.google.cloud:libraries-bom:26.51.0"
140+
google-cloud-bom = "com.google.cloud:libraries-bom:26.52.0"
141141
google-cloud-storage = { module = "com.google.cloud:google-cloud-storage" }
142142
google-cloud-datastore = "com.google.cloud:google-cloud-datastore:2.25.1"
143143
googleid = { module = "com.google.android.libraries.identity.googleid:googleid", version.ref = "googleid" }
@@ -172,13 +172,11 @@ kotlinx-coroutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutine
172172
kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines-play-services" }
173173
kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
174174
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
175-
kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
175+
kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1"
176176
ktor-cio = "io.ktor:ktor-server-cio:2.3.13"
177177
ktor-status-pages = "io.ktor:ktor-server-status-pages:2.3.13"
178178
lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" }
179179
material3-core = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
180-
material3-window-size = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "compose-material3" }
181-
182180
compose-window-size = { module = "dev.chrisbanes.material3:material3-window-size-class-multiplatform", version.ref = "composeWindowSize" }
183181

184182
multiplatform-settings = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatform-settings" }
@@ -222,7 +220,7 @@ xoxo = "net.mbonnin.xoxo:xoxo:0.4.0"
222220
kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
223221
tink = "com.google.crypto.tink:tink:1.17.0"
224222
jib-core = "com.google.cloud.tools:jib-core:0.27.2"
225-
google-cloud-run = "com.google.cloud:google-cloud-run:0.54.0"
223+
google-cloud-run = "com.google.cloud:google-cloud-run:0.55.0"
226224
compat-patrouille = { module = "com.gradleup.compat.patrouille:com.gradleup.compat.patrouille.gradle.plugin", version.ref = "compatPatrouille" }
227225
generativeai = { module = "dev.shreyaspatil.generativeai:generativeai-google", version.ref = "generativeai" }
228226

shared/src/iosMain/kotlin/dev/johnoreilly/confetti/ui/MainViewController.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.compose.material.icons.Icons
55
import androidx.compose.material.icons.filled.ArrowBackIosNew
66
import androidx.compose.runtime.ExperimentalComposeApi
77
import androidx.compose.ui.Modifier
8-
import androidx.compose.ui.platform.AccessibilitySyncOptions
98
import androidx.compose.ui.window.ComposeUIViewController
109
import com.arkivanov.decompose.ExperimentalDecomposeApi
1110
import com.arkivanov.decompose.extensions.compose.stack.animation.predictiveback.PredictiveBackGestureIcon
@@ -17,9 +16,7 @@ import dev.johnoreilly.confetti.decompose.DefaultAppComponent
1716
fun MainViewController(
1817
component: DefaultAppComponent,
1918
backDispatcher: BackDispatcher,
20-
) = ComposeUIViewController(
21-
configure = { accessibilitySyncOptions = AccessibilitySyncOptions.Always(null) }
22-
) {
19+
) = ComposeUIViewController {
2320
PredictiveBackGestureOverlay(
2421
backDispatcher = backDispatcher,
2522
backIcon = { progress, _ ->

0 commit comments

Comments
 (0)