Merge pull request #862 from icerockdev/develop

Release 0.26.0

Author: Alex009

README.md

@@ -45,11 +45,11 @@ implement all your UI in Kotlin with Jetpack Compose and MOKO resources.
 
 ## Requirements
 
-- Gradle version 7.5+
-- Kotlin 1.9.20+
-- Android Gradle Plugin 7.4.2+
+- Gradle version 8.4+
+- Kotlin 2.1.0+
+- Android Gradle Plugin 8.3.0+
 - Android API 16+
-- iOS version 11.0+
+- iOS version 12.0+
 - Compose Multiplatform 1.6.0+
 
 ## Installation

gradle.properties

@@ -5,7 +5,6 @@ org.gradle.caching=true
 kotlin.code.style=official
 
 kotlin.mpp.stability.nowarn=true
-kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.applyDefaultHierarchyTemplate=false
 kotlin.mpp.enableCInteropCommonization=true

gradle/libs.versions.toml

@@ -1,11 +1,23 @@
 [versions]
-kotlinVersion = "1.9.25"
-androidGradleVersion = "8.1.4"
-androidSdkCommonVersion = "31.1.2"
+# --- Runtime versions ---
+# Minimum compatibility baseline for library modules (resources, compose, etc.).
+# Allows users to use moko-resources WITHOUT forcing them to update their projects.
+kotlinVersion = "2.1.0"
+androidGradleVersion = "8.3.0"
+androidSdkCommonVersion = "31.13.2"
+
+# --- Plugin versions (Tooling only) ---
+# Used EXCLUSIVELY in the generator plugin module via 'compileOnly'.
+# We use current APIs (available in 8.13.2+) to ensure compatibility with
+# the widest range of AGP versions: from the minimum (8.3)
+# to the current (9.0+ at this time).
+pluginKotlinVersion = "2.3.0"
+pluginAndroidGradleVersion = "8.13.2"
+
 
 # kotlinx
 kotlinxSerializationVersion = "1.6.1"
-kotlinxCoroutinesVersion = "1.8.0"
+kotlinxCoroutinesVersion = "1.9.0"
 kotlinxBrowserVersion = "0.3"
 
 # android
@@ -55,11 +67,18 @@ commonsCodec = { module = "commons-codec:commons-codec", version.ref = "commonsC
 icu4j = { module = "com.ibm.icu:icu4j", version.ref = "icu4jVersion" }
 
 # gradle
+pluginKotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "pluginKotlinVersion" }
+pluginAndroidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "pluginAndroidGradleVersion" }
+pluginKotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "pluginKotlinVersion" }
+pluginAndroidMultiplatformLibraryPlugin = { module = "com.android.kotlin.multiplatform.library: com.android.kotlin.multiplatform.library.gradle.plugin", version.ref = "pluginAndroidGradleVersion" }
+
 kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
 androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradleVersion" }
 androidSdkCommon = { module = "com.android.tools:sdk-common", version.ref = "androidSdkCommonVersion" }
-kotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlinVersion" }
 detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektVersion" }
 mokoMultiplatformPlugin = { module = "dev.icerock:mobile-multiplatform", version.ref = "mokoMultiplatformPluginVersion" }
 composeJetBrainsPlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "composeJetbrainsVersion" }
 nexusPublishing = { module = "io.github.gradle-nexus:publish-plugin", version = "2.0.0" }
+
+[plugins]
+composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinVersion" }

gradle/moko.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-resourcesVersion = "0.25.2"
+resourcesVersion = "0.26.0"
 
 [libraries]
 resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #Tue Jul 25 10:40:31 NOVT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists