From 26c8c1cb13244a9a9b9900f4f0869e9555a4f383 Mon Sep 17 00:00:00 2001 From: Roman Makeev Date: Sat, 31 Jan 2026 14:05:00 +0300 Subject: [PATCH] update agp9 --- build.gradle.kts | 17 +++-------------- gradle.properties | 2 +- gradle/libs.versions.toml | 13 +++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- kstorage/build.gradle.kts | 14 +++++--------- 5 files changed, 17 insertions(+), 31 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a2a030a..690022a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,28 +6,17 @@ plugins { alias(libs.plugins.klibs.gradle.detekt.compose) apply false alias(libs.plugins.klibs.gradle.dokka.root) apply false alias(libs.plugins.klibs.gradle.dokka.module) apply false - alias(libs.plugins.klibs.gradle.java.core) apply false + alias(libs.plugins.klibs.gradle.java.version) apply false alias(libs.plugins.klibs.gradle.publication) apply false alias(libs.plugins.klibs.gradle.rootinfo) apply false // klibs - android - alias(libs.plugins.klibs.gradle.android.core) apply false + alias(libs.plugins.klibs.gradle.android.sdk) apply false alias(libs.plugins.klibs.gradle.android.compose) apply false alias(libs.plugins.klibs.gradle.android.apk.sign) apply false alias(libs.plugins.klibs.gradle.android.apk.name) apply false + alias(libs.plugins.klibs.gradle.android.namespace) apply false } apply(plugin = "ru.astrainteractive.gradleplugin.dokka.root") apply(plugin = "ru.astrainteractive.gradleplugin.detekt") apply(plugin = "ru.astrainteractive.gradleplugin.root.info") - -subprojects.forEach { subProject -> - subProject.apply(plugin = "ru.astrainteractive.gradleplugin.root.info") - subProject.apply(plugin = "ru.astrainteractive.gradleplugin.dokka.module") - subProject.apply(plugin = "ru.astrainteractive.gradleplugin.publication") - subProject.plugins.withId("org.jetbrains.kotlin.jvm") { - subProject.apply(plugin = "ru.astrainteractive.gradleplugin.java.core") - } - subProject.plugins.withId("com.android.library") { - subProject.apply(plugin = "ru.astrainteractive.gradleplugin.android.core") - } -} diff --git a/gradle.properties b/gradle.properties index cbbc35a..4a53db7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ makeevrserg.java.ktarget=17 # Project makeevrserg.project.name=KStorage makeevrserg.project.group=ru.astrainteractive.klibs -makeevrserg.project.version.string=4.4.2 +makeevrserg.project.version.string=4.5.0 makeevrserg.project.description=Kotlin wrapper for key-value storage libraries makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com makeevrserg.project.url=https://github.com/makeevrserg/klibs.kstorage/ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f56aaaf..23bb4c2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -gradle-android = "8.13.1" -klibs-gradleplugin = "1.11.4" +gradle-android = "9.0.0" +klibs-gradleplugin = "1.14.0" kotlin-coroutines-core = "1.10.2" -kotlin-version = "2.2.21" +kotlin-version = "2.3.0" settings = "1.3.0" [libraries] @@ -13,16 +13,17 @@ settings-coroutines = { module = "com.russhwolf:multiplatform-settings-coroutine settings-observable = { module = "com.russhwolf:multiplatform-settings-make-observable", version.ref = "settings" } [plugins] -gradle-android = { id = "com.android.library", version.ref = "gradle-android" } +gradle-android = { id = "com.android.kotlin.multiplatform.library", version.ref = "gradle-android" } klibs-gradle-android-apk-name = { id = "ru.astrainteractive.gradleplugin.android.apk.name", version.ref = "klibs-gradleplugin" } klibs-gradle-android-apk-sign = { id = "ru.astrainteractive.gradleplugin.android.apk.sign", version.ref = "klibs-gradleplugin" } +klibs-gradle-android-namespace = { id = "ru.astrainteractive.gradleplugin.android.namespace", version.ref = "klibs-gradleplugin" } klibs-gradle-android-compose = { id = "ru.astrainteractive.gradleplugin.android.compose", version.ref = "klibs-gradleplugin" } -klibs-gradle-android-core = { id = "ru.astrainteractive.gradleplugin.android.core", version.ref = "klibs-gradleplugin" } +klibs-gradle-android-sdk = { id = "ru.astrainteractive.gradleplugin.android.sdk", version.ref = "klibs-gradleplugin" } klibs-gradle-detekt = { id = "ru.astrainteractive.gradleplugin.detekt", version.ref = "klibs-gradleplugin" } klibs-gradle-detekt-compose = { id = "ru.astrainteractive.gradleplugin.detekt.compose", version.ref = "klibs-gradleplugin" } klibs-gradle-dokka-module = { id = "ru.astrainteractive.gradleplugin.dokka.module", version.ref = "klibs-gradleplugin" } klibs-gradle-dokka-root = { id = "ru.astrainteractive.gradleplugin.dokka.root", version.ref = "klibs-gradleplugin" } -klibs-gradle-java-core = { id = "ru.astrainteractive.gradleplugin.java.core", version.ref = "klibs-gradleplugin" } +klibs-gradle-java-version = { id = "ru.astrainteractive.gradleplugin.java.version", version.ref = "klibs-gradleplugin" } klibs-gradle-publication = { id = "ru.astrainteractive.gradleplugin.publication", version.ref = "klibs-gradleplugin" } klibs-gradle-rootinfo = { id = "ru.astrainteractive.gradleplugin.root.info", version.ref = "klibs-gradleplugin" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f407850..7b0b78c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/kstorage/build.gradle.kts b/kstorage/build.gradle.kts index 599266f..d6ee088 100644 --- a/kstorage/build.gradle.kts +++ b/kstorage/build.gradle.kts @@ -1,15 +1,15 @@ @file:Suppress("UnusedPrivateMember") -import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo - - plugins { kotlin("multiplatform") - id("com.android.library") + id("com.android.kotlin.multiplatform.library") + id("ru.astrainteractive.gradleplugin.android.sdk") + id("ru.astrainteractive.gradleplugin.publication") + id("ru.astrainteractive.gradleplugin.android.namespace") } kotlin { jvm() - androidTarget() + androidLibrary {} js(IR) { browser() nodejs() @@ -63,7 +63,3 @@ kotlin { } } } - -android { - namespace = "${requireProjectInfo.group}.kstorage" -}