Skip to content

Commit cf74fab

Browse files
committed
Update Kotlin, Gradle, AGP and various dependencies
- Project version updated to 0.9.8 - Kotlin updated to 2.2.10 - Gradle Wrapper updated to 9.1.0 - Android Gradle Plugin updated to 8.13.0 - Compose Gradle plugin updated to 1.9.0 - `androidx.compose.ui:ui-tooling` updated to 1.9.2 - `org.jetbrains.androidx.navigation:navigation-compose` updated to 2.9.0 - `org.jetbrains.kotlinx:kotlinx-serialization-json` updated to 1.9.0 - `androidx.activity:activity-compose` updated to 1.11.0 - Opt-in to `ExperimentalWasmDsl` in theme and sample modules - Updated `wasmJs` configuration in sample `build.gradle.kts` to use `outputModuleName.set()`
1 parent 09a9400 commit cf74fab

7 files changed

Lines changed: 24 additions & 12 deletions

File tree

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
extra["kotlin_version"] = "2.1.21"
2+
extra["kotlin_version"] = "2.2.10"
33
extra["android_min_sdk_version"] = 21
44
extra["android_compile_sdk_version"] = 36
55
extra["jdk_version"] = 17
@@ -11,8 +11,8 @@ buildscript {
1111
dependencies {
1212
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["kotlin_version"]}")
1313
classpath("org.jetbrains.kotlin:compose-compiler-gradle-plugin:${rootProject.extra["kotlin_version"]}")
14-
classpath("com.android.tools.build:gradle:8.10.1")
15-
classpath("org.jetbrains.compose:compose-gradle-plugin:1.8.1")
14+
classpath("com.android.tools.build:gradle:8.13.0")
15+
classpath("org.jetbrains.compose:compose-gradle-plugin:1.9.0")
1616
classpath("org.jetbrains.kotlin:kotlin-serialization:${rootProject.extra["kotlin_version"]}")
1717
}
1818
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GROUP=io.github.softartdev
2-
VERSION=0.9.7
2+
VERSION=0.9.8
33

44
org.gradle.jvmargs=-Xmx16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx16g" -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
55
org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#Sun May 25 03:08:13 GET 2025
1+
#Thu Sep 25 15:23:25 GET 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

sample/build.gradle.kts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
@file:OptIn(ExperimentalWasmDsl::class)
2+
13
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
4+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
25
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
36
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
47

@@ -26,7 +29,7 @@ kotlin {
2629
}
2730
}
2831
wasmJs {
29-
moduleName = "composeApp"
32+
outputModuleName.set("composeApp")
3033
browser {
3134
val rootDirPath = project.rootDir.path
3235
val projectDirPath = project.projectDir.path
@@ -53,11 +56,11 @@ kotlin {
5356
implementation(compose.ui)
5457
implementation(compose.components.resources)
5558
implementation(compose.components.uiToolingPreview)
56-
implementation("org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta02")
57-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")
59+
implementation("org.jetbrains.androidx.navigation:navigation-compose:2.9.0")
60+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
5861
}
5962
androidMain.dependencies {
60-
implementation("androidx.activity:activity-compose:1.10.1")
63+
implementation("androidx.activity:activity-compose:1.11.0")
6164
implementation(compose.preview)
6265
}
6366
val desktopMain by getting

theme/theme-material/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
@file:OptIn(ExperimentalWasmDsl::class)
2+
13
import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
24
import com.android.build.gradle.internal.lint.LintModelWriterTask
5+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
36
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
47

58
plugins {
@@ -40,7 +43,7 @@ kotlin {
4043
}
4144
androidMain.dependencies {
4245
implementation(compose.preview)
43-
implementation("androidx.compose.ui:ui-tooling:1.8.2")
46+
implementation("androidx.compose.ui:ui-tooling:1.9.2")
4447
}
4548
}
4649
explicitApi()

theme/theme-material3/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
@file:OptIn(ExperimentalWasmDsl::class)
2+
13
import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
24
import com.android.build.gradle.internal.lint.LintModelWriterTask
5+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
36
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
47

58
plugins {
@@ -41,7 +44,7 @@ kotlin {
4144
}
4245
androidMain.dependencies {
4346
implementation(compose.preview)
44-
implementation("androidx.compose.ui:ui-tooling:1.8.2")
47+
implementation("androidx.compose.ui:ui-tooling:1.9.2")
4548
}
4649
}
4750
explicitApi()

theme/theme-prefs/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@file:OptIn(ExperimentalWasmDsl::class)
2+
3+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
14
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
25

36
plugins {

0 commit comments

Comments
 (0)