From 9381e7d057358485347dd185cf6581d38b61fe98 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 28 Aug 2026 22:12:57 +0600 Subject: [PATCH] migrate build toolchain --- gradle.properties | 4 ++-- gradle/libs.versions.toml | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../kotlin/MetaContainerRootMapWarning.kt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4b8e3979cf6..86ed43f5269 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ 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 +android.builtInKotlin=false +android.newDsl=false org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g ## https://github.com/google/ksp/issues/2491 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ab61d4e4d04..2000c3b62fd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kt = "2.3.21" +kt = "2.4.10" kt-serialization = "1.11.0" kt-coroutines = "1.11.0" @@ -8,7 +8,7 @@ kotlinx-browser = "0.5.0" 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.5.0" @@ -30,10 +30,10 @@ okio = "3.18.1" ksp = "2.3.11" kotlin-poet = "2.3.0" -versions = "0.54.0" +versions = "0.61.0" nmcp = "1.6.1" -android-gradle = "8.12.+" +android-gradle = "9.1.1" dexcount = "4.0.0" android-coreKtx = "1.19.0" @@ -44,8 +44,8 @@ android-espresso = "3.7.0" android-test = "1.3.0" android-props-minSdk = "21" -android-props-compileSdk = "36" -android-props-buildTools = "36.0.0" +android-props-compileSdk = "37" +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" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5dc98dbcf36..2f2958b923a 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-9.3.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/meta/src/commonMain/kotlin/MetaContainerRootMapWarning.kt b/meta/src/commonMain/kotlin/MetaContainerRootMapWarning.kt index 750cc0d8e8c..4bfa951e6c2 100644 --- a/meta/src/commonMain/kotlin/MetaContainerRootMapWarning.kt +++ b/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