diff --git a/FloconAndroid/gradle/libs.versions.toml b/FloconAndroid/gradle/libs.versions.toml index 32ea39e80..93ff42501 100644 --- a/FloconAndroid/gradle/libs.versions.toml +++ b/FloconAndroid/gradle/libs.versions.toml @@ -2,9 +2,9 @@ agp = "8.11.0-rc02" apollo = "4.0.0" coilCompose = "3.2.0" -compose = "1.9.0" +compose = "1.11.0" datastorePreferences = "1.1.7" -kotlin = "2.1.0" +kotlin = "2.4.0" mavenPublish = "0.34.0" coreKtx = "1.16.0" junit = "4.13.2" @@ -26,7 +26,7 @@ grpc = "1.70.0" protobufPlugin = "0.9.5" grpcKotlin = "1.4.3" protobuf = "4.26.1" -ksp = "2.1.0-1.0.29" +ksp = "2.3.9" processPhoenix = "3.0.0" sqlite = "2.5.2" sqliteJdbc = "3.50.3.0" diff --git a/FloconAndroid/sample-multiplatform/build.gradle.kts b/FloconAndroid/sample-multiplatform/build.gradle.kts index e2aa52888..98ed2fdb9 100644 --- a/FloconAndroid/sample-multiplatform/build.gradle.kts +++ b/FloconAndroid/sample-multiplatform/build.gradle.kts @@ -19,8 +19,10 @@ kotlin { jvm("desktop") + // Compose Multiplatform 1.11 dropped the iosX64 (Intel Mac simulator) variant, so the + // sample's iosX64CompilationDependenciesMetadata can no longer resolve compose.runtime + // for that target. Apple-silicon devs use iosSimulatorArm64; real devices use iosArm64. listOf( - iosX64(), iosArm64(), iosSimulatorArm64() ).forEach { iosTarget -> @@ -85,12 +87,10 @@ kotlin { } } - val iosX64Main by getting val iosArm64Main by getting val iosSimulatorArm64Main by getting val iosMain by creating { dependsOn(commonMain) - iosX64Main.dependsOn(this) iosArm64Main.dependsOn(this) iosSimulatorArm64Main.dependsOn(this) dependencies { @@ -159,7 +159,6 @@ dependencies { "kspAndroid", "kspDesktop", "kspIosSimulatorArm64", - "kspIosX64", "kspIosArm64" ).forEach { add(it, libs.androidx.room.compiler)