migrate onto new android dsl

0.30.1

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.31.0
+
+* `Versions`:
+  * `SQLite`: `3.53.2.1` -> `3.53.4.0`
+  * `KSP`: `2.3.9` -> `2.3.11`
+  * `Exposed`: `1.3.0` -> `1.5.0`
+  * `NMCP`: `1.5.0` -> `1.6.1`
+  * `AndroidX AppCompat`: `1.7.1` -> `1.8.0`
+  * `AndroidX Fragment`: `1.8.9` -> `1.9.0`
+
+## 0.30.1
+
+* `Versions`:
+  * `KSLog`: `1.6.1` -> `1.7.0`
+  * `SQLite`: `3.53.2.0` -> `3.53.2.1`
+  * `Ktor`: `3.5.1` -> `3.5.2`
+  * `Okio`: `3.17.0` -> `3.18.1`
+
 ## 0.30.0
 
 * `Versions`:

android/alerts/common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppAndroidProject"

android/alerts/recyclerview/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppAndroidProject"

android/pickers/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     alias(libs.plugins.jb.compose)
     alias(libs.plugins.kt.jb.compose)
 }

android/recyclerview/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppAndroidProject"

android/smalltextfield/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     alias(libs.plugins.jb.compose)
     alias(libs.plugins.kt.jb.compose)
 }

build.gradle

@@ -41,7 +41,7 @@ allprojects {
         mavenCentral()
         google()
         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
-        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
+//        maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
         mavenLocal()
     }
 

colors/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

colors/common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
@@ -13,7 +13,7 @@ kotlin {
                 api libs.klock
             }
         }
-        jvmMain {
+        jvmAndAndroidMain {
             dependencies {
                 api project(":micro_utils.coroutines")
             }

common/compose/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     alias(libs.plugins.jb.compose)
     alias(libs.plugins.kt.jb.compose)
 }

coroutines/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

coroutines/compose/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     alias(libs.plugins.jb.compose)
     alias(libs.plugins.kt.jb.compose)
 }

crypto/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
@@ -21,11 +21,3 @@ kotlin {
         }
     }
 }
-
-android {
-    sourceSets {
-        main {
-            java.srcDirs += [ "src/jvmMain/kotlin" ]
-        }
-    }
-}

dokka/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     id "org.jetbrains.dokka"
 }
 
@@ -11,13 +11,17 @@ repositories {
     mavenCentral()
 }
 
+apply from: "$defaultAndroidSettings"
+
 kotlin {
     jvm()
     js(IR) {
         browser()
         nodejs()
     }
-    androidTarget {}
+    android {
+        project.ext.configureAndroidTarget(delegate)
+    }
 
     sourceSets {
         commonMain {
@@ -137,5 +141,3 @@ dokka {
 //        }
 //    }
 //}
-
-apply from: "$defaultAndroidSettings"

fsm/common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

fsm/repos/common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

gradle.properties

@@ -1,11 +1,9 @@
 kotlin.code.style=official
 org.gradle.parallel=true
-kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true
 #kotlin.experimental.tryK2=true
 android.useAndroidX=true
-android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
 
 ## https://github.com/google/ksp/issues/2491
@@ -18,5 +16,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.30.0
+version=0.31.0
-android_code_version=315
+android_code_version=317

gradle/libs.versions.toml

@@ -1,51 +1,51 @@
 [versions]
 
-kt = "2.3.21"
+kt = "2.4.10"
 kt-serialization = "1.11.0"
 kt-coroutines = "1.11.0"
 
 kotlinx-browser = "0.5.0"
 
-kslog = "1.6.1"
+kslog = "1.7.0"
 
-jb-compose = "1.11.1"
+jb-compose = "1.12.0"
 jb-compose-material3 = "1.11.0-alpha07"
 jb-compose-icons = "1.7.8"
-jb-exposed = "1.3.0"
+jb-exposed = "1.5.0"
 jb-dokka = "2.2.0"
 
-sqlite = "3.53.2.0"
+sqlite = "3.53.4.0"
 
 korlibs = "5.4.0"
 uuid = "0.8.4"
 
-ktor = "3.5.1"
+ktor = "3.5.2"
 
 gh-release = "2.5.2"
 
 koin = "4.2.2"
 
-okio = "3.17.0"
+okio = "3.18.1"
 
-ksp = "2.3.9"
+ksp = "2.3.11"
 kotlin-poet = "2.3.0"
 
-versions = "0.54.0"
+versions = "0.61.0"
-nmcp = "1.5.0"
+nmcp = "1.6.1"
 
-android-gradle = "8.12.+"
+android-gradle = "9.1.1"
 dexcount = "4.0.0"
 
 android-coreKtx = "1.19.0"
 android-recyclerView = "1.4.0"
-android-appCompat = "1.7.1"
+android-appCompat = "1.8.0"
-android-fragment = "1.8.9"
+android-fragment = "1.9.0"
 android-espresso = "3.7.0"
 android-test = "1.3.0"
 
 android-props-minSdk = "21"
-android-props-compileSdk = "36"
+android-props-compileSdk = "37"
-android-props-buildTools = "36.0.0"
+android-props-buildTools = "37.0.0"
 
 [libraries]
 
@@ -126,5 +126,5 @@ buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gra
 jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" }
 kt-jb-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kt" }
 
-versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
+versions = { id = "io.github.ben-manes.versions", version.ref = "versions" }
 nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }

gradle/templates/addComposeForAndroid.gradle

@@ -1,6 +1,6 @@
 kotlin {
     sourceSets {
-        androidUnitTest {
+        androidHostTest {
             dependencies {
                 implementation compose.uiTest
             }

gradle/templates/defaultAndroidSettings.gradle

@@ -1,34 +1,18 @@
 apply plugin: 'com.getkeepsafe.dexcount'
 
-android {
+ext.configureAndroidTarget = { target ->
-    compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
+    target.compileSdk = libs.versions.android.props.compileSdk.get().toInteger()
-    buildToolsVersion libs.versions.android.props.buildTools.get()
+    target.buildToolsVersion = libs.versions.android.props.buildTools.get()
-
+    target.minSdk = libs.versions.android.props.minSdk.get().toInteger()
-    defaultConfig {
+    target.namespace = "${project.group}.${project.name}"
-        minSdkVersion libs.versions.android.props.minSdk.get().toInteger()
+    target.packaging {
-        compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
+        resources {
-        targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
+            excludes.add 'META-INF/kotlinx-serialization-runtime.kotlin_module'
-        versionCode "${android_code_version}".toInteger()
+            excludes.add 'META-INF/kotlinx-serialization-cbor.kotlin_module'
-        versionName "$version"
+            excludes.add 'META-INF/kotlinx-serialization-properties.kotlin_module'
-        namespace "${project.group}.${project.name}"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-        debug {
-            debuggable true
         }
     }
-
+    target.compilerOptions.jvmTarget.set(
-    packagingOptions {
+            target.compilerOptions.jvmTarget.get().class.fromTarget("17")
-        exclude 'META-INF/kotlinx-serialization-runtime.kotlin_module'
+    )
-        exclude 'META-INF/kotlinx-serialization-cbor.kotlin_module'
-        exclude 'META-INF/kotlinx-serialization-properties.kotlin_module'
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
 }

gradle/templates/enableMPPAndroid.gradle

@@ -1,25 +1,31 @@
+apply from: "$defaultAndroidSettings"
+
 kotlin {
-    androidTarget {
+    android {
-        publishLibraryVariants(
+        project.ext.configureAndroidTarget(delegate)
-                "release",
+        withHostTest {}
-                "debug",
+        withDeviceTest {}
-        )
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
     }
 
     sourceSets {
-        androidUnitTest {
+        jvmAndAndroidMain {
+            dependsOn commonMain
+            kotlin.srcDir("src/jvmMain/kotlin")
+            resources.srcDir("src/jvmMain/resources")
+        }
+        jvmMain {
+            dependsOn jvmAndAndroidMain
+            kotlin.setSrcDirs([])
+            resources.setSrcDirs([])
+        }
+        androidHostTest {
             dependencies {
                 implementation kotlin('test-junit')
                 implementation libs.android.test.junit
                 implementation libs.android.espresso
             }
         }
-        androidInstrumentedTest {
+        androidDeviceTest {
             dependencies {
                 implementation kotlin('test-junit')
                 implementation libs.android.test.junit
@@ -27,8 +33,6 @@ kotlin {
             }
         }
 
-        androidMain.dependsOn jvmMain
+        androidMain.dependsOn jvmAndAndroidMain
     }
 }
-
-apply from: "$defaultAndroidSettings"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

koin/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
@@ -14,7 +14,7 @@ kotlin {
                 api libs.uuid
             }
         }
-        jvmMain {
+        jvmAndAndroidMain {
             dependencies {
                 api libs.kt.reflect
                 api project(":micro_utils.coroutines")

koin/generator/test/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     id "com.google.devtools.ksp"
 }
 

ksp/classcasts/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

ksp/classcasts/generator/test/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     id "com.google.devtools.ksp"
 }
 

ksp/sealed/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

ksp/sealed/generator/src/main/kotlin/Processor.kt

@@ -53,7 +53,7 @@ class Processor(
         val annotation = ksClassDeclaration.getGenerateSealedWorkaroundAnnotation
         val subClasses = ksClassDeclaration.resolveSubclasses(
             searchIn = resolver.getAllFiles(),
-            allowNonSealed = annotation ?.includeNonSealedSubTypes ?: false
+            allowNonSealed = withNoSuchElementWorkaround(null) { annotation ?.includeNonSealedSubTypes } ?: false
         ).distinct()
         val subClassesNames = subClasses.filter {
             when (it.classKind) {
@@ -165,15 +165,7 @@ class Processor(
     @OptIn(KspExperimental::class)
     override fun process(resolver: Resolver): List<KSAnnotated> {
         (resolver.getSymbolsWithAnnotation(GenerateSealedWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
-            val prefix = runCatching {
+            val prefix = withNoSuchElementWorkaround(null) { (it.getGenerateSealedWorkaroundAnnotation) ?.prefix } ?.takeIf {
-                (it.getGenerateSealedWorkaroundAnnotation) ?.prefix
-            }.getOrElse {
-                if (it is NoSuchElementException) {
-                    ""
-                } else {
-                    throw it
-                }
-            } ?.takeIf {
                 it.isNotEmpty()
             } ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
             it.writeFile(prefix = prefix, suffix = "SealedWorkaround") {

ksp/sealed/generator/test/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     id "com.google.devtools.ksp"
 }
 

ksp/variations/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

ksp/variations/generator/test/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     id "com.google.devtools.ksp"
 }
 

ktor/client/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

ktor/common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

language_codes/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

matrix/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

meta/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

meta/src/commonMain/kotlin/MetaContainerRootMapWarning.kt

@@ -11,7 +11,7 @@ package dev.inmo.micro_utils.meta
     RequiresOptIn.Level.WARNING
 )
 @Target(
-    AnnotationTarget.FIELD,
+    AnnotationTarget.PROPERTY,
 )
 @Retention(AnnotationRetention.BINARY)
 annotation class MetaContainerRootMapWarning

mime_types/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

pagination/common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

pagination/compose/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     alias(libs.plugins.jb.compose)
     alias(libs.plugins.kt.jb.compose)
 }

pagination/ktor/common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

repos/cache/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

repos/common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
@@ -17,7 +17,7 @@ kotlin {
             }
         }
 
-        jvmMain {
+        jvmAndAndroidMain {
             dependencies {
                 api internalProject("micro_utils.common")
             }

repos/common/tests/build.gradle

@@ -1,12 +1,14 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 project.version = "$version"
 project.group = "$group"
 
+apply from: "$defaultAndroidSettings"
+
 kotlin {
     jvm {
         compilations.main {
@@ -23,12 +25,8 @@ kotlin {
         browser()
         nodejs()
     }
-    androidTarget {
+    android {
-        compilations.all {
+        project.ext.configureAndroidTarget(delegate)
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
     }
     linuxX64()
     mingwX64()
@@ -51,6 +49,11 @@ kotlin {
                 implementation kotlin('test-junit')
             }
         }
+        androidMain {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
         jsMain {
             dependencies {
                 implementation kotlin('test-js')
@@ -61,13 +64,10 @@ kotlin {
         mingwX64Main.dependsOn nativeMain
         linuxArm64Main.dependsOn nativeMain
 
-        androidMain.dependsOn jvmMain
     }
 }
 
-apply from: "$defaultAndroidSettings"
-
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
-}
+}

repos/generator/test/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     id "com.google.devtools.ksp"
 }
 

repos/inmemory/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
@@ -20,4 +20,4 @@ kotlin {
             }
         }
     }
-}
+}

repos/ktor/client/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

repos/ktor/common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

resources/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

safe_wrapper/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

selector/common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

serialization/base64/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

serialization/encapsulator/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

serialization/mapper/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

serialization/typed_serializer/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

startup/template/client/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
     alias(libs.plugins.compose)
 }
 

startup/template/common/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

transactions/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
+    id "com.android.kotlin.multiplatform.library"
 }
 
 apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"