Migrated to new KMP Android plugin

Author: Wavesonics

ComposeTextEditor/build.gradle.kts

@@ -5,17 +5,20 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.composeMultiplatform)
     alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.android.library)
+	alias(libs.plugins.android.kmp.library)
 	alias(libs.plugins.mavenPublish)
 }
 
 kotlin {
     applyDefaultHierarchyTemplate()
     jvm("desktop")
-    androidTarget {
-        publishLibraryVariants("release")
-	    compilerOptions {
-		    jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.get()))
+	androidLibrary {
+		namespace = "com.darkrockstudios.texteditor"
+		compileSdk = libs.versions.android.compileSdk.get().toInt()
+		minSdk = libs.versions.android.minSdk.get().toInt()
+
+		compilerOptions {
+			jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.get()))
         }
     }
     @OptIn(ExperimentalWasmDsl::class)
@@ -68,18 +71,6 @@ kotlin {
     }
 }
 
-android {
-    namespace = "com.darkrockstudios.texteditor"
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
-    defaultConfig {
-        minSdk = libs.versions.android.minSdk.get().toInt()
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.toVersion(libs.versions.jvm.get().toInt())
-        targetCompatibility = JavaVersion.toVersion(libs.versions.jvm.get().toInt())
-    }
-}
-
 group = "com.darkrockstudios"
 version = providers.gradleProperty("library.version").getOrElse("0.0.0-SNAPSHOT")
 

ComposeTextEditorSpellCheck/build.gradle.kts

@@ -5,15 +5,18 @@ plugins {
 	alias(libs.plugins.kotlinMultiplatform)
 	alias(libs.plugins.composeMultiplatform)
 	alias(libs.plugins.composeCompiler)
-	alias(libs.plugins.android.library)
+	alias(libs.plugins.android.kmp.library)
 	alias(libs.plugins.mavenPublish)
 }
 
 kotlin {
 	applyDefaultHierarchyTemplate()
 	jvm("desktop")
-	androidTarget {
-		publishLibraryVariants("release")
+	androidLibrary {
+		namespace = "com.darkrockstudios.texteditor.spellcheck"
+		compileSdk = libs.versions.android.compileSdk.get().toInt()
+		minSdk = libs.versions.android.minSdk.get().toInt()
+
 		compilerOptions {
 			jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.get()))
 		}
@@ -100,18 +103,6 @@ kotlin {
 	}
 }
 
-android {
-	namespace = "com.darkrockstudios.texteditor.spellcheck"
-	compileSdk = libs.versions.android.compileSdk.get().toInt()
-	defaultConfig {
-		minSdk = libs.versions.android.minSdk.get().toInt()
-	}
-	compileOptions {
-		sourceCompatibility = JavaVersion.toVersion(libs.versions.jvm.get().toInt())
-		targetCompatibility = JavaVersion.toVersion(libs.versions.jvm.get().toInt())
-	}
-}
-
 group = "com.darkrockstudios"
 version = providers.gradleProperty("library.version").getOrElse("0.0.0-SNAPSHOT")
 

build.gradle.kts

@@ -6,5 +6,6 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.kmp.library) apply false
 	alias(libs.plugins.mavenPublish) apply false
 }

gradle/libs.versions.toml

@@ -53,4 +53,5 @@ composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "k
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+android-kmp-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" }