Migrate to new Multiplatform Android Plugin

Author: jan-tennert

Auth/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
    // alias(libs.plugins.complete.kotlin)
     id(libs.plugins.kotlin.multiplatform.get().pluginId)
-    id(libs.plugins.android.library.get().pluginId)
+    id(libs.plugins.android.kotlin.multiplatform.library.get().pluginId)
 }
 
 description = "Extends supabase-kt with a Auth Client"
@@ -79,4 +79,3 @@ kotlin {
     }
 }
 
-configureLibraryAndroidTarget()

Auth/src/androidUnitTest/kotlin/platformSettings.kt renamed to Auth/src/androidHostTest/kotlin/platformSettings.kt

@@ -1,6 +1,6 @@
 plugins {
     id(libs.plugins.kotlin.multiplatform.get().pluginId)
-    id(libs.plugins.android.library.get().pluginId)
+    id(libs.plugins.android.kotlin.multiplatform.library.get().pluginId)
 }
 
 description = "Extends supabase-kt with a Edge Functions Client"
@@ -26,5 +26,3 @@ kotlin {
         }
     }
 }
-
-configureLibraryAndroidTarget()

Functions/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id(libs.plugins.kotlin.multiplatform.get().pluginId)
-    id(libs.plugins.android.library.get().pluginId)
+    id(libs.plugins.android.kotlin.multiplatform.library.get().pluginId)
 }
 
 description = "Extends supabase-kt with a Postgrest Client"
@@ -29,4 +29,3 @@ kotlin {
     }
 }
 
-configureLibraryAndroidTarget()

Postgrest/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id(libs.plugins.kotlin.multiplatform.get().pluginId)
-    id(libs.plugins.android.library.get().pluginId)
+    id(libs.plugins.android.kotlin.multiplatform.library.get().pluginId)
 }
 
 description = "Extends supabase-kt with a Realtime Client"
@@ -31,4 +31,3 @@ kotlin {
     }
 }
 
-configureLibraryAndroidTarget()

Realtime/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id(libs.plugins.kotlin.multiplatform.get().pluginId)
-    id(libs.plugins.android.library.get().pluginId)
+    id(libs.plugins.android.kotlin.multiplatform.library.get().pluginId)
 }
 
 description = "Extends supabase-kt with a Storage Client"
@@ -40,4 +40,3 @@ kotlin {
     }
 }
 
-configureLibraryAndroidTarget()

Storage/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     id(libs.plugins.kotlin.multiplatform.get().pluginId)
-    id(libs.plugins.android.library.get().pluginId)
+   // id(libs.plugins.android.kotlin.multiplatform.library.get().pluginId)
+    id(libs.plugins.android.kotlin.multiplatform.library.get().pluginId)
     id(libs.plugins.detekt.get().pluginId)
     id(libs.plugins.dokka.get().pluginId)
     alias(libs.plugins.kotlinx.plugin.serialization)
@@ -64,4 +65,3 @@ kotlin {
     }
 }
 
-configureLibraryAndroidTarget()

Supabase/build.gradle.kts

@@ -17,7 +17,7 @@ fun libraryModules(withBom: Boolean = true, init: Project.() -> Unit) = configur
 
 plugins {
     id(libs.plugins.kotlin.multiplatform.get().pluginId) apply false
-    id(libs.plugins.android.library.get().pluginId) apply false
+    id(libs.plugins.android.kotlin.multiplatform.library.get().pluginId) apply false
     id(libs.plugins.detekt.get().pluginId) apply false
     id(libs.plugins.dokka.get().pluginId)
     alias(libs.plugins.kotlinx.plugin.serialization) apply false

build.gradle.kts

@@ -1,4 +1,6 @@
+import com.android.build.api.dsl.androidLibrary
 import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.extra
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -39,10 +41,19 @@ fun KotlinMultiplatformExtension.configuredJvmTarget(jvmTarget: JvmTarget = JvmT
     }
 }
 
-fun KotlinMultiplatformExtension.configuredAndroidTarget(jvmTarget: JvmTarget = JvmTarget.JVM_1_8) {
-    androidTarget {
-        publishLibraryVariants("release", "debug")
-        compilerOptions.jvmTarget = jvmTarget
+fun KotlinMultiplatformExtension.configuredAndroidTarget(
+    jvmTarget: JvmTarget = JvmTarget.JVM_1_8,
+) {
+    androidLibrary {
+        compileSdk = 35
+        minSdk = 21
+        this.namespace = namespace ?: "${project.extra["base-group"].toString().replace("-", ".")}.${project.name.replace("-", "")}.library"
+        withHostTestBuilder {}.configure {}
+        compilations.configureEach {
+            compilerOptions.configure {
+                this.jvmTarget.set(jvmTarget)
+            }
+        }
     }
 }
 

buildSrc/src/main/kotlin/KotlinTargets.kt

@@ -12,7 +12,7 @@ androidx-startup = "1.2.0"
 androidx-activity-compose = "1.10.1"
 multiplatform-settings = "1.3.0"
 complete-kotlin = "1.1.0"
-agp = "8.9.2"
+agp = "8.11.1"
 maven-publish = "0.34.0"
 apollo-kotlin = "4.3.2"
 serialization = "1.9.0"
@@ -24,7 +24,7 @@ browser = "1.9.0"
 compose = "1.8.2"
 coil2 = "2.7.0"
 okio = "3.16.0"
-koin = "4.0.4"
+koin = "4.1.0"
 androidx-core = "1.17.0"
 androidx-compat = "1.7.1"
 androidx-lifecycle = "2.9.2"
@@ -39,6 +39,7 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 kotlinx-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 complete-kotlin = { id = "com.louiscad.complete-kotlin", version.ref = "complete-kotlin" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }