From 45b19f8db7b14810f582a060aecb3fc022d7f7fd Mon Sep 17 00:00:00 2001 From: Aleksey Zamulla Date: Wed, 3 Dec 2025 00:25:28 +0100 Subject: [PATCH 1/2] * removed unused code * updated versions of CMP, AGP and Gradle to reasonable ones --- .../demo/composedemo/Platform.android.kt | 9 --------- .../project/demo/composedemo/Greeting.kt | 9 --------- .../project/demo/composedemo/Platform.kt | 7 ------- .../project/demo/composedemo/Platform.jvm.kt | 7 ------- .../project/demo/composedemo/Platform.ios.kt | 9 --------- .../demo/composedemo/Platform.wasmJs.kt | 7 ------- gradle/libs.versions.toml | 19 +++---------------- gradle/wrapper/gradle-wrapper.properties | 2 +- 8 files changed, 4 insertions(+), 65 deletions(-) delete mode 100644 composeApp/src/androidMain/kotlin/compose/project/demo/composedemo/Platform.android.kt delete mode 100644 composeApp/src/commonMain/kotlin/compose/project/demo/composedemo/Greeting.kt delete mode 100644 composeApp/src/commonMain/kotlin/compose/project/demo/composedemo/Platform.kt delete mode 100644 composeApp/src/desktopMain/kotlin/compose/project/demo/composedemo/Platform.jvm.kt delete mode 100644 composeApp/src/iosMain/kotlin/compose/project/demo/composedemo/Platform.ios.kt delete mode 100644 composeApp/src/wasmJsMain/kotlin/compose/project/demo/composedemo/Platform.wasmJs.kt diff --git a/composeApp/src/androidMain/kotlin/compose/project/demo/composedemo/Platform.android.kt b/composeApp/src/androidMain/kotlin/compose/project/demo/composedemo/Platform.android.kt deleted file mode 100644 index 8c9ea7b..0000000 --- a/composeApp/src/androidMain/kotlin/compose/project/demo/composedemo/Platform.android.kt +++ /dev/null @@ -1,9 +0,0 @@ -package compose.project.demo.composedemo - -import android.os.Build - -class AndroidPlatform : Platform { - override val name: String = "Android ${Build.VERSION.SDK_INT}" -} - -actual fun getPlatform(): Platform = AndroidPlatform() \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/compose/project/demo/composedemo/Greeting.kt b/composeApp/src/commonMain/kotlin/compose/project/demo/composedemo/Greeting.kt deleted file mode 100644 index 151c80c..0000000 --- a/composeApp/src/commonMain/kotlin/compose/project/demo/composedemo/Greeting.kt +++ /dev/null @@ -1,9 +0,0 @@ -package compose.project.demo.composedemo - -class Greeting { - private val platform = getPlatform() - - fun greet(): String { - return "Hello, ${platform.name}!" - } -} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/compose/project/demo/composedemo/Platform.kt b/composeApp/src/commonMain/kotlin/compose/project/demo/composedemo/Platform.kt deleted file mode 100644 index e04ce57..0000000 --- a/composeApp/src/commonMain/kotlin/compose/project/demo/composedemo/Platform.kt +++ /dev/null @@ -1,7 +0,0 @@ -package compose.project.demo.composedemo - -interface Platform { - val name: String -} - -expect fun getPlatform(): Platform \ No newline at end of file diff --git a/composeApp/src/desktopMain/kotlin/compose/project/demo/composedemo/Platform.jvm.kt b/composeApp/src/desktopMain/kotlin/compose/project/demo/composedemo/Platform.jvm.kt deleted file mode 100644 index d211da5..0000000 --- a/composeApp/src/desktopMain/kotlin/compose/project/demo/composedemo/Platform.jvm.kt +++ /dev/null @@ -1,7 +0,0 @@ -package compose.project.demo.composedemo - -class JVMPlatform : Platform { - override val name: String = "Java ${System.getProperty("java.version")}" -} - -actual fun getPlatform(): Platform = JVMPlatform() \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/compose/project/demo/composedemo/Platform.ios.kt b/composeApp/src/iosMain/kotlin/compose/project/demo/composedemo/Platform.ios.kt deleted file mode 100644 index a892694..0000000 --- a/composeApp/src/iosMain/kotlin/compose/project/demo/composedemo/Platform.ios.kt +++ /dev/null @@ -1,9 +0,0 @@ -package compose.project.demo.composedemo - -import platform.UIKit.UIDevice - -class IOSPlatform : Platform { - override val name: String = UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion -} - -actual fun getPlatform(): Platform = IOSPlatform() \ No newline at end of file diff --git a/composeApp/src/wasmJsMain/kotlin/compose/project/demo/composedemo/Platform.wasmJs.kt b/composeApp/src/wasmJsMain/kotlin/compose/project/demo/composedemo/Platform.wasmJs.kt deleted file mode 100644 index 9065a7e..0000000 --- a/composeApp/src/wasmJsMain/kotlin/compose/project/demo/composedemo/Platform.wasmJs.kt +++ /dev/null @@ -1,7 +0,0 @@ -package compose.project.demo.composedemo - -class WasmPlatform : Platform { - override val name: String = "Web with Kotlin/Wasm" -} - -actual fun getPlatform(): Platform = WasmPlatform() \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 413f900..bd5a07b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,30 +1,17 @@ [versions] -agp = "8.7.3" +agp = "8.11.1" android-compileSdk = "35" android-minSdk = "24" android-targetSdk = "35" androidx-activity = "1.10.1" -androidx-appcompat = "1.7.1" -androidx-constraintlayout = "2.2.1" -androidx-core = "1.16.0" -androidx-espresso = "3.6.1" androidx-lifecycle = "2.9.1" -androidx-testExt = "1.2.1" composeHotReload = "1.0.0-alpha11" -composeMultiplatform = "1.8.2" -junit = "4.13.2" -kotlin = "2.2.0" +composeMultiplatform = "1.9.3" +kotlin = "2.2.21" kotlinx-coroutines = "1.10.2" [libraries] kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } -kotlin-testJunit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } -junit = { module = "junit:junit", version.ref = "junit" } -androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" } -androidx-testExt-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-testExt" } -androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-espresso" } -androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } -androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } androidx-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" } androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..37f853b 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-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 63ae9b1a70e48e31f42f8b2af70a921ae26676be Mon Sep 17 00:00:00 2001 From: Aleksey Zamulla Date: Wed, 3 Dec 2025 01:11:53 +0100 Subject: [PATCH 2/2] Java 21 to have less conflicts hopefully --- composeApp/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index ff24fe0..4cb574f 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -112,8 +112,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } }