From 2bdd8a04883d462c6fc74781587b4e117d1b63e3 Mon Sep 17 00:00:00 2001 From: Konstantin Kolchurin Date: Mon, 31 Jul 2023 19:42:37 +0700 Subject: [PATCH] #530 update samples --- .../MR => moko-resources}/base/strings.xml | 0 .../MR => moko-resources}/base/strings.xml | 0 samples/compose-jvm-app/build.gradle.kts | 4 ++-- .../MR => moko-resources}/base/strings.xml | 0 .../compose-resources-gallery/.run/iosApp.run.xml | 2 +- samples/compose-resources-gallery/gradle.properties | 4 ++-- .../shared/src/commonMain/kotlin/App.kt | 1 - .../MR => moko-resources}/assets/some_asset.txt | 0 .../MR => moko-resources}/base/plurals.xml | 0 .../MR => moko-resources}/base/strings.xml | 0 .../MR => moko-resources}/colors/colors.xml | 0 .../MR => moko-resources}/files/some_file.txt | 0 .../fonts/cormorant-italic.otf | Bin .../MR => moko-resources}/images/car_black.svg | 0 .../MR => moko-resources}/images/moko_logo@1x.png | Bin .../MR => moko-resources}/images/moko_logo@2x.png | Bin .../MR => moko-resources}/images/moko_logo@3x.png | Bin .../{resources/MR => moko-resources}/ru/plurals.xml | 0 .../{resources/MR => moko-resources}/ru/strings.xml | 0 samples/ios-static-xcframework/build.gradle.kts | 2 +- .../MR => moko-resources}/base/strings.xml | 0 samples/kotlin-ios-app/build.gradle.kts | 2 +- samples/resources-gallery/build.gradle.kts | 4 ++-- .../mpp-library/test-utils/build.gradle.kts | 8 ++++---- 24 files changed, 13 insertions(+), 14 deletions(-) rename samples/android-mpp-app/app/src/commonMain/{resources/MR => moko-resources}/base/strings.xml (100%) rename samples/auto-manifest/mpp-library/src/commonMain/{resources/MR => moko-resources}/base/strings.xml (100%) rename samples/compose-jvm-app/common/src/commonMain/{resources/MR => moko-resources}/base/strings.xml (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/assets/some_asset.txt (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/base/plurals.xml (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/base/strings.xml (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/colors/colors.xml (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/files/some_file.txt (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/fonts/cormorant-italic.otf (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/images/car_black.svg (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/images/moko_logo@1x.png (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/images/moko_logo@2x.png (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/images/moko_logo@3x.png (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/ru/plurals.xml (100%) rename samples/compose-resources-gallery/shared/src/commonMain/{resources/MR => moko-resources}/ru/strings.xml (100%) rename samples/ios-static-xcframework/mpp-library/src/commonMain/{resources/MR => moko-resources}/base/strings.xml (100%) diff --git a/samples/android-mpp-app/app/src/commonMain/resources/MR/base/strings.xml b/samples/android-mpp-app/app/src/commonMain/moko-resources/base/strings.xml similarity index 100% rename from samples/android-mpp-app/app/src/commonMain/resources/MR/base/strings.xml rename to samples/android-mpp-app/app/src/commonMain/moko-resources/base/strings.xml diff --git a/samples/auto-manifest/mpp-library/src/commonMain/resources/MR/base/strings.xml b/samples/auto-manifest/mpp-library/src/commonMain/moko-resources/base/strings.xml similarity index 100% rename from samples/auto-manifest/mpp-library/src/commonMain/resources/MR/base/strings.xml rename to samples/auto-manifest/mpp-library/src/commonMain/moko-resources/base/strings.xml diff --git a/samples/compose-jvm-app/build.gradle.kts b/samples/compose-jvm-app/build.gradle.kts index ef52564f..c0e56a29 100644 --- a/samples/compose-jvm-app/build.gradle.kts +++ b/samples/compose-jvm-app/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath(moko.resourcesGradlePlugin) - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10") - classpath("org.jetbrains.compose:compose-gradle-plugin:1.4.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.4.3") } } diff --git a/samples/compose-jvm-app/common/src/commonMain/resources/MR/base/strings.xml b/samples/compose-jvm-app/common/src/commonMain/moko-resources/base/strings.xml similarity index 100% rename from samples/compose-jvm-app/common/src/commonMain/resources/MR/base/strings.xml rename to samples/compose-jvm-app/common/src/commonMain/moko-resources/base/strings.xml diff --git a/samples/compose-resources-gallery/.run/iosApp.run.xml b/samples/compose-resources-gallery/.run/iosApp.run.xml index a4c331d0..778f6afe 100644 --- a/samples/compose-resources-gallery/.run/iosApp.run.xml +++ b/samples/compose-resources-gallery/.run/iosApp.run.xml @@ -1,5 +1,5 @@ - + diff --git a/samples/compose-resources-gallery/gradle.properties b/samples/compose-resources-gallery/gradle.properties index 227dfebe..fc559bd7 100644 --- a/samples/compose-resources-gallery/gradle.properties +++ b/samples/compose-resources-gallery/gradle.properties @@ -14,6 +14,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.mpp.androidGradlePluginCompatibility.nowarn=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental -kotlin.version=1.8.20 +kotlin.version=1.8.21 agp.version=8.0.1 -compose.version=1.4.0 +compose.version=1.4.3 diff --git a/samples/compose-resources-gallery/shared/src/commonMain/kotlin/App.kt b/samples/compose-resources-gallery/shared/src/commonMain/kotlin/App.kt index 0f9591b6..8609d737 100644 --- a/samples/compose-resources-gallery/shared/src/commonMain/kotlin/App.kt +++ b/samples/compose-resources-gallery/shared/src/commonMain/kotlin/App.kt @@ -6,7 +6,6 @@ import androidx.compose.material.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.unit.dp import com.icerockdev.library.MR diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/assets/some_asset.txt b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/assets/some_asset.txt similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/assets/some_asset.txt rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/assets/some_asset.txt diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/base/plurals.xml b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/base/plurals.xml similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/base/plurals.xml rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/base/plurals.xml diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/base/strings.xml b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/base/strings.xml similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/base/strings.xml rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/base/strings.xml diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/colors/colors.xml b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/colors/colors.xml similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/colors/colors.xml rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/colors/colors.xml diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/files/some_file.txt b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/files/some_file.txt similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/files/some_file.txt rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/files/some_file.txt diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/fonts/cormorant-italic.otf b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/fonts/cormorant-italic.otf similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/fonts/cormorant-italic.otf rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/fonts/cormorant-italic.otf diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/images/car_black.svg b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/images/car_black.svg similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/images/car_black.svg rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/images/car_black.svg diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/images/moko_logo@1x.png b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/images/moko_logo@1x.png similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/images/moko_logo@1x.png rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/images/moko_logo@1x.png diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/images/moko_logo@2x.png b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/images/moko_logo@2x.png similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/images/moko_logo@2x.png rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/images/moko_logo@2x.png diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/images/moko_logo@3x.png b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/images/moko_logo@3x.png similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/images/moko_logo@3x.png rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/images/moko_logo@3x.png diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/ru/plurals.xml b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/ru/plurals.xml similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/ru/plurals.xml rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/ru/plurals.xml diff --git a/samples/compose-resources-gallery/shared/src/commonMain/resources/MR/ru/strings.xml b/samples/compose-resources-gallery/shared/src/commonMain/moko-resources/ru/strings.xml similarity index 100% rename from samples/compose-resources-gallery/shared/src/commonMain/resources/MR/ru/strings.xml rename to samples/compose-resources-gallery/shared/src/commonMain/moko-resources/ru/strings.xml diff --git a/samples/ios-static-xcframework/build.gradle.kts b/samples/ios-static-xcframework/build.gradle.kts index 77d5c8bb..e7d4a781 100644 --- a/samples/ios-static-xcframework/build.gradle.kts +++ b/samples/ios-static-xcframework/build.gradle.kts @@ -11,6 +11,6 @@ buildscript { } dependencies { classpath(moko.resourcesGradlePlugin) - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21") } } diff --git a/samples/ios-static-xcframework/mpp-library/src/commonMain/resources/MR/base/strings.xml b/samples/ios-static-xcframework/mpp-library/src/commonMain/moko-resources/base/strings.xml similarity index 100% rename from samples/ios-static-xcframework/mpp-library/src/commonMain/resources/MR/base/strings.xml rename to samples/ios-static-xcframework/mpp-library/src/commonMain/moko-resources/base/strings.xml diff --git a/samples/kotlin-ios-app/build.gradle.kts b/samples/kotlin-ios-app/build.gradle.kts index 77d5c8bb..e7d4a781 100644 --- a/samples/kotlin-ios-app/build.gradle.kts +++ b/samples/kotlin-ios-app/build.gradle.kts @@ -11,6 +11,6 @@ buildscript { } dependencies { classpath(moko.resourcesGradlePlugin) - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21") } } diff --git a/samples/resources-gallery/build.gradle.kts b/samples/resources-gallery/build.gradle.kts index ce7afffe..dfaaa02e 100644 --- a/samples/resources-gallery/build.gradle.kts +++ b/samples/resources-gallery/build.gradle.kts @@ -13,9 +13,9 @@ buildscript { } dependencies { classpath(moko.resourcesGradlePlugin) - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21") classpath("com.android.tools.build:gradle:7.4.2") - classpath("org.jetbrains.compose:compose-gradle-plugin:1.4.0") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.4.3") } } diff --git a/samples/resources-gallery/mpp-library/test-utils/build.gradle.kts b/samples/resources-gallery/mpp-library/test-utils/build.gradle.kts index 281d4e1c..1dbab27e 100644 --- a/samples/resources-gallery/mpp-library/test-utils/build.gradle.kts +++ b/samples/resources-gallery/mpp-library/test-utils/build.gradle.kts @@ -18,8 +18,8 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - api("org.jetbrains.kotlin:kotlin-test:1.8.10") - api("org.jetbrains.kotlin:kotlin-test-annotations-common:1.8.10") + api("org.jetbrains.kotlin:kotlin-test:1.8.21") + api("org.jetbrains.kotlin:kotlin-test-annotations-common:1.8.21") api("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4") api(moko.resourcesTest) } @@ -27,13 +27,13 @@ kotlin { val jvmMain by getting { dependencies { - api("org.jetbrains.kotlin:kotlin-test-junit:1.8.10") + api("org.jetbrains.kotlin:kotlin-test-junit:1.8.21") } } val androidMain by getting { dependencies { - api("org.jetbrains.kotlin:kotlin-test-junit:1.8.10") + api("org.jetbrains.kotlin:kotlin-test-junit:1.8.21") api("androidx.test:core:1.5.0") api("org.robolectric:robolectric:4.10.3") api("junit:junit:4.13.2")