WIP

Author: whyoleg

build-logic/src/main/kotlin/ckbuild.multiplatform-android.gradle.kts

@@ -1,67 +1,63 @@
 /*
- * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright (c) 2023-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
 import org.jetbrains.kotlin.gradle.*
 import org.jetbrains.kotlin.gradle.plugin.*
 
 plugins {
     id("ckbuild.multiplatform-base")
-    id("com.android.library")
-}
-
-android {
-    namespace = "${project.group}.${project.name.replace("-", ".")}"
-    compileSdk = 34
-    defaultConfig {
-        minSdk = 21
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    // setup for local dev, on CI same targets are tested but with different approach
-    @Suppress("UnstableApiUsage")
-    testOptions {
-        managedDevices {
-            localDevices {
-                // minimal supported API
-                create("androidApi21") {
-                    device = "Pixel 2"
-                    apiLevel = 21
-                    systemImageSource = "aosp"
-                }
-                // first API with full JDK 8 support
-                create("androidApi27") {
-                    device = "Pixel 2"
-                    apiLevel = 27
-                    systemImageSource = "aosp"
-                }
-                // latest available for tests API
-                create("androidApi33") {
-                    device = "Pixel 2"
-                    apiLevel = 33
-                    systemImageSource = "aosp"
-                }
-                // atd image is fast
-                create("androidFast") {
-                    device = "Pixel 2"
-                    apiLevel = 33
-                    systemImageSource = "aosp-atd"
-                }
-            }
-        }
-    }
+    id("com.android.kotlin.multiplatform.library")
 }
 
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     jvmToolchain(8)
-    androidTarget {
-        instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
-        unitTestVariant.sourceSetTree.set(KotlinSourceSetTree.unitTest)
+    androidLibrary {
+        namespace = "${project.group}.${project.name.replace("-", ".")}"
+        compileSdk = 34
+        minSdk = 21
+
+        withDeviceTestBuilder {
+            // TODO?
+            sourceSetTreeName = "test"
+        }.configure {
+            instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+//            managedDevices {
+//                //    // setup for local dev, on CI same targets are tested but with different approach
+//                @Suppress("UnstableApiUsage")
+//                localDevices {
+//                    // minimal supported API
+////                    create("androidApi21") {
+////                        device = "Pixel 2"
+////                        apiLevel = 21
+////                        systemImageSource = "aosp"
+////                    }
+////                    // first API with full JDK 8 support
+////                    create("androidApi27") {
+////                        device = "Pixel 2"
+////                        apiLevel = 27
+////                        systemImageSource = "aosp"
+////                    }
+////                    // latest available for tests API
+////                    create("androidApi33") {
+////                        device = "Pixel 2"
+////                        apiLevel = 33
+////                        systemImageSource = "aosp"
+////                    }
+//                    // atd image is fast
+//                    create("androidFast") {
+//                        device = "Pixel 2"
+//                        sdkVersion = 33
+//                        systemImageSource = "aosp-atd"
+//                    }
+//                }
+//            }
+        }
     }
 
     sourceSets {
-        invokeWhenCreated("androidInstrumentedTest") {
+        named("androidDeviceTest") {
             dependencies {
                 implementation(versionCatalogs.named("libs").findLibrary("androidx-test").get())
             }

build-logic/src/main/kotlin/ckbuild.multiplatform-base.gradle.kts

@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.gradle.tasks.*
 
 plugins {
     kotlin("multiplatform")
-    id("org.jetbrains.kotlinx.kover")
+//    id("org.jetbrains.kotlinx.kover")
 }
 
 // true by default

build.gradle.kts

@@ -2,7 +2,6 @@
  * Copyright (c) 2023-2025 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import ckbuild.*
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.*
 import org.jetbrains.kotlin.gradle.targets.js.npm.*
 import org.jetbrains.kotlin.gradle.targets.wasm.nodejs.*
@@ -11,7 +10,7 @@ import org.jetbrains.kotlin.gradle.targets.wasm.npm.*
 plugins {
     alias(libs.plugins.kotlin.dokka)
 
-    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.kotlin.multiplatform.library) apply false
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlin.plugin.serialization) apply false
 

cryptography-providers/jdk/android-tests/build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 
 kotlin {
     sourceSets {
-        androidInstrumentedTest.dependencies {
+        commonTest.dependencies {
             implementation(projects.cryptographyProviderJdk)
         }
     }

cryptography-providers/tests/build.gradle.kts

@@ -4,6 +4,7 @@
 
 import ckbuild.*
 import org.jetbrains.kotlin.gradle.*
+import org.jetbrains.kotlin.gradle.plugin.*
 
 plugins {
     id("ckbuild.multiplatform-base")
@@ -22,7 +23,9 @@ kotlin {
     applyDefaultHierarchyTemplate {
         common {
             group("nonJs") {
-                withAndroidTarget()
+                withCompilations {
+                    it.target.platformType == KotlinPlatformType.androidJvm
+                }
                 withJvm()
                 withWasmJs()
                 withWasmWasi()

gradle/libs.versions.toml

@@ -62,4 +62,4 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "kotlin-dokka" }
-android-library = { id = "com.android.library", version.ref = "android" }
+android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "android" }