Skip to content

Commit 0a60193

Browse files
committed
Update dependencies and clean up warnings
Compose Multiplatform 1.9.0-beta01, Kotlin 2.2.20-Beta2, Compose Hot Reload 1.0.0-beta04, AGP 8.11.1
1 parent f82095c commit 0a60193

File tree

8 files changed

+35
-59
lines changed

8 files changed

+35
-59
lines changed

androidApp/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ kotlin {
1919

2020
androidUnitTest.dependencies {
2121
implementation(libs.junit)
22-
implementation(libs.androidx.test.junit)
23-
implementation(libs.androidx.espresso.core)
2422
}
2523
}
2624

gradle/libs.versions.toml

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,49 @@
11
[versions]
2-
aboutlibraries = "12.2.3"
3-
agp = "8.7.3"
2+
aboutlibraries = "12.2.4"
3+
agp = "8.11.1"
44
android-compileSdk = "35"
55
android-minSdk = "26"
66
android-svg = "1.4"
77
android-targetSdk = "35"
88
androidx-activityCompose = "1.10.1"
99
androidx-core-ktx = "1.16.0"
1010
androidx-core-splashscreen = "1.0.1"
11-
androidx-espresso-core = "3.6.1"
12-
androidx-navigation = "2.9.0-beta03"
11+
androidx-navigation = "2.9.0-beta04"
1312
androidx-lifecycle = "2.9.1"
1413
androidx-preference = "1.2.1"
15-
androidx-test-junit = "1.2.1"
16-
androidx-work-runtime = "2.10.0"
17-
coil = "3.2.0"
18-
compose-android = "1.8.2"
19-
compose-hot-reload = "1.0.0-alpha11"
20-
compose-multiplatform = "1.8.2"
21-
coroutines = "1.10.1"
14+
coil = "3.3.0"
15+
compose-android = "1.9.0-beta02"
16+
compose-hot-reload = "1.0.0-beta04"
17+
compose-multiplatform = "1.9.0-beta01"
18+
coroutines = "1.10.2"
2219
doistx-normalize = "1.2.0"
23-
exposed = "0.59.0"
24-
google-services = "4.4.2"
25-
h2 = "2.2.224"
20+
exposed = "0.61.0"
21+
google-services = "4.4.3"
22+
h2 = "2.3.232"
2623
hikaricp = "5.1.0"
2724
jib = "3.4.4"
2825
junit = "4.13.2"
2926
kmpnotifier = "1.5.1"
3027
koin = "4.1.0"
31-
kotlin = "2.2.0"
32-
kotlinx-datetime = "0.7.0"
28+
kotlin = "2.2.20-Beta2"
29+
kotlinx-datetime = "0.7.1"
3330
kotlinxSerializationCore = "1.9.0"
34-
ktor = "3.2.1"
31+
ktor = "3.2.3"
3532
logbackClassic = "1.5.18"
3633
markdown = "0.35.0"
3734
multiplatform-settings = "1.3.0"
38-
postgresql = "42.7.3"
35+
postgresql = "42.7.7"
3936

4037
[libraries]
4138
aboutlibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "aboutlibraries" }
4239
android-svg = { module = "com.caverock:androidsvg-aar", version.ref = "android-svg" }
4340
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
4441
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" }
4542
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidx-core-splashscreen" }
46-
androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-espresso-core" }
4743
androidx-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
4844
androidx-lifecycle-runtime-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
4945
androidx-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
5046
androidx-preference = { module = "androidx.preference:preference-ktx", version.ref = "androidx-preference" }
51-
androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
52-
androidx-work-runtime = { module = "androidx.work:work-runtime-ktx", version.ref = "androidx-work-runtime" }
5347
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
5448
coil-network-ktor3 = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" }
5549
components-ui-tooling-preview = { module = "org.jetbrains.compose.components:components-ui-tooling-preview", version.ref = "compose-multiplatform" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

shared/build.gradle.kts

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,13 @@ kotlin {
8080

8181
applyDefaultHierarchyTemplate {
8282
common {
83-
group("web") {
84-
withJs()
85-
withWasmJs()
86-
}
87-
8883
group("nonAndroid") {
89-
group("ios")
90-
group("web")
9184
withJvm()
85+
withIos()
86+
87+
// replace with withWeb once available
88+
withJs()
89+
withWasmJs()
9290
}
9391
}
9492
}
@@ -137,7 +135,6 @@ kotlin {
137135
androidMain.dependencies {
138136
implementation(libs.android.svg)
139137
implementation(libs.androidx.core.ktx)
140-
implementation(libs.androidx.work.runtime)
141138
implementation(libs.androidx.preference)
142139
implementation(libs.compose.ui.tooling.preview)
143140
implementation(libs.ktor.client.okhttp)
@@ -155,7 +152,7 @@ kotlin {
155152
implementation(libs.kotlinx.coroutines.swing)
156153
}
157154

158-
get("webMain").dependencies {
155+
webMain.dependencies {
159156
implementation(libs.ktor.client.js)
160157
implementation(npm("@js-joda/timezone", "2.3.0"))
161158
}
@@ -202,13 +199,8 @@ val buildWebApp by tasks.creating(Copy::class) {
202199
duplicatesStrategy = DuplicatesStrategy.INCLUDE
203200
}
204201

205-
// Hot reload support
206-
composeCompiler {
207-
featureFlags.add(ComposeFeatureFlag.OptimizeNonSkippingGroups)
208-
}
209-
210202
aboutLibraries {
211-
duplicationMode = DuplicateMode.MERGE
212-
duplicationRule = DuplicateRule.SIMPLE
213-
outputPath = "src/commonMain/composeResources/files"
203+
library.duplicationMode = DuplicateMode.MERGE
204+
library.duplicationRule = DuplicateRule.SIMPLE
205+
export.outputFile = File("src/commonMain/composeResources/files")
214206
}

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/ScheduleScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ private fun ScheduleList(
465465
val dayValues = DayValues.map[date]
466466
DayHeader(
467467
month = DateTimeFormatting.month(date).uppercase(),
468-
day = date.dayOfMonth.toString(),
468+
day = date.day.toString(),
469469
line1 = dayValues?.line1 ?: "",
470470
line2 = dayValues?.line2 ?: "",
471471
modifier = Modifier

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/utils/DateTimeFormatting.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object DateTimeFormatting {
1717
private val dateFormat = LocalDate.Format {
1818
monthName(MonthNames.ENGLISH_FULL)
1919
char(' ')
20-
dayOfMonth()
20+
day(padding = Padding.ZERO)
2121
}
2222

2323
private val monthFormat = LocalDate.Format {
@@ -27,7 +27,7 @@ object DateTimeFormatting {
2727
private val dateWithYearFormat = LocalDateTime.Format {
2828
monthName(MonthNames.ENGLISH_FULL)
2929
char(' ')
30-
dayOfMonth()
30+
day(padding = Padding.ZERO)
3131
chars(", ")
3232
year()
3333
}

ui-components-gallery/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,3 @@ android {
8080
dependencies {
8181
debugImplementation(compose.uiTooling)
8282
}
83-
84-
// Hot reload support
85-
composeCompiler {
86-
featureFlags.add(ComposeFeatureFlag.OptimizeNonSkippingGroups)
87-
}

ui-components/build.gradle.kts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ kotlin {
1616
applyDefaultHierarchyTemplate {
1717
common {
1818
group("nonAndroid") {
19-
group("ios")
20-
group("web")
2119
withJvm()
22-
}
20+
withIos()
2321

24-
group("web") {
22+
// replace with withWeb once available
2523
withJs()
2624
withWasmJs()
2725
}
@@ -77,6 +75,10 @@ kotlin {
7775
}
7876

7977
jvmToolchain(21)
78+
79+
compilerOptions {
80+
freeCompilerArgs.add("-Xexpect-actual-classes")
81+
}
8082
}
8183

8284
android {
@@ -91,11 +93,6 @@ android {
9193
}
9294
}
9395

94-
// Hot reload support
95-
composeCompiler {
96-
featureFlags.add(ComposeFeatureFlag.OptimizeNonSkippingGroups)
97-
}
98-
9996
compose.resources {
10097
publicResClass = true
10198
nameOfResClass = "UiRes"

0 commit comments

Comments
 (0)