Use Android Source Set v2

build.gradle.kts

@@ -87,14 +87,6 @@ subprojects {
                 sourceCompatibility(Config.androidJvmTarget)
                 targetCompatibility(Config.androidJvmTarget)
             }
-            sourceSets {
-                named("main") {
-                    val altManifest = file("src/androidMain/AndroidManifest.xml")
-                    if (altManifest.exists()) {
-                        manifest.srcFile(altManifest.path)
-                    }
-                }
-            }
             dependencies {
                 add("coreLibraryDesugaring", libs.desugarJdkLibs)
             }

core/build.gradle.kts

@@ -93,7 +93,7 @@ kotlin {
                 api(libs.compose.ui.text)
             }
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependsOn(jvmTest)
         }
 

data/build.gradle.kts

@@ -81,7 +81,7 @@ kotlin {
         val androidMain by getting {
             dependsOn(jvmMain)
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependsOn(jvmTest)
         }
 

domain/build.gradle.kts

@@ -90,7 +90,7 @@ kotlin {
         val androidMain by getting {
             dependsOn(jvmMain)
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependsOn(jvmTest)
         }
 

gradle.properties

@@ -6,3 +6,4 @@ kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
 kotlin.native.cacheKind=none
 org.jetbrains.compose.experimental.uikit.enabled=true
+kotlin.mpp.androidSourceSetLayoutVersion=2

presentation/build.gradle.kts

@@ -113,7 +113,7 @@ kotlin {
                 api(libs.voyager.androidx)
             }
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependsOn(jvmTest)
         }
 

ui-core/build.gradle.kts

@@ -91,7 +91,7 @@ kotlin {
                 api(libs.androidx.appCompat)
             }
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependsOn(jvmTest)
         }