Use Android source set layout version 2

JuulLabs · May 16, 2023 · cc27747 · cc27747
1 parent 9be9800
commit cc27747
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 25 deletions.
diff --git a/box/build.gradle.kts b/box/build.gradle.kts
@@ -106,8 +106,4 @@ android {
         abortOnError = true
         warningsAsErrors = true
     }
-
-    sourceSets {
-        getByName("main").manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    }
 }
diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -56,6 +56,4 @@ android {
         abortOnError = true
         warningsAsErrors = true
     }
-
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 }
diff --git a/element-view/build.gradle.kts b/element-view/build.gradle.kts
@@ -68,8 +68,4 @@ android {
         abortOnError = true
         warningsAsErrors = true
     }
-
-    sourceSets {
-        getByName("main").manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -7,6 +7,11 @@ android.useAndroidX=true
 android.defaults.buildfeatures.buildconfig=false
 android.defaults.buildfeatures.resvalues=false
 
+kotlin.js.compiler=IR
+
+kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
+
 # Publication configuration
 # https://github.com/vanniktech/gradle-maven-publish-plugin#setting-properties
 
@@ -33,7 +38,3 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=cedrickcooke
 POM_DEVELOPER_NAME=Cedrick Cooke
 POM_DEVELOPER_URL=https://github.com/cedrickcooke
-
-kotlin.js.compiler=IR
-
-kotlin.mpp.enableCInteropCommonization=true
diff --git a/kanvas/build.gradle.kts b/kanvas/build.gradle.kts
@@ -47,7 +47,7 @@ kotlin {
             }
         }
 
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation(libs.androidx.test)
@@ -100,8 +100,4 @@ android {
         abortOnError = true
         warningsAsErrors = true
     }
-
-    sourceSets {
-        getByName("main").manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    }
 }
diff --git a/...c/androidTest/kotlin/AndroidPaintTests.kt → ...droidUnitTest/kotlin/AndroidPaintTests.kt b/...c/androidTest/kotlin/AndroidPaintTests.kt → ...droidUnitTest/kotlin/AndroidPaintTests.kt
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.compose.compose
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
@@ -50,7 +49,7 @@ kotlin {
             }
         }
 
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
             }
@@ -110,10 +109,6 @@ android {
         disable += "MissingClass"
         disable += "UnusedResources"
     }
-
-    sourceSets {
-        getByName("main").manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    }
 }
 
 compose.desktop {