From b18eb0ff12c616546a68c72e7d0097f1ab286c87 Mon Sep 17 00:00:00 2001 From: Kyant0 Date: Thu, 16 Jul 2026 23:34:05 +0800 Subject: [PATCH] Update dependencies --- app/build.gradle.kts | 31 ++++++++++-------------- backdrop/build.gradle.kts | 28 +++++++++------------ gradle/libs.versions.toml | 8 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 30 insertions(+), 39 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dd63eca..41500fb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,9 +20,11 @@ kotlin { } } + applyDefaultHierarchyTemplate() + jvm("desktop") - js(IR) { + js { browser() } wasmJs { @@ -41,7 +43,7 @@ kotlin { } sourceSets { - val commonMain by getting { + val commonMain = getByName("commonMain") { dependencies { implementation(libs.compose.foundation) implementation(libs.compose.ui) @@ -53,51 +55,44 @@ kotlin { } } - val androidMain by getting { - dependsOn(commonMain) + val androidMain = getByName("androidMain") { dependencies { implementation(libs.androidx.activity.compose) } } - val skikoMain by creating { + val skikoMain = create("skikoMain") { dependsOn(commonMain) } - val desktopMain by getting { + val desktopMain = getByName("desktopMain") { dependsOn(skikoMain) dependencies { implementation(compose.desktop.currentOs) } } - val macosArm64Main by getting { + val macosArm64Main = getByName("macosArm64Main") { dependsOn(skikoMain) } - val iosMain by creating { + val iosMain = getByName("iosMain") { dependsOn(skikoMain) } - val iosArm64Main by getting { - dependsOn(iosMain) + val iosArm64Main = getByName("iosArm64Main") { } - val iosSimulatorArm64Main by getting { - dependsOn(iosMain) + val iosSimulatorArm64Main = getByName("iosSimulatorArm64Main") { } - val jsMain by getting { + val jsMain = getByName("jsMain") { dependsOn(skikoMain) } - val wasmJsMain by getting { + val wasmJsMain = getByName("wasmJsMain") { dependsOn(skikoMain) } - - all { - languageSettings.enableLanguageFeature("ContextParameters") - } } compilerOptions { diff --git a/backdrop/build.gradle.kts b/backdrop/build.gradle.kts index 0472cd5..290f030 100644 --- a/backdrop/build.gradle.kts +++ b/backdrop/build.gradle.kts @@ -19,9 +19,11 @@ kotlin { } } + applyDefaultHierarchyTemplate() + jvm("desktop") - js(IR) { + js { browser() } wasmJs { @@ -33,7 +35,7 @@ kotlin { iosSimulatorArm64("iosSimulatorArm64") sourceSets { - val commonMain by getting { + val commonMain = getByName("commonMain") { dependencies { implementation(libs.compose.foundation) implementation(libs.compose.ui) @@ -43,41 +45,35 @@ kotlin { } } - val skikoMain by creating { + val skikoMain = create("skikoMain") { dependsOn(commonMain) } - val desktopMain by getting { + val desktopMain = getByName("desktopMain") { dependsOn(skikoMain) } - val macosArm64Main by getting { + val macosArm64Main = getByName("macosArm64Main") { dependsOn(skikoMain) } - val iosMain by creating { + val iosMain = getByName("iosMain") { dependsOn(skikoMain) } - val iosArm64Main by getting { - dependsOn(iosMain) + val iosArm64Main = getByName("iosArm64Main") { } - val iosSimulatorArm64Main by getting { - dependsOn(iosMain) + val iosSimulatorArm64Main = getByName("iosSimulatorArm64Main") { } - val jsMain by getting { + val jsMain = getByName("jsMain") { dependsOn(skikoMain) } - val wasmJsMain by getting { + val wasmJsMain = getByName("wasmJsMain") { dependsOn(skikoMain) } - - all { - languageSettings.enableLanguageFeature("ContextParameters") - } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e20e2c2..b542961 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] -agp = "9.2.1" -kotlin = "2.3.21" +agp = "9.3.0" +kotlin = "2.4.10" activity = "1.13.0" -core = "1.18.0" -compose = "1.11.0" +core = "1.19.0" +compose = "1.11.1" kyantShapes = "1.2.0" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b52fb7e..eb84db6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500