Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
42a71a4
not working
Lobynya Sep 29, 2025
d008885
Merge remote-tracking branch 'refs/remotes/origin/develop' into g
Lobynya Oct 10, 2025
aab9cff
MOKO-1958 add KotlinMultiplatformAndroidLibraryTarget
Lobynya Oct 15, 2025
e0fdf49
Merge remote-tracking branch 'lob/task/MOKO-1958-new-android-library'…
ExNDY Dec 4, 2025
5fcc7b3
#843 added gradle and agp 9+ sample
ExNDY Dec 4, 2025
82fb9b6
#843 android tasks configuration moved to apply plugin, android plugi…
ExNDY Dec 4, 2025
4189b99
#843 platform type utils moved to file, fix AndroidLibraryType
ExNDY Dec 4, 2025
5b9d80f
#843 refactored setup android tasks, added check on agp version, corr…
ExNDY Dec 5, 2025
7a4f61a
#843 updated getAndroidRClassPackage
ExNDY Dec 5, 2025
0ac795f
#843 added enable android resources on apply plugin
ExNDY Dec 6, 2025
64fc5d2
#843 fix sample package name
ExNDY Dec 6, 2025
fbc3306
#843 added ExperimentalWasmDsl annotation, replaced deprecated varia…
ExNDY Dec 6, 2025
27742ec
#843 update sample package name
ExNDY Dec 6, 2025
82399e4
#843 removed link with generated tasks
ExNDY Dec 8, 2025
c3d4f04
#843 hack of androidSourceSet implemented only for legacy plugin
ExNDY Dec 8, 2025
b1e0378
#843 update generated source directory for new plugin, added kdoc
ExNDY Dec 8, 2025
4ff2349
#843 reformat
ExNDY Dec 8, 2025
243a3b9
#843 rollback android-mpp sample
ExNDY Dec 8, 2025
8c8c6a7
#843 fix enable resources, plugin version in sample
ExNDY Dec 8, 2025
862cd69
#843 fix project field
ExNDY Dec 9, 2025
adebb91
#843 setup sourceSets replaced on check target type
ExNDY Dec 10, 2025
0329aa6
#843 fixed android artefact publication
ExNDY Dec 26, 2025
1ce7540
#843 separate android functions
ExNDY Dec 26, 2025
afee517
#843 update samples
ExNDY Dec 26, 2025
c25fbd6
#843 new minimal versions, updated kdoc, kotlin 2.0 settings
ExNDY Dec 28, 2025
63da2cf
#843 fix linter
ExNDY Dec 28, 2025
c118816
#843 update samples to kotlin 2.x
ExNDY Dec 28, 2025
88a4a11
#843 update samples to kotlin 2.1+
ExNDY Dec 28, 2025
38a7a07
#843 update and fix samples
ExNDY Dec 29, 2025
5f7ce93
#843 fix kotlin-ios-sample, libs name
ExNDY Dec 29, 2025
1de578c
#843 fix ios version
ExNDY Dec 29, 2025
068b3ce
#843 fix deprecated code, plugin names
ExNDY Dec 29, 2025
d693ae2
#843 added todo, try update coroutines
ExNDY Dec 29, 2025
7ec3977
#843 remove todo from comment
ExNDY Dec 29, 2025
5ef58e6
#843 update yarn.lock
ExNDY Dec 29, 2025
e8f2b6e
#843 removed comment
ExNDY Jan 12, 2026
daa19ee
#843 added doc for different kotlin and agp versions in toml
ExNDY Feb 2, 2026
6d532aa
#843 removed useless libs
ExNDY Feb 2, 2026
ee582e0
#843 replaced not found on error, rollback null in Rpackage
ExNDY Feb 2, 2026
7540439
#843 removed agp 7.x compitability, updated kdoc
ExNDY Feb 2, 2026
3a669d1
#843 updated min version
ExNDY Feb 2, 2026
e330d16
#843 fix readme
ExNDY Feb 2, 2026
e5970d7
#843 reformat
ExNDY Feb 2, 2026
a4d6586
#843 fix minsdk in sample
Alex009 Feb 3, 2026
972265e
Merge pull request #858 from ExNDY/#843-jetbrains-android-multipaltform
Alex009 Feb 3, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 24 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion gradle/moko.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
resourcesVersion = "0.25.2"
resourcesVersion = "0.26.0"

[libraries]
resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Loading
Loading