#535 kotlin 1.9.0, compose multiplatform 1.5.0 support

README.md

@@ -62,7 +62,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.23.0"
+        classpath "dev.icerock.moko:resources-generator:0.24.0"
     }
 }
 
@@ -80,18 +80,18 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.23.0")
-    commonMainApi("dev.icerock.moko:resources-compose:0.23.0") // for compose multiplatform
+    commonMainApi("dev.icerock.moko:resources:0.24.0")
+    commonMainApi("dev.icerock.moko:resources-compose:0.24.0") // for compose multiplatform
 
-    commonTestImplementation("dev.icerock.moko:resources-test:0.23.0")
+    commonTestImplementation("dev.icerock.moko:resources-test:0.24.0")
 }
 
 multiplatformResources {
-    multiplatformResourcesPackage = "org.example.library" // required
-    multiplatformResourcesClassName = "SharedRes" // optional, default MR
-    multiplatformResourcesVisibility = MRVisibility.Internal // optional, default Public
-    iosBaseLocalizationRegion = "en" // optional, default "en"
-    multiplatformResourcesSourceSet = "commonClientMain"  // optional, default "commonMain"
+    resourcesPackage.set("org.example.library") // required
+    resourcesClassName.set("SharedRes") // optional, default MR
+    resourcesVisibility.set(MRVisibility.Internal) // optional, default Public
+    iosBaseLocalizationRegion.set("en") // optional, default "en"
+    resourcesSourceSet.set("commonClientMain")  // optional, default "commonMain"
 }
 ```
 
@@ -102,11 +102,22 @@ should [add `export` declarations](https://kotlinlang.org/docs/multiplatform-bui
 
 ```
 framework {
-    export("dev.icerock.moko:resources:0.23.0")
+    export("dev.icerock.moko:resources:0.24.0")
     export("dev.icerock.moko:graphics:0.9.0") // toUIColor here
 }
 ```
 
+#### Multi-module Gradle projects
+
+If you have multiple gradle modules and resources stored not in module that compiles into framework for iOS, for example:
+```
+- shared
+-- resources
+-- feature-1
+-- feature-2
+```
+You should enable moko-resources gradle plugin in `resources` module, that contains resources, AND in `shared` module, that compiles into framework for iOS (same for jvm, JS, macos targets. Only android will works without this).
+
 ### Xcode setup
 
 In iOS/macOS Info.plist need to add localizations, to use localizations strings.
@@ -226,7 +237,7 @@ Details you can check in sample `samples/ios-static-xcframework`.
 
 ### Example 1 - simple localization string
 
-The first step is a create a file `strings.xml` in `commonMain/resources/MR/base` with the following
+The first step is a create a file `strings.xml` in `commonMain/moko-resources/base` with the following
 content:
 
 ```xml
@@ -237,8 +248,8 @@ content:
 ```
 
 Next - create a file `strings.xml` with localized strings
-in `commonMain/resource/MR/<languageCode>`. Here's an example of
-creating `commonMain/resource/MR/ru` for a Russian localization:
+in `commonMain/moko-resources/<languageCode>`. Here's an example of
+creating `commonMain/moko-resources/ru` for a Russian localization:
 
 ```xml
 <?xml version="1.0" encoding="UTF-8" ?>
@@ -332,7 +343,7 @@ Note: more info in issue [#126](https://github.com/icerockdev/moko-resources/iss
 
 ### Example 2 - formatted localization string
 
-In `commonMain/resources/MR/base/strings.xml` add:
+In `commonMain/moko-resources/base/strings.xml` add:
 
 ```xml
 <?xml version="1.0" encoding="UTF-8" ?>
@@ -377,7 +388,7 @@ different behaviour on different platforms. Stick to one style for each string.
 
 ### Example 3 - plural string
 
-The first step is to create a file `plurals.xml` in `commonMain/resources/MR/base` with the
+The first step is to create a file `plurals.xml` in `commonMain/moko-resources/base` with the
 following content:
 
 ```xml
@@ -418,7 +429,7 @@ let string = getMyPluralDesc(quantity: 10).localized()
 
 ### Example 4 - plural formatted string
 
-The first step is to create file `plurals.xml` in `commonMain/resources/MR/base` with the following
+The first step is to create file `plurals.xml` in `commonMain/moko-resources/base` with the following
 content:
 
 ```xml
@@ -513,7 +524,7 @@ StringDesc.localeType = StringDesc.LocaleType.System
 
 ### Example 7 - Shared Images
 
-Place images in the `commonMain/resources/MR/images` directory. Nested directories are also supported.
+Place images in the `commonMain/moko-resources/images` directory. Nested directories are also supported.
 
 #### png and jpg
 
@@ -526,7 +537,7 @@ Image names should end with one of:
 - `@3x` - android xxhdpi, ios 3x;
 - `@4x` - android xxxhdpi.
 
-If we add the following files to `commonMain/resources/MR/images`:
+If we add the following files to `commonMain/moko-resources/images`:
 
 - `[email protected]`
 - `[email protected]`
@@ -540,7 +551,7 @@ Then we get an autogenerated `MR.images.home_black_18` `ImageResource` in code.
 
 The Image generator also supports `svg` files.
 
-If we add the following file to `commonMain/resources/MR/images`:
+If we add the following file to `commonMain/moko-resources/images`:
 
 - `car_black.svg`
 
@@ -600,15 +611,15 @@ Image(resource: \.home_black_18)
 
 ### Example 8 - pass font
 
-Fonts resources directory is `commonMain/resources/MR/fonts`.  
+Fonts resources directory is `commonMain/moko-resources/fonts`.  
 Font name should be this pattern: `<fontFamily>-<fontStyle>` like:
 
 - `Raleway-Bold.ttf`
 - `Raleway-Regular.ttf`
 - `Raleway-Italic.ttf`
   Supports `ttf` and `otf` resources.
 
-If we add to `commonMain/resources/MR/fonts` files:
+If we add to `commonMain/moko-resources/fonts` files:
 
 - `Raleway-Bold.ttf`
 - `Raleway-Regular.ttf`
@@ -640,7 +651,7 @@ val font: Font = MR.fonts.Raleway.italic.asFont(
 
 ### Example 9 - pass colors
 
-Colors resources directory is `commonMain/resources/MR/colors`.  
+Colors resources directory is `commonMain/moko-resources/colors`.  
 Colors files is `xml` with format:
 
 ```xml
@@ -740,7 +751,7 @@ val color: Color = colorResource(MR.colors.valueColor)
 ### Example 10 - plain file resource access
 
 The first step is a create a resource file `test.txt` for example,
-in `commonMain/resources/MR/files`
+in `commonMain/moko-resources/files`
 After gradle sync we can get file by id `MR.files.test`
 Moko-resources has out of box implementation function for read text files from common
 code - `readText()`
@@ -770,7 +781,7 @@ val fileContent: String? by MR.files.test.readTextAsState()
 ### Example 11 - assets access
 
 Assets allow you save directories hierarchy (in files structure is plain). Locate files
-to `commonMain/resources/MR/assets` and access to it by `MR.assets.*`
+to `commonMain/moko-resources/assets` and access to it by `MR.assets.*`
 
 #### Compose Multiplatform
 

gradle.properties

@@ -13,5 +13,6 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true
 
 android.useAndroidX=true
+android.disableAutomaticComponentCreation=true
 
 mobile.multiplatform.iosTargetWarning=false

gradle/libs.versions.toml

@@ -1,22 +1,20 @@
 [versions]
-kotlinVersion = "1.8.20"
+kotlinVersion = "1.9.0"
 androidGradleVersion = "7.4.2"
 androidSdkCommonVersion = "31.0.0"
 
 # kotlinx
-kotlinxSerializationVersion = "1.5.0"
+kotlinxSerializationVersion = "1.5.1"
 kotlinxCoroutinesVersion = "1.6.4"
 
 # android
-constraintLayoutVersion = "2.1.4"
 androidAppCompatVersion = "1.6.1"
 
 # android compose
-composeVersion = "1.4.2"
-composeActivityVersion = "1.7.1"
+composeUiVersion = "1.5.1"
 
 # jetbrains compose
-composeJetbrainsVersion = "1.4.0"
+composeJetbrainsVersion = "1.5.0"
 
 # jvm
 apacheCommonsTextVersion = "1.10.0"
@@ -26,25 +24,16 @@ icu4jVersion = "73.1"
 commonsCodecVersion = "1.15"
 batikVersion = "1.16"
 
-# tests
-espressoCoreVersion = "3.5.1"
-testRunnerVersion = "1.5.2"
-testRulesVersion = "1.5.0"
-testExtJunitVersion = "1.1.5"
-testCoreVersion = "1.5.0"
-robolectricVersion = "4.8.1"
-
 # moko
 mokoGraphicsVersion = "0.9.0"
-mokoParcelizeVersion = "0.8.0"
+mokoParcelizeVersion = "0.9.0"
 mokoTestVersion = "0.6.1"
 mokoMultiplatformPluginVersion = "0.14.2"
 
 [libraries]
 # kotlinx
 kotlinxSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationVersion" }
 kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesVersion" }
-coroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesVersion" }
 
 # moko
 mokoParcelize = { module = "dev.icerock.moko:parcelize", version.ref = "mokoParcelizeVersion" }
@@ -53,19 +42,9 @@ mokoTestCore = { module = "dev.icerock.moko:test-core", version.ref = "mokoTestV
 
 # android
 appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
-constraintLayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintLayoutVersion" }
 
 # android compose
-composeUi = { module = "androidx.compose.ui:ui", version.ref = "composeVersion" }
-composeUiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "composeVersion" }
-composeUiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "composeVersion" }
-composeRuntime = { module = "androidx.compose.runtime:runtime", version.ref = "composeVersion" }
-composeMaterial = { module = "androidx.compose.material:material", version.ref = "composeVersion" }
-composeFoundation = { module = "androidx.compose.foundation:foundation", version.ref = "composeVersion" }
-composeActivity = { module = "androidx.activity:activity-compose", version.ref = "composeActivityVersion" }
-
-# jetbrains compose
-composeGradlePlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "composeJetbrainsVersion" }
+composeUi = { module = "androidx.compose.ui:ui", version.ref = "composeUiVersion" }
 
 # jvm
 kotlinPoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinPoetVersion" }
@@ -75,17 +54,6 @@ batikTranscoder = { module = "org.apache.xmlgraphics:batik-transcoder", version.
 commonsCodec = { module = "commons-codec:commons-codec", version.ref = "commonsCodecVersion" }
 icu4j = { module = "com.ibm.icu:icu4j", version.ref = "icu4jVersion" }
 
-# tests
-espressoCore = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCoreVersion" }
-kotlinTestJUnit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinVersion" }
-testCore = { module = "androidx.test:core", version.ref = "testCoreVersion" }
-robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectricVersion" }
-testRunner = { module = "androidx.test:runner", version.ref = "testRunnerVersion" }
-testRules = { module = "androidx.test:rules", version.ref = "testRulesVersion" }
-testExtJunit = { module = "androidx.test.ext:junit", version.ref = "testExtJunitVersion" }
-kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlinVersion" }
-kotlinTestAnnotations = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlinVersion" }
-
 # gradle
 kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
 androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradleVersion" }

gradle/moko.versions.toml

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +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.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists