From 72af19e4263ed70de528b9cd007aa25f950c4254 Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Sun, 26 Mar 2023 16:44:35 -0400
Subject: [PATCH] Use Android Source Set v2

---
 build.gradle.kts              | 8 --------
 core/build.gradle.kts         | 2 +-
 data/build.gradle.kts         | 2 +-
 domain/build.gradle.kts       | 2 +-
 gradle.properties             | 3 ++-
 presentation/build.gradle.kts | 2 +-
 ui-core/build.gradle.kts      | 2 +-
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3df06b1f..995885ee 100644
--- a/build.gradle.kts
+++ b/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)
             }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index b7a861e4..0752dc52 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -93,7 +93,7 @@ kotlin {
                 api(libs.compose.ui.text)
             }
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependsOn(jvmTest)
         }
 
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index 58b0fad7..2668cd19 100644
--- a/data/build.gradle.kts
+++ b/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)
         }
 
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
index 94301f41..fde10921 100644
--- a/domain/build.gradle.kts
+++ b/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)
         }
 
diff --git a/gradle.properties b/gradle.properties
index e90aa691..830893c7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,4 +5,5 @@ android.useAndroidX=true
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
 kotlin.native.cacheKind=none
-org.jetbrains.compose.experimental.uikit.enabled=true
\ No newline at end of file
+org.jetbrains.compose.experimental.uikit.enabled=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
index ce637b1d..8c1cc3f0 100644
--- a/presentation/build.gradle.kts
+++ b/presentation/build.gradle.kts
@@ -113,7 +113,7 @@ kotlin {
                 api(libs.voyager.androidx)
             }
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependsOn(jvmTest)
         }
 
diff --git a/ui-core/build.gradle.kts b/ui-core/build.gradle.kts
index ea75f029..911f5c3a 100644
--- a/ui-core/build.gradle.kts
+++ b/ui-core/build.gradle.kts
@@ -91,7 +91,7 @@ kotlin {
                 api(libs.androidx.appCompat)
             }
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependsOn(jvmTest)
         }