Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3954a65

Browse files
committed
dependency updates
1 parentc3e210d commit3954a65

File tree

10 files changed

+51
-74
lines changed

10 files changed

+51
-74
lines changed

‎build-logic/src/main/kotlin/Dependencies.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
object AndroidSdk {
44
constval min=24
5-
constval compile=35
5+
constval compile=36
66
constval target= compile
77
}
88

‎compose-web/build.gradle.kts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
@file:OptIn(ExperimentalWasmDsl::class)
2+
3+
importorg.jetbrains.kotlin.gradle.ExperimentalWasmDsl
4+
15
plugins {
26
kotlin("multiplatform")
37
id("kotlinx-serialization")
@@ -16,10 +20,6 @@ kotlin {
1620
}
1721
}
1822
binaries.executable()
19-
20-
tasks.named<ProcessResources>(compilations["main"].processResourcesTaskName) {
21-
from(projects.shared.dependencyProject.file("src/commonMain/composeResources"))
22-
}
2323
}
2424

2525
sourceSets {
@@ -35,7 +35,3 @@ kotlin {
3535
}
3636
}
3737
}
38-
39-
compose.experimental {
40-
web.application {}
41-
}

‎compose-web/src/wasmJsMain/kotlin/Main.kt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
importandroidx.compose.material3.MaterialTheme
22
importandroidx.compose.ui.ExperimentalComposeUiApi
33
importandroidx.compose.ui.window.CanvasBasedWindow
4+
importandroidx.compose.ui.window.ComposeViewport
45
importcom.apollographql.apollo.ApolloClient
56
importcom.arkivanov.decompose.DefaultComponentContext
67
importcom.arkivanov.essenty.lifecycle.Lifecycle
@@ -34,10 +35,10 @@ fun main() {
3435
)
3536

3637

37-
CanvasBasedWindow("Confetti", canvasElementId="confettiCanvas") {
38-
MaterialTheme {
39-
App(appComponent)
40-
}
41-
}
38+
ComposeViewport(content= {
39+
MaterialTheme {
40+
App(appComponent)
41+
}
42+
})
4243
}
4344

‎gradle/libs.versions.toml‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,46 @@
11
[versions]
2-
kotlin ="2.2.20-Beta1"
3-
ksp ="2.2.20-Beta1-2.0.2"
2+
kotlin ="2.2.20"
3+
ksp ="2.2.20-2.0.2"
44
kotlinx-coroutines ="1.10.2"
55
kotlinx-datetime ="0.6.0"
66
kotlinx-serialization ="1.9.0"
7-
apollo-kotlin-execution ="0.1.1-SNAPSHOT-fd7fa806b95c5b9046494989a7dd478c47237e12"
8-
compatPatrouille ="0.0.0"
7+
apollo-kotlin-execution ="0.1.1"
8+
compatPatrouille ="0.0.2"
99

10-
agp ="8.11.1"
11-
activity-compose ="1.10.1"
12-
androidx-lifecycle ="2.9.2"
10+
agp ="8.11.2"
11+
activity-compose ="1.11.0"
12+
androidx-lifecycle ="2.9.4"
1313
androidx-datastore ="1.1.7"
14-
apollo ="4.3.2"
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"
20-
compose-material3 ="1.3.2"
14+
apollo ="4.3.3"
15+
apollo-cache ="1.0.0-alpha.6"
16+
compose ="1.9.2"
17+
compose-hot-reload ="1.0.0-beta09"
18+
composeLifecyleRuntime="2.9.4"
19+
compose-multiplatform ="1.9.0"
20+
compose-material3 ="1.4.0"
2121
composeWindowSize ="0.5.0"
2222
credentials ="1.5.0"
23-
decompose ="3.4.0-alpha03"
23+
decompose ="3.4.0"
2424
doistx-normalize ="1.2.0"
2525
essenty ="2.5.0"
2626
googleid ="1.1.1"
2727
horologist ="0.8.2-alpha"
2828
io-coil-kt ="2.7.0"
29-
io-coil3-kt ="3.2.0"
30-
kermit ="2.0.6"
31-
kmmbridge ="0.5.7"
32-
koin ="4.1.0"
29+
io-coil3-kt ="3.3.0"
30+
kermit ="2.0.8"
31+
kmmbridge ="1.2.1"
32+
koin ="4.1.1"
3333
kotlinx-coroutines-play-services ="1.10.2"
34-
lifecycle ="2.9.2"
35-
lifecycle-livedata-ktx ="2.9.2"
36-
materialkolor ="3.0.0"
34+
lifecycle ="2.9.4"
35+
lifecycle-livedata-ktx ="2.9.4"
36+
materialkolor ="3.0.1"
3737
multiplatform-settings ="1.3.0"
38-
nav-compose ="2.9.4"
39-
okio ="3.15.0"
40-
permissions ="0.19.1"
41-
permissionsCompose ="0.19.1"
42-
permissionsNotifications ="0.19.1"
38+
nav-compose ="2.9.5"
39+
okio ="3.16.0"
40+
permissions ="0.20.1"
4341
protolayout ="1.3.0"
44-
robolectric ="4.15.1"
45-
room ="2.7.2"
42+
robolectric ="4.16"
43+
room ="2.8.1"
4644
tiles-tooling-preview ="1.5.0"
4745
wear ="1.3.0"
4846
wear-watchface ="1.3.0-alpha07"
@@ -52,13 +50,13 @@ work-runtime-ktx = "2.10.2"
5250
spring ="3.5.3"
5351
generativeai ="0.9.0-1.1.0"
5452
buildkonfig ="0.17.1"
55-
roborazzi ="1.46.1"
56-
screenshot ="0.0.1-alpha10"
53+
roborazzi ="1.50.0"
54+
screenshot ="0.0.1-alpha11"
5755

5856

5957
[libraries]
6058
activity-compose = {module ="androidx.activity:activity-compose",version.ref ="activity-compose" }
61-
androidx-benchmarkmacro ="androidx.benchmark:benchmark-macro-junit4:1.3.4"
59+
androidx-benchmarkmacro ="androidx.benchmark:benchmark-macro-junit4:1.4.1"
6260
androidx-complications-rendering = {module ="androidx.wear.watchface:watchface-complications-rendering",version.ref ="wear-watchface"}
6361
androidx-compose-ui-tooling = {module ="androidx.wear.compose:compose-ui-tooling",version.ref ="wear-compose" }
6462
androidx-credentials = {module ="androidx.credentials:credentials",version.ref ="credentials" }
@@ -88,8 +86,8 @@ apollo-runtime = { module = "com.apollographql.apollo:apollo-runtime" }
8886
apollo-execution-spring = {module ="com.apollographql.execution:apollo-execution-spring",version.ref ="apollo-kotlin-execution" }
8987
apollo-execution-reporting = {module ="com.apollographql.execution:apollo-execution-reporting",version.ref ="apollo-kotlin-execution" }
9088
apollo-execution-gradle-plugin = {module ="com.apollographql.execution:apollo-execution-gradle-plugin",version.ref ="apollo-kotlin-execution" }
91-
permissions-compose = {module ="dev.icerock.moko:permissions-compose",version.ref ="permissionsCompose" }
92-
permissions-notifications = {module ="dev.icerock.moko:permissions-notifications",version.ref ="permissionsNotifications" }
89+
permissions-compose = {module ="dev.icerock.moko:permissions-compose",version.ref ="permissions" }
90+
permissions-notifications = {module ="dev.icerock.moko:permissions-notifications",version.ref ="permissions" }
9391
permissions = {module ="dev.icerock.moko:permissions",version.ref ="permissions" }
9492
spring-boot = {module ="org.springframework.boot:spring-boot",version.ref ="spring" }
9593
spring-boot-starter-logging = {module ="org.springframework.boot:spring-boot-starter-logging",version.ref ="spring" }
@@ -111,6 +109,7 @@ coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "io-coil-kt" }
111109
coil-test = {module ="io.coil-kt:coil-test",version.ref ="io-coil-kt" }
112110
coil3-compose = {module ="io.coil-kt.coil3:coil-compose",version.ref ="io-coil3-kt" }
113111
coil3-network-ktor = {module ="io.coil-kt.coil3:coil-network-ktor3",version.ref ="io-coil3-kt" }
112+
ktor-client-cio = {group ="io.ktor",name ="ktor-client-cio",version ="3.3.0" }
114113
materialkolor = {module ="com.materialkolor:material-kolor",version.ref ="materialkolor" }
115114

116115
compose-material = {module ="androidx.compose.material:material",version.ref ="compose" }
@@ -182,9 +181,9 @@ multiplatform-settings-serialization = { module = "com.russhwolf:multiplatform-s
182181
multiplatform-settings-coroutines = {module ="com.russhwolf:multiplatform-settings-serialization",version.ref ="multiplatform-settings" }
183182
multiplatform-settings-make-observable = {module ="com.russhwolf:multiplatform-settings-make-observable",version.ref ="multiplatform-settings" }
184183
multiplatform-settings-datastore = {module ="com.russhwolf:multiplatform-settings-datastore",version.ref ="multiplatform-settings" }
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"
184+
okhttp ="com.squareup.okhttp3:okhttp:5.1.0"
185+
okhttp-coroutines ="com.squareup.okhttp3:okhttp-coroutines:5.1.0"
186+
okhttp-logging-interceptor ="com.squareup.okhttp3:logging-interceptor:5.1.0"
188187
play-services-auth ="com.google.android.gms:play-services-auth:21.3.0"
189188
plugin-kotlin = {module ="org.jetbrains.kotlin:kotlin-gradle-plugin",version.ref ="kotlin" }
190189
plugin-android-application = {module ="com.android.tools.build:gradle",version.ref ="agp" }

‎maestro/Confetti.flow‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎shared/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,6 @@ kmmbridge {
262262
spm()
263263
}
264264

265-
addGithubPackagesRepository()
266-
267265
kotlin.sourceSets.all {
268266
languageSettings.optIn("kotlin.experimental.ExperimentalObjCName")
269267
}

‎shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/sessions/SessionDetailsViewShared.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ internal fun SessionSpeakerInfo(
152152
) {
153153
Row {
154154
speaker.photoUrl?.let {
155-
val url="https://confetti-app.dev/images/avatar/${conference}/${speaker.id}"
155+
val url=speaker.photoUrl//"https://confetti-app.dev/images/avatar/${conference}/${speaker.id}"
156156
SubcomposeAsyncImage(
157157
model= url,
158158
contentDescription= speaker.name,

‎shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/sessions/SessionListGridView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ private fun Speakers(conference: String, session: SessionDetails) {
249249
verticalAlignment=Alignment.CenterVertically
250250
) {
251251
if (speaker.speakerDetails.photoUrl?.isNotEmpty()==true) {
252-
val url="https://confetti-app.dev/images/avatar/${conference}/${speaker.id}"
252+
val url=speaker.speakerDetails.photoUrl//"https://confetti-app.dev/images/avatar/${conference}/${speaker.id}"
253253
AsyncImage(
254254
model= url,
255255
contentDescription= speaker.speakerDetails.name,

‎shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/speakers/SpeakersDetailsView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ fun SpeakerDetailsView(
100100

101101
Spacer(modifier=Modifier.size(16.dp))
102102

103-
val url="https://confetti-app.dev/images/avatar/${conference}/${speaker.id}"
103+
val url= speaker.photoUrl//"https://confetti-app.dev/images/avatar/${conference}/${speaker.id}"
104104
AsyncImage(
105105
model= url,
106106
contentDescription= speaker.name,

‎shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/speakers/SpeakersGridView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fun SpeakerGridView(
4343
) {
4444

4545
// proxy image requests through backend
46-
val url="https://confetti-app.dev/images/avatar/${conference}/${speaker.id}"
46+
val url=speaker.photoUrl//"https://confetti-app.dev/images/avatar/${conference}/${speaker.id}"
4747
SubcomposeAsyncImage(
4848
model= url,
4949
contentDescription= speaker.name,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp