Moved Android module config into convention plugin

bumble-tech · Aug 20, 2023 · 8c9fc66 · 8c9fc66
1 parent 965772d
commit 8c9fc66
Show file tree

Hide file tree

Showing 40 changed files with 276 additions and 521 deletions.
diff --git a/appyx-components/experimental/cards/android/build.gradle.kts b/appyx-components/experimental/cards/android/build.gradle.kts
@@ -3,28 +3,8 @@ plugins {
     id("org.jetbrains.compose")
 }
 
-
-android {
-    namespace = "com.bumble.appyx.components.experimental.cards.android"
-    compileSdk = libs.versions.androidCompileSdk.get().toInt()
-    defaultConfig {
-        minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    testOptions {
-        unitTests.all {
-            it.useJUnitPlatform()
-        }
-    }
-    packagingOptions {
-        resources.excludes.apply {
-            add("META-INF/LICENSE.md")
-            add("META-INF/LICENSE-notice.md")
-        }
-    }
+appyx {
+    namespace.set("com.bumble.appyx.components.experimental.cards.android")
 }
 
 dependencies {
@@ -36,11 +16,8 @@ dependencies {
     implementation(project(":appyx-interactions:appyx-interactions"))
     implementation(project(":appyx-components:experimental:cards:cards"))
     implementation(composeBom)
-    androidTestImplementation(libs.compose.ui.test.junit4)
 
+    androidTestImplementation(libs.compose.ui.test.junit4)
     androidTestImplementation(libs.junit.api)
-    testRuntimeOnly(libs.junit.engine)
-    testRuntimeOnly(libs.junit.vintage)
-
     androidTestImplementation(libs.compose.ui.test.manifest)
 }
diff --git a/appyx-components/experimental/cards/common/build.gradle.kts b/appyx-components/experimental/cards/common/build.gradle.kts
@@ -7,6 +7,10 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
+appyx {
+    androidNamespace.set("com.bumble.appyx.components.experimental.cards.common")
+}
+
 kotlin {
     android {
         publishLibraryVariants("release")
@@ -40,17 +44,6 @@ kotlin {
     }
 }
 
-android {
-    namespace = "com.bumble.appyx.components.experimental.cards.common"
-    compileSdk = libs.versions.androidCompileSdk.get().toInt()
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-
-    defaultConfig {
-        minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
-    }
-}
-
 dependencies {
     add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
     add("kspAndroid", project(":ksp:mutable-ui-processor"))

diff --git a/appyx-components/experimental/modal/common/build.gradle.kts b/appyx-components/experimental/modal/common/build.gradle.kts
@@ -7,6 +7,10 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
+appyx {
+    androidNamespace.set("com.bumble.appyx.components.experimental.modal")
+}
+
 kotlin {
     android {
         publishLibraryVariants("release")
@@ -45,16 +49,6 @@ kotlin {
     }
 }
 
-android {
-    compileSdk = libs.versions.androidCompileSdk.get().toInt()
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-
-    defaultConfig {
-        minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
-    }
-}
-
 dependencies {
     add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
     add("kspAndroid", project(":ksp:mutable-ui-processor"))

diff --git a/appyx-components/experimental/promoter/android/build.gradle.kts b/appyx-components/experimental/promoter/android/build.gradle.kts
@@ -3,28 +3,8 @@ plugins {
     id("org.jetbrains.compose")
 }
 
-
-android {
-    namespace = "com.bumble.appyx.components.experimental.promoter.android"
-    compileSdk = libs.versions.androidCompileSdk.get().toInt()
-    defaultConfig {
-        minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    testOptions {
-        unitTests.all {
-            it.useJUnitPlatform()
-        }
-    }
-    packagingOptions {
-        resources.excludes.apply {
-            add("META-INF/LICENSE.md")
-            add("META-INF/LICENSE-notice.md")
-        }
-    }
+appyx {
+    namespace.set("com.bumble.appyx.components.experimental.promoter.android")
 }
 
 dependencies {
@@ -35,11 +15,8 @@ dependencies {
     implementation(project(":appyx-interactions:appyx-interactions"))
     implementation(project(":appyx-components:experimental:promoter:promoter"))
     implementation(composeBom)
-    androidTestImplementation(libs.compose.ui.test.junit4)
 
+    androidTestImplementation(libs.compose.ui.test.junit4)
     androidTestImplementation(libs.junit.api)
-    testRuntimeOnly(libs.junit.engine)
-    testRuntimeOnly(libs.junit.vintage)
-
     androidTestImplementation(libs.compose.ui.test.manifest)
 }
diff --git a/appyx-components/experimental/promoter/common/build.gradle.kts b/appyx-components/experimental/promoter/common/build.gradle.kts
@@ -7,6 +7,10 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
+appyx {
+    androidNamespace.set("com.bumble.appyx.components.experimental.promoter.common")
+}
+
 kotlin {
     android {
         publishLibraryVariants("release")
@@ -41,17 +45,6 @@ kotlin {
     }
 }
 
-android {
-    namespace = "com.bumble.appyx.components.experimental.promoter.common"
-    compileSdk = libs.versions.androidCompileSdk.get().toInt()
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-
-    defaultConfig {
-        minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
-    }
-}
-
 dependencies {
     add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
     add("kspAndroid", project(":ksp:mutable-ui-processor"))

diff --git a/appyx-components/experimental/puzzle15/android/build.gradle.kts b/appyx-components/experimental/puzzle15/android/build.gradle.kts
@@ -3,28 +3,8 @@ plugins {
     id("org.jetbrains.compose")
 }
 
-
-android {
-    namespace = "com.bumble.appyx.components.experimental.puzzle15.android"
-    compileSdk = libs.versions.androidCompileSdk.get().toInt()
-    defaultConfig {
-        minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    testOptions {
-        unitTests.all {
-            it.useJUnitPlatform()
-        }
-    }
-    packagingOptions {
-        resources.excludes.apply {
-            add("META-INF/LICENSE.md")
-            add("META-INF/LICENSE-notice.md")
-        }
-    }
+appyx {
+    namespace.set("com.bumble.appyx.components.experimental.puzzle15.android")
 }
 
 dependencies {

diff --git a/appyx-components/experimental/puzzle15/common/build.gradle.kts b/appyx-components/experimental/puzzle15/common/build.gradle.kts
@@ -7,6 +7,10 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
+appyx {
+    androidNamespace.set("com.bumble.appyx.components.experimental.puzzle15.common")
+}
+
 kotlin {
     android {
         publishLibraryVariants("release")
@@ -40,17 +44,6 @@ kotlin {
     }
 }
 
-android {
-    namespace = "com.bumble.appyx.components.experimental.puzzle15.common"
-    compileSdk = libs.versions.androidCompileSdk.get().toInt()
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-
-    defaultConfig {
-        minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
-    }
-}
-
 dependencies {
     add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
     add("kspAndroid", project(":ksp:mutable-ui-processor"))

diff --git a/appyx-components/internal/test-drive/android/build.gradle.kts b/appyx-components/internal/test-drive/android/build.gradle.kts
@@ -2,31 +2,10 @@ plugins {
     id("com.bumble.appyx.android.library")
     id("org.jetbrains.compose")
     id("appyx-screenshots")
-    kotlin("android")
 }
 
-
-android {
-    namespace = "com.bumble.appyx.components.internal.testdrive.android"
-    compileSdk = libs.versions.androidCompileSdk.get().toInt()
-    defaultConfig {
-        minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    testOptions {
-        unitTests.all {
-            it.useJUnitPlatform()
-        }
-    }
-    packagingOptions {
-        resources.excludes.apply {
-            add("META-INF/LICENSE.md")
-            add("META-INF/LICENSE-notice.md")
-        }
-    }
+appyx {
+    namespace.set("com.bumble.appyx.components.internal.testdrive.android")
 }
 
 dependencies {

diff --git a/appyx-components/internal/test-drive/common/build.gradle.kts b/appyx-components/internal/test-drive/common/build.gradle.kts
@@ -7,6 +7,10 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
+appyx {
+    androidNamespace.set("com.bumble.appyx.components.internal.testdrive")
+}
+
 kotlin {
     android {
         publishLibraryVariants("release")
@@ -41,16 +45,6 @@ kotlin {
     }
 }
 
-android {
-    compileSdk = libs.versions.androidCompileSdk.get().toInt()
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-
-    defaultConfig {
-        minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
-    }
-}
-
 dependencies {
     add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
     add("kspAndroid", project(":ksp:mutable-ui-processor"))

diff --git a/appyx-components/stable/backstack/android/build.gradle.kts b/appyx-components/stable/backstack/android/build.gradle.kts
@@ -3,28 +3,8 @@ plugins {
     id("org.jetbrains.compose")
 }
 
-
-android {
-    namespace = "com.bumble.appyx.components.backstack.android"
-    compileSdk = libs.versions.androidCompileSdk.get().toInt()
-    defaultConfig {
-        minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    testOptions {
-        unitTests.all {
-            it.useJUnitPlatform()
-        }
-    }
-    packagingOptions {
-        resources.excludes.apply {
-            add("META-INF/LICENSE.md")
-            add("META-INF/LICENSE-notice.md")
-        }
-    }
+appyx {
+    namespace.set("com.bumble.appyx.components.backstack.android")
 }
 
 dependencies {
@@ -35,10 +15,6 @@ dependencies {
     androidTestImplementation(project(":appyx-interactions:android"))
     androidTestImplementation(project(":appyx-interactions:appyx-interactions"))
     androidTestImplementation(libs.compose.ui.test.junit4)
-
     androidTestImplementation(libs.junit.api)
-    testRuntimeOnly(libs.junit.engine)
-    testRuntimeOnly(libs.junit.vintage)
-
     androidTestImplementation(libs.compose.ui.test.manifest)
 }
diff --git a/appyx-components/stable/backstack/common/build.gradle.kts b/appyx-components/stable/backstack/common/build.gradle.kts
@@ -7,6 +7,10 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
+appyx {
+    androidNamespace.set("com.bumble.appyx.components.backstack")
+}
+
 kotlin {
     android {
         publishLibraryVariants("release")
@@ -41,16 +45,6 @@ kotlin {
     }
 }
 
-android {
-    compileSdk = libs.versions.androidCompileSdk.get().toInt()
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-
-    defaultConfig {
-        minSdk = libs.versions.androidMinSdk.get().toInt()
-        targetSdk = libs.versions.androidTargetSdk.get().toInt()
-    }
-}
-
 dependencies {
     add("kspCommonMainMetadata", project(":ksp:mutable-ui-processor"))
     add("kspAndroid", project(":ksp:mutable-ui-processor"))