Migrate to Android KMP plugin

buildSrc/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
     implementation(plugin(libs.plugins.kotlin.multiplatform))
     implementation(plugin(libs.plugins.kotlinx.atomicfu))
-    implementation(plugin(libs.plugins.android.library))
+    implementation(plugin(libs.plugins.android.kotlin.multiplatform.library))
     implementation(plugin(libs.plugins.dokka))
     implementation(libs.dokka.versioning)
     implementation(plugin(libs.plugins.vanniktech.maven.publish))

buildSrc/src/main/kotlin/base-convention.gradle.kts

@@ -8,11 +8,30 @@ import rules.applyCouchbaseLiteRule
 plugins {
     `kotlin-multiplatform`
     `kotlin-native-cocoapods`
-    `android-library`
+    com.android.kotlin.multiplatform.library
     org.jetbrains.kotlinx.atomicfu
 }
 
 kotlin {
+    android {
+        compileSdk = 36
+        minSdk = 22
+        withDeviceTestBuilder {
+            sourceSetTreeName = "test"
+        }.configure {
+            instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+            targetSdk {
+                version = release(36)
+            }
+        }
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
+        }
+        // required by coroutines 1.7.0+ to avoid errors:
+        // 6 files found with path 'META-INF/LICENSE.md'
+        packaging.resources.pickFirsts += "META-INF/**"
+    }
+
     cocoapods {
         version = project.version.toString()
         homepage = "https://kotbase.dev/"
@@ -70,24 +89,6 @@ tasks.withType<KotlinCompile>().configureEach {
     compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
 }
 
-android {
-    compileSdk = 36
-    defaultConfig {
-        minSdk = 22
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-    testOptions {
-        targetSdk = 36
-    }
-    // required by coroutines 1.7.0+ to avoid errors:
-    // 6 files found with path 'META-INF/LICENSE.md'.
-    packaging.resources.pickFirsts += "META-INF/**"
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-}
-
 dependencies {
     components {
         applyCouchbaseLiteRule("com.couchbase.lite:couchbase-lite-java", "com.couchbase.lite:couchbase-lite-android")

buildSrc/src/main/kotlin/library-convention.gradle.kts

@@ -1,6 +1,3 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
-
 plugins {
     id("base-convention")
     id("dokka-convention")
@@ -9,13 +6,6 @@ plugins {
 
 kotlin {
     explicitApiWarning()
-
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
-    androidTarget {
-        publishLibraryVariants("release")
-        instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
-        unitTestVariant.sourceSetTree.set(KotlinSourceSetTree.unitTest)
-    }
 }
 
 mavenPublishing {

buildSrc/src/main/kotlin/multiplatform-convention.gradle.kts

@@ -1,3 +1,4 @@
+import com.android.build.api.dsl.KotlinMultiplatformAndroidCompilation
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
@@ -32,7 +33,7 @@ kotlin {
     applyDefaultHierarchyTemplate {
         common {
             group("jvmCommon") {
-                withAndroidTarget()
+                withCompilations { it is KotlinMultiplatformAndroidCompilation }
                 withJvm()
             }
             group("native") {
@@ -44,7 +45,7 @@ kotlin {
         }
     }
 
-    androidTarget()
+    android
     jvm()
     iosArm64()
     iosSimulatorArm64()

couchbase-lite-ee-kermit/build.gradle.kts

@@ -6,6 +6,8 @@ plugins {
 description = "Couchbase Lite Enterprise Edition for Kotlin Multiplatform – Kermit Logger"
 
 kotlin {
+    android.namespace = "dev.kotbase.kermit"
+
     cocoapods {
         framework {
             binaryOption("bundleId", "dev.kotbase.kermit")
@@ -30,5 +32,3 @@ kotlin {
         }
     }
 }
-
-android.namespace = "dev.kotbase.kermit"

couchbase-lite-ee-ktx/build.gradle.kts

@@ -6,6 +6,8 @@ plugins {
 description = "Couchbase Lite Enterprise Edition for Kotlin Multiplatform – Kotlin Extensions"
 
 kotlin {
+    android.namespace = "dev.kotbase.ktx"
+
     cocoapods {
         framework {
             binaryOption("bundleId", "dev.kotbase.ktx")
@@ -32,10 +34,8 @@ kotlin {
         androidMain.dependencies {
             compileOnly(libs.androidx.lifecycle.runtime.ktx)
         }
-        androidInstrumentedTest.dependencies {
+        androidDeviceTest.dependencies {
             implementation(libs.mockk.android)
         }
     }
 }
-
-android.namespace = "dev.kotbase.ktx"

couchbase-lite-ee-paging/build.gradle.kts

@@ -6,6 +6,11 @@ plugins {
 description = "Couchbase Lite Enterprise Edition for Kotlin Multiplatform – AndroidX Paging Extensions"
 
 kotlin {
+    android {
+        namespace = "dev.kotbase.paging"
+        minSdk = 23
+    }
+
     cocoapods {
         framework {
             binaryOption("bundleId", "dev.kotbase.paging")
@@ -30,8 +35,3 @@ kotlin {
         }
     }
 }
-
-android {
-    namespace = "dev.kotbase.paging"
-    defaultConfig.minSdk = 23
-}

couchbase-lite-ee/build.gradle.kts

@@ -12,6 +12,8 @@ plugins {
 description = "Couchbase Lite Enterprise Edition for Kotlin Multiplatform"
 
 kotlin {
+    android.namespace = "dev.kotbase"
+
     cocoapods {
         framework {
             binaryOption("bundleId", "dev.kotbase")
@@ -73,7 +75,7 @@ kotlin {
             api(libs.couchbase.lite.android.ee)
             implementation(libs.androidx.startup)
         }
-        androidInstrumentedTest.dependencies {
+        androidDeviceTest.dependencies {
             implementation(libs.couchbase.lite.android.vector.search.arm64)
             implementation(libs.couchbase.lite.android.vector.search.x64)
         }
@@ -84,8 +86,6 @@ kotlin {
     }
 }
 
-android.namespace = "dev.kotbase"
-
 // Internal headers required for tests
 tasks.named<DefFileTask>("generateDefCouchbaseLite") {
     doLast {

couchbase-lite-kermit/build.gradle.kts

@@ -6,6 +6,8 @@ plugins {
 description = "Couchbase Lite Community Edition for Kotlin Multiplatform – Kermit Logger"
 
 kotlin {
+    android.namespace = "dev.kotbase.kermit"
+
     cocoapods {
         framework {
             binaryOption("bundleId", "dev.kotbase.kermit")
@@ -30,5 +32,3 @@ kotlin {
         }
     }
 }
-
-android.namespace = "dev.kotbase.kermit"

couchbase-lite-ktx/build.gradle.kts

@@ -6,6 +6,8 @@ plugins {
 description = "Couchbase Lite Community Edition for Kotlin Multiplatform – Kotlin Extensions"
 
 kotlin {
+    android.namespace = "dev.kotbase.ktx"
+
     cocoapods {
         framework {
             binaryOption("bundleId", "dev.kotbase.ktx")
@@ -32,10 +34,8 @@ kotlin {
         androidMain.dependencies {
             compileOnly(libs.androidx.lifecycle.runtime.ktx)
         }
-        androidInstrumentedTest.dependencies {
+        androidDeviceTest.dependencies {
             implementation(libs.mockk.android)
         }
     }
 }
-
-android.namespace = "dev.kotbase.ktx"

couchbase-lite-paging/build.gradle.kts

@@ -6,6 +6,11 @@ plugins {
 description = "Couchbase Lite Community Edition for Kotlin Multiplatform – AndroidX Paging Extensions"
 
 kotlin {
+    android {
+        namespace = "dev.kotbase.paging"
+        minSdk = 23
+    }
+
     cocoapods {
         framework {
             binaryOption("bundleId", "dev.kotbase.paging")
@@ -30,8 +35,3 @@ kotlin {
         }
     }
 }
-
-android {
-    namespace = "dev.kotbase.paging"
-    defaultConfig.minSdk = 23
-}

couchbase-lite/build.gradle.kts

@@ -10,6 +10,8 @@ plugins {
 description = "Couchbase Lite Community Edition for Kotlin Multiplatform"
 
 kotlin {
+    android.namespace = "dev.kotbase"
+
     cocoapods {
         framework {
             binaryOption("bundleId", "dev.kotbase")
@@ -64,8 +66,6 @@ kotlin {
     }
 }
 
-android.namespace = "dev.kotbase"
-
 // Internal headers required for tests
 tasks.named<DefFileTask>("generateDefCouchbaseLite") {
     doLast {

gradle/libs.versions.toml

@@ -4,18 +4,18 @@ couchbase-lite-objc = "3.2.4"
 couchbase-lite-c = "3.2.4"
 couchbase-lite-vector-search = "1.0.0"
 dokka = "2.0.0"
-mockk = "1.14.5"
+mockk = "1.14.6"
 
 [plugins]
-android-library = { id = "com.android.library", version = "8.11.2" }
+android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version = "8.12.3" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version = "2.2.20" }
 kotlinx-atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version = "0.29.0" }
 kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.18.1" }
 vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.34.0" }
 
 [libraries]
-androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.9.3" }
+androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.9.4" }
 androidx-startup = { module = "androidx.startup:startup-runtime", version = "1.2.0" }
 androidx-test-core-ktx = { module = "androidx.test:core-ktx", version = "1.7.0" }
 androidx-test-runner = { module = "androidx.test:runner", version = "1.7.0" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

testing-support-ee/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
 }
 
 kotlin {
+    android.namespace = "dev.kotbase.testingsupport"
+
     cocoapods {
         framework {
             binaryOption("bundleId", "dev.kotbase.testingsupport")
@@ -35,5 +37,3 @@ kotlin {
         }
     }
 }
-
-android.namespace = "dev.kotbase.testingsupport"

testing-support/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
 }
 
 kotlin {
+    android.namespace = "dev.kotbase.testingsupport"
+
     cocoapods {
         framework {
             binaryOption("bundleId", "dev.kotbase.testingsupport")
@@ -35,5 +37,3 @@ kotlin {
         }
     }
 }
-
-android.namespace = "dev.kotbase.testingsupport"