Merge pull request #23 from Kotlin/updates

Update versions and build config

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.composeCompiler) apply false
-    alias(libs.plugins.jetbrainsCompose) apply false
+    alias(libs.plugins.composeMultiplatform) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.kotlinxSerialization) apply false
 }

composeApp/build.gradle.kts

@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
-    alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.composeMultiplatform)
     alias(libs.plugins.composeCompiler)
     alias(libs.plugins.kotlinxSerialization)
 }
@@ -61,10 +61,6 @@ android {
     namespace = "com.jetbrains.kmpapp"
     compileSdk = 34
 
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    sourceSets["main"].res.srcDirs("src/androidMain/res")
-    sourceSets["main"].resources.srcDirs("src/commonMain/resources")
-
     defaultConfig {
         applicationId = "com.jetbrains.kmpapp"
         minSdk = 24
@@ -86,10 +82,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    buildFeatures {
-        compose = true
-    }
-    dependencies {
-        debugImplementation(libs.androidx.compose.ui.tooling)
-    }
+}
+
+dependencies {
+    debugImplementation(libs.androidx.compose.ui.tooling)
 }

gradle.properties

@@ -1,12 +1,9 @@
 kotlin.code.style=official
+kotlin.daemon.jvmargs=-Xmx2048M
 
 #Gradle
-org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
 
 #Android
 android.nonTransitiveRClass=true
 android.useAndroidX=true
-
-#MPP
-kotlin.mpp.androidSourceSetLayoutVersion=2
-kotlin.mpp.enableCInteropCommonization=true

gradle/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
-agp = "8.4.2"
-androidx-activityCompose = "1.9.0"
-androidx-ui-tooling = "1.6.8"
-compose-plugin = "1.6.11"
+agp = "8.6.0"
+androidx-activityCompose = "1.9.2"
+androidx-ui-tooling = "1.7.0"
+compose-multiplatform = "1.6.11"
 kamel = "0.9.5"
 koin = "3.5.6"
-kotlin = "2.0.0"
+kotlin = "2.0.20"
 ktor = "2.3.12"
 voyager = "1.0.0"
 
@@ -26,6 +26,6 @@ voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
+composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }