Switch to KMP Android Library plugin

build-logic/src/main/kotlin/AndroidConfiguration.kt

@@ -1,23 +1,22 @@
 import com.android.build.api.dsl.CommonExtension
 import com.android.build.gradle.BaseExtension
-import com.android.build.gradle.LibraryExtension
 import org.gradle.api.Project
 
 // TODO: provide Project using the new multiple context receivers functionality.
 //       this is prototyped in 1.6.20 and will probably reach beta in Kotlin 1.8 or 1.9
 // context(Project)
-internal fun LibraryExtension.baseConfiguration(project: Project) {
-    configureSdk()
+internal fun BaseExtension.baseConfiguration(project: Project) {
+    configureSdk(project)
     configureProguardRules(project)
     configureTestOptions(project)
 }
 
-private fun BaseExtension.configureSdk() {
-    compileSdkVersion(36)
+private fun BaseExtension.configureSdk(project: Project) {
+    compileSdkVersion(project.libs.findVersion("android-sdk-compile").get().requiredVersion.toInt())
 
     defaultConfig {
-        minSdk = 23
-        targetSdk = 36
+        minSdk = project.libs.findVersion("android-sdk-min").get().requiredVersion.toInt()
+        targetSdk = project.libs.findVersion("android-sdk-compile").get().requiredVersion.toInt()
     }
 }
 

build-logic/src/main/kotlin/KotlinConfiguration.kt

@@ -1,8 +1,8 @@
 import org.gradle.api.Project
 import org.gradle.jvm.toolchain.JavaLanguageVersion
-import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
 
-fun KotlinTopLevelExtension.configureJvmToolchain(project: Project) {
+fun KotlinBaseExtension.configureJvmToolchain(project: Project) {
     jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(project.libs.findVersion("jvm").get().requiredVersion))
     }

build-logic/src/main/kotlin/MultiplatformConfiguration.kt

@@ -1,21 +1,16 @@
-import com.android.build.gradle.LibraryExtension
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.configure
+import com.android.build.api.dsl.androidLibrary
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests
 import org.jetbrains.kotlin.gradle.plugin.mpp.TestExecutable
 
-// TODO: provide Project using the new multiple context receivers functionality.
-//       this is prototyped in 1.6.20 and will probably reach beta in Kotlin 1.8 or 1.9
-// context(Project)
-internal fun KotlinMultiplatformExtension.configureAndroidTarget(project: Project) {
-    androidTarget {
-        publishAllLibraryVariants()
-    }
+@Suppress("UnstableApiUsage")
+fun KotlinMultiplatformExtension.configureAndroidLibraryTarget() {
+    project.pluginManager.apply("com.android.kotlin.multiplatform.library")
 
-    project.extensions.configure<LibraryExtension> {
-        baseConfiguration(project)
+    androidLibrary {
+        compileSdk = project.libs.findVersion("android-sdk-compile").get().requiredVersion.toInt()
+        minSdk = project.libs.findVersion("android-sdk-min").get().requiredVersion.toInt()
     }
 }
 

build-logic/src/main/kotlin/gto-support.multiplatform-android-conventions.gradle.kts

@@ -4,5 +4,11 @@ plugins {
 }
 
 kotlin {
-    configureAndroidTarget(project)
+    androidTarget {
+        publishAllLibraryVariants()
+    }
+}
+
+android {
+    baseConfiguration(project)
 }

gradle/libs.versions.toml

@@ -1,6 +1,8 @@
 [versions]
 accompanist = "0.36.0"
 android-gradle-plugin = "8.13.0"
+android-sdk-compile = "36"
+android-sdk-min = "23"
 androidx-arch-core = "2.2.0"
 androidx-collection = "1.5.0"
 androidx-compose = "1.9.4"

gto-support-androidx-annotation/build.gradle.kts

@@ -1,17 +1,20 @@
+import com.android.build.api.dsl.androidLibrary
+
 // Deprecated since v4.2.3, use the standard androidx-annotation library instead
 
 plugins {
-    id("gto-support.multiplatform-android-conventions")
-}
-
-android {
-    namespace = "org.ccci.gto.support.androidx.annotation"
+    id("gto-support.multiplatform-conventions")
 }
 
 kotlin {
+    configureAndroidLibraryTarget()
     configureIosTarget()
     configureJsTarget()
 
+    androidLibrary {
+        namespace = "org.ccci.gto.support.androidx.annotation"
+    }
+
     sourceSets {
         commonMain {
             dependencies {

gto-support-androidx-test-junit/build.gradle.kts

@@ -1,18 +1,21 @@
-plugins {
-    id("gto-support.multiplatform-android-conventions")
-}
+import com.android.build.api.dsl.androidLibrary
 
-android {
-    namespace = "org.ccci.gto.support.androidx.test.junit"
+plugins {
+    id("gto-support.multiplatform-conventions")
 }
 
 kotlin {
+    configureAndroidLibraryTarget()
     configureIosTarget()
     configureJsTarget()
     configureJvmTarget()
 
+    androidLibrary {
+        namespace = "org.ccci.gto.support.androidx.test.junit"
+    }
+
     sourceSets {
-        val androidMain by getting {
+        androidMain {
             dependencies {
                 api(libs.androidx.test.junit)
             }

gto-support-compose/build.gradle.kts

@@ -1,16 +1,19 @@
+import com.android.build.api.dsl.androidLibrary
+
 plugins {
-    id("gto-support.multiplatform-android-conventions")
+    id("gto-support.multiplatform-conventions")
     alias(libs.plugins.compose)
     alias(libs.plugins.compose.compiler)
 }
 
-android {
-    namespace = "org.ccci.gto.android.common.compose"
-}
-
 kotlin {
+    configureAndroidLibraryTarget()
     configureIosTarget()
 
+    androidLibrary {
+        namespace = "org.ccci.gto.android.common.compose"
+    }
+
     sourceSets {
         commonMain {
             dependencies {

gto-support-fluidsonic-locale/build.gradle.kts

@@ -1,15 +1,18 @@
-plugins {
-    id("gto-support.multiplatform-android-conventions")
-}
+import com.android.build.api.dsl.androidLibrary
 
-android {
-    namespace = "org.ccci.gto.android.common.fluidsonic.locale"
+plugins {
+    id("gto-support.multiplatform-conventions")
 }
 
 kotlin {
+    configureAndroidLibraryTarget()
     configureIosTarget()
     configureJsTarget()
 
+    androidLibrary {
+        namespace = "org.ccci.gto.android.common.fluidsonic.locale"
+    }
+
     sourceSets {
         commonMain {
             dependencies {

gto-support-jsonapi-retrofit2/build.gradle.kts

@@ -1,18 +1,22 @@
-plugins {
-    id("gto-support.multiplatform-android-conventions")
-}
-
-android {
-    namespace = "org.ccci.gto.android.common.jsonapi.retrofit2"
+import com.android.build.api.dsl.androidLibrary
 
-    defaultConfig {
-        consumerProguardFile("src/jvmMain/resources/META-INF/proguard/jsonapi-retrofit2.pro")
-    }
+plugins {
+    id("gto-support.multiplatform-conventions")
 }
 
 kotlin {
+    configureAndroidLibraryTarget()
     configureJvmTarget()
 
+    androidLibrary {
+        namespace = "org.ccci.gto.android.common.jsonapi.retrofit2"
+
+        optimization {
+            consumerKeepRules.publish = true
+            consumerKeepRules.file("src/jvmMain/resources/META-INF/proguard/jsonapi-retrofit2.pro")
+        }
+    }
+
     sourceSets {
         commonMain {
             dependencies {

gto-support-jsonapi/build.gradle.kts

@@ -1,14 +1,17 @@
-plugins {
-    id("gto-support.multiplatform-android-conventions")
-}
+import com.android.build.api.dsl.androidLibrary
 
-android {
-    namespace = "org.ccci.gto.android.common.jsonapi"
+plugins {
+    id("gto-support.multiplatform-conventions")
 }
 
 kotlin {
+    configureAndroidLibraryTarget()
     configureJvmTarget()
 
+    androidLibrary {
+        namespace = "org.ccci.gto.android.common.jsonapi"
+    }
+
     sourceSets {
         commonMain {
             dependencies {

gto-support-okio/build.gradle.kts

@@ -1,14 +1,17 @@
-plugins {
-    id("gto-support.multiplatform-android-conventions")
-}
+import com.android.build.api.dsl.androidLibrary
 
-android {
-    namespace = "org.ccci.gto.android.common.okio"
+plugins {
+    id("gto-support.multiplatform-conventions")
 }
 
 kotlin {
+    configureAndroidLibraryTarget()
     configureIosTarget()
 
+    androidLibrary {
+        namespace = "org.ccci.gto.android.common.okio"
+    }
+
     sourceSets {
         commonMain {
             dependencies {

gto-support-parcelize/build.gradle.kts

@@ -1,12 +1,15 @@
-plugins {
-    id("gto-support.multiplatform-android-conventions")
-}
+import com.android.build.api.dsl.androidLibrary
 
-android {
-    namespace = "org.ccci.gto.android.common.parcelize"
+plugins {
+    id("gto-support.multiplatform-conventions")
 }
 
 kotlin {
+    configureAndroidLibraryTarget()
     configureIosTarget()
     configureJsTarget()
+
+    androidLibrary {
+        namespace = "org.ccci.gto.android.common.parcelize"
+    }
 }