Merge pull request #60 from cheonjaeung/refactor-buildscript

Remove explicit androidx.compose dependencies for android source set and refactor build scripts

Author: cheonjaeung

gradle/libs.versions.toml

@@ -2,7 +2,6 @@
 kotlin = "2.1.0"
 androidGradlePlugin = "8.10.1"
 composeMultiplatform = "1.8.0"
-composeAndroid = "1.8.0"
 
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
@@ -20,9 +19,6 @@ androidx-core = { module = "androidx.core:core", version = "1.16.0" }
 compose-multiplatform-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "composeMultiplatform" }
 compose-multiplatform-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "composeMultiplatform" }
 compose-multiplatform-ui-util = { module = "org.jetbrains.compose.ui:ui-util", version.ref = "composeMultiplatform" }
-compose-android-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "composeAndroid" }
-compose-android-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "composeAndroid" }
-compose-android-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "composeAndroid" }
 
 # Sample dependencies
 kotlinx-immutable-collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.7" }
@@ -31,5 +27,7 @@ compose-multiplatform-material3 = { module = "org.jetbrains.compose.material3:ma
 compose-material-icons-core = { module = "org.jetbrains.compose.material:material-icons-core", version = "1.7.3" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.10.1" }
-compose-android-ui = { module = "androidx.compose.ui:ui", version.ref = "composeAndroid" }
+compose-android-runtime = { module = "androidx.compose.runtime:runtime", version = "1.8.0" }
+compose-android-foundation = { module = "androidx.compose.foundation:foundation", version = "1.8.0" }
+compose-android-ui = { module = "androidx.compose.ui:ui", version = "1.8.0" }
 compose-android-material3 = { module = "androidx.compose.material3:material3", version = "1.3.2" }

grid/build.gradle.kts

@@ -27,21 +27,20 @@ kotlin {
         }
     }
 
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(libs.compose.multiplatform.runtime)
                 implementation(libs.compose.multiplatform.foundation)
                 implementation(libs.compose.multiplatform.ui.util)
             }
         }
 
-        val androidMain by getting {
+        androidMain {
             dependencies {
                 implementation(libs.androidx.core)
-                implementation(libs.compose.android.runtime)
-                implementation(libs.compose.android.foundation)
-                implementation(libs.compose.android.ui.util)
             }
         }
     }

samples/shared/build.gradle.kts

@@ -27,8 +27,10 @@ kotlin {
         }
     }
 
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(libs.compose.multiplatform.runtime)
                 implementation(libs.compose.multiplatform.foundation)
@@ -41,7 +43,7 @@ kotlin {
             }
         }
 
-        val androidMain by getting {
+        androidMain {
             dependencies {
                 implementation(libs.androidx.core)
             }