Merge pull request #1215 from DimensionDev/feature/kotlin_android_kmp

migrate to kotlin multiplatform android plugin

Author: Tlaster

compose-ui/build.gradle.kts

@@ -1,3 +1,4 @@
+import com.android.build.api.dsl.KotlinMultiplatformAndroidCompilation
 import org.jetbrains.compose.compose
 
 plugins {
@@ -9,32 +10,25 @@ plugins {
     alias(libs.plugins.composeMultiplatform)
 }
 
-android {
-    namespace = "dev.dimension.flare.compose.ui"
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-    }
-}
-
 kotlin {
     jvmToolchain(libs.versions.java.get().toInt())
     explicitApi()
     applyDefaultHierarchyTemplate {
         common {
             group("androidJvm") {
-                withAndroidTarget()
+                // TODO: https://youtrack.jetbrains.com/issue/KT-80409
+                withCompilations { it is KotlinMultiplatformAndroidCompilation }
                 withJvm()
             }
         }
     }
-    androidTarget()
-//    androidLibrary {
-//        compileSdk = libs.versions.compileSdk.get().toInt()
-//        namespace = "dev.dimension.flare.compose.ui"
-//        minSdk = libs.versions.minSdk.get().toInt()
-//        experimentalProperties["android.experimental.kmp.enableAndroidResources"] = true
-//        enableCoreLibraryDesugaring = true
-//    }
+    androidLibrary {
+        compileSdk = libs.versions.compileSdk.get().toInt()
+        namespace = "dev.dimension.flare.compose.ui"
+        minSdk = libs.versions.minSdk.get().toInt()
+        experimentalProperties["android.experimental.kmp.enableAndroidResources"] = true
+        enableCoreLibraryDesugaring = true
+    }
     jvm()
 
     sourceSets {

gradle/libs.versions.toml

@@ -243,7 +243,7 @@ ktor-server = ["ktor-server-core", "ktor-server-resources", "ktor-server-content
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
-android-library = { id = "com.android.library", version.ref = "agp" }
+android-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

shared/api/build.gradle.kts

@@ -8,12 +8,11 @@ kotlin {
     jvmToolchain(libs.versions.java.get().toInt())
     explicitApi()
     applyDefaultHierarchyTemplate()
-//    androidLibrary {
-//        compileSdk = libs.versions.compileSdk.get().toInt()
-//        namespace = "dev.dimension.flare.shared.api"
-//        minSdk = libs.versions.minSdk.get().toInt()
-//    }
-    androidTarget()
+    androidLibrary {
+        compileSdk = libs.versions.compileSdk.get().toInt()
+        namespace = "dev.dimension.flare.shared.api"
+        minSdk = libs.versions.minSdk.get().toInt()
+    }
     jvm()
     macosX64()
     macosArm64()
@@ -36,6 +35,3 @@ kotlin {
     }
 }
 
-android {
-    namespace = "dev.dimension.flare.shared.api"
-}

shared/build.gradle.kts

@@ -1,4 +1,5 @@
 
+import com.android.build.api.dsl.KotlinMultiplatformAndroidCompilation
 import java.util.Locale
 
 plugins {
@@ -14,10 +15,6 @@ plugins {
     alias(libs.plugins.room)
 }
 
-android {
-    namespace = "dev.dimension.flare.shared"
-}
-
 kotlin {
     applyDefaultHierarchyTemplate {
         common {
@@ -26,21 +23,19 @@ kotlin {
                 withIos()
             }
             group("androidJvm") {
-                withAndroidTarget()
+                // TODO: https://youtrack.jetbrains.com/issue/KT-80409
+                withCompilations { it is KotlinMultiplatformAndroidCompilation }
                 withJvm()
             }
         }
     }
     jvmToolchain(libs.versions.java.get().toInt())
     explicitApi()
-//    androidLibrary {
-//        compileSdk = libs.versions.compileSdk.get().toInt()
-//        namespace = "dev.dimension.flare.shared"
-//        minSdk = libs.versions.minSdk.get().toInt()
-//    }
-
-
-    androidTarget()
+    androidLibrary {
+        compileSdk = libs.versions.compileSdk.get().toInt()
+        namespace = "dev.dimension.flare.shared"
+        minSdk = libs.versions.minSdk.get().toInt()
+    }
     jvm()
 
     listOf(

shared/ui/build.gradle.kts

@@ -7,22 +7,16 @@ plugins {
     alias(libs.plugins.composeMultiplatform)
 }
 
-android {
-    namespace = "dev.dimension.flare.shared.ui"
-}
-
 kotlin {
     jvmToolchain(libs.versions.java.get().toInt())
     explicitApi()
     applyDefaultHierarchyTemplate()
-//    androidLibrary {
-//        compileSdk = libs.versions.compileSdk.get().toInt()
-//        namespace = "dev.dimension.flare.shared.ui"
-//        minSdk = libs.versions.minSdk.get().toInt()
-//        experimentalProperties["android.experimental.kmp.enableAndroidResources"] = true
-//    }
-
-    androidTarget()
+    androidLibrary {
+        compileSdk = libs.versions.compileSdk.get().toInt()
+        namespace = "dev.dimension.flare.shared.ui"
+        minSdk = libs.versions.minSdk.get().toInt()
+        experimentalProperties["android.experimental.kmp.enableAndroidResources"] = true
+    }
 
     listOf(
         iosX64(),