Move to new KMP Android Library plugin for KMP library modules

aboutlibraries-compose-m2/build.gradle.kts

@@ -1,27 +1,29 @@
+import com.mikepenz.gradle.utils.readPropertyOrElse
+
 plugins {
-    id("com.mikepenz.convention.android-library")
     id("com.mikepenz.convention.kotlin-multiplatform")
+    alias(baseLibs.plugins.androidKmpLibrary)
     id("com.mikepenz.convention.compose")
     id("com.mikepenz.convention.publishing")
-    alias(baseLibs.plugins.screenshot)
-}
-
-android {
-    namespace = "com.mikepenz.aboutlibraries.ui.compose"
-
-    @Suppress("UnstableApiUsage")
-    experimentalProperties["android.experimental.enableScreenshotTest"] = true
 }
 
 composeCompiler {
     stabilityConfigurationFiles.addAll(
         rootProject.layout.projectDirectory.file("stability_config.conf"),
     )
+    reportsDestination = layout.buildDirectory.dir("compose_compiler")
+    metricsDestination = layout.buildDirectory.dir("compose_compiler")
 }
 
 kotlin {
     applyDefaultHierarchyTemplate()
 
+    android {
+        namespace = "com.mikepenz.aboutlibraries.ui.compose"
+        compileSdk = baseLibs.versions.compileSdk.get().toInt()
+        minSdk = project.readPropertyOrElse("com.mikepenz.android.minSdk", "${baseLibs.versions.minSdk.get().toInt()}", null).toString().toInt()
+    }
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -44,15 +46,6 @@ kotlin {
     }
 }
 
-dependencies {
-    debugImplementation(compose.uiTooling)
-
-    screenshotTestImplementation(compose.runtime)
-    screenshotTestImplementation(compose.ui)
-    screenshotTestImplementation(compose.foundation)
-    screenshotTestImplementation(compose.material)
-}
-
 configurations.configureEach {
     // We forcefully exclude AppCompat + MDC from any transitive dependencies. This is a Compose module, so there's no need for these
     // https://github.com/chrisbanes/tivi/blob/5e7586465337d326a1f1e40e0b412ecd2779bb5c/build.gradle#L72

aboutlibraries-compose-m3/build.gradle.kts

@@ -1,27 +1,29 @@
+import com.mikepenz.gradle.utils.readPropertyOrElse
+
 plugins {
-    id("com.mikepenz.convention.android-library")
     id("com.mikepenz.convention.kotlin-multiplatform")
+    alias(baseLibs.plugins.androidKmpLibrary)
     id("com.mikepenz.convention.compose")
     id("com.mikepenz.convention.publishing")
-    alias(baseLibs.plugins.screenshot)
-}
-
-android {
-    namespace = "com.mikepenz.aboutlibraries.ui.compose.m3"
-
-    @Suppress("UnstableApiUsage")
-    experimentalProperties["android.experimental.enableScreenshotTest"] = true
 }
 
 composeCompiler {
     stabilityConfigurationFiles.addAll(
         rootProject.layout.projectDirectory.file("stability_config.conf"),
     )
+    reportsDestination = layout.buildDirectory.dir("compose_compiler")
+    metricsDestination = layout.buildDirectory.dir("compose_compiler")
 }
 
 kotlin {
     applyDefaultHierarchyTemplate()
 
+    android {
+        namespace = "com.mikepenz.aboutlibraries.ui.compose.m3"
+        compileSdk = baseLibs.versions.compileSdk.get().toInt()
+        minSdk = project.readPropertyOrElse("com.mikepenz.android.minSdk", "${baseLibs.versions.minSdk.get().toInt()}", null).toString().toInt()
+    }
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -44,15 +46,6 @@ kotlin {
     }
 }
 
-dependencies {
-    debugImplementation(compose.uiTooling)
-
-    screenshotTestImplementation(compose.runtime)
-    screenshotTestImplementation(compose.ui)
-    screenshotTestImplementation(compose.foundation)
-    screenshotTestImplementation(compose.material3)
-}
-
 configurations.configureEach {
     // We forcefully exclude AppCompat + MDC from any transitive dependencies. This is a Compose module, so there's no need for these
     // https://github.com/chrisbanes/tivi/blob/5e7586465337d326a1f1e40e0b412ecd2779bb5c/build.gradle#L72

aboutlibraries-compose/build.gradle.kts

@@ -1,23 +1,30 @@
+import com.mikepenz.gradle.utils.readPropertyOrElse
+
 plugins {
-    id("com.mikepenz.convention.android-library")
     id("com.mikepenz.convention.kotlin-multiplatform")
+    alias(baseLibs.plugins.androidKmpLibrary)
     id("com.mikepenz.convention.compose")
     id("com.mikepenz.convention.publishing")
 }
 
-android {
-    namespace = "com.mikepenz.aboutlibraries.ui.compose.core"
-}
-
 composeCompiler {
     stabilityConfigurationFiles.addAll(
         rootProject.layout.projectDirectory.file("stability_config.conf"),
     )
+    reportsDestination = layout.buildDirectory.dir("compose_compiler")
+    metricsDestination = layout.buildDirectory.dir("compose_compiler")
 }
 
 kotlin {
     applyDefaultHierarchyTemplate()
 
+
+    android {
+        namespace = "com.mikepenz.aboutlibraries.ui.compose.core"
+        compileSdk = baseLibs.versions.compileSdk.get().toInt()
+        minSdk = project.readPropertyOrElse("com.mikepenz.android.minSdk", "${baseLibs.versions.minSdk.get().toInt()}", null).toString().toInt()
+    }
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -36,10 +43,6 @@ kotlin {
     }
 }
 
-dependencies {
-    debugImplementation(compose.uiTooling)
-}
-
 configurations.configureEach {
     // We forcefully exclude AppCompat + MDC from any transitive dependencies. This is a Compose module, so there's no need for these
     // https://github.com/chrisbanes/tivi/blob/5e7586465337d326a1f1e40e0b412ecd2779bb5c/build.gradle#L72

aboutlibraries-core/build.gradle.kts

@@ -1,18 +1,22 @@
+import com.mikepenz.gradle.utils.readPropertyOrElse
+
 plugins {
-    id("com.mikepenz.convention.android-library")
     id("com.mikepenz.convention.kotlin-multiplatform")
+    alias(baseLibs.plugins.androidKmpLibrary)
     id("com.mikepenz.convention.publishing")
     kotlin("plugin.serialization") version baseLibs.versions.kotlin.get()
 }
 
-android {
-    namespace = "com.mikepenz.aboutlibraries.core"
-    lint {
-        abortOnError = false
+kotlin {
+    android {
+        namespace = "com.mikepenz.aboutlibraries.core"
+        compileSdk = baseLibs.versions.compileSdk.get().toInt()
+        minSdk = project.readPropertyOrElse("com.mikepenz.android.minSdk", "${baseLibs.versions.minSdk.get().toInt()}", null).toString().toInt()
+        lint {
+            abortOnError = false
+        }
     }
-}
 
-kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {

build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
     alias(baseLibs.plugins.conventionPlugin)
     alias(baseLibs.plugins.androidApplication) apply false
     alias(baseLibs.plugins.androidLibrary) apply false
+    alias(baseLibs.plugins.androidKmpLibrary) apply false
     alias(baseLibs.plugins.composeMultiplatform) apply false
     alias(baseLibs.plugins.composeCompiler) apply false
     alias(baseLibs.plugins.composeHotreload) apply false

gradle.properties

@@ -31,7 +31,7 @@ org.gradle.caching=true
 # Disabled due to issues with publishing plugin
 org.gradle.configuration-cache=false
 # Enable to test: https://github.com/mikepenz/AboutLibraries/issues/1144
-org.gradle.configureondemand=true
+org.gradle.configureondemand=false
 
 org.jetbrains.compose.experimental.macos.enabled=true
 org.jetbrains.compose.experimental.uikit.enabled=true

settings.gradle.kts

@@ -25,7 +25,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("baseLibs") {
-            from("com.mikepenz:version-catalog:0.10.3")
+            from("com.mikepenz:version-catalog:0.10.4")
         }
     }
 }

stability_config.conf

@@ -1,4 +1,4 @@
 // Consider kotlin collections stable
-kotlin.collections.*
-
+kotlin.collections.**
 kotlinx.coroutines.CoroutineScope
+com.mikepenz.aboutlibraries.Libs