icerockdev#530 update samples

ExNDY · Jul 31, 2023 · 2bdd8a0 · 2bdd8a0
1 parent d2407b7
commit 2bdd8a0
Show file tree

Hide file tree

Showing 24 changed files with 13 additions and 14 deletions.
diff --git a/.../commonMain/resources/MR/base/strings.xml → ...ommonMain/moko-resources/base/strings.xml b/.../commonMain/resources/MR/base/strings.xml → ...ommonMain/moko-resources/base/strings.xml
diff --git a/.../commonMain/resources/MR/base/strings.xml → ...ommonMain/moko-resources/base/strings.xml b/.../commonMain/resources/MR/base/strings.xml → ...ommonMain/moko-resources/base/strings.xml
diff --git 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/.../commonMain/resources/MR/base/strings.xml → ...ommonMain/moko-resources/base/strings.xml b/.../commonMain/resources/MR/base/strings.xml → ...ommonMain/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
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
- <configuration default="false" name="iosApp" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" EXEC_TARGET_ID="1D19AA25-FF22-481F-819D-A4ACC03E869F" XCODE_PROJECT="$PROJECT_DIR$/./iosApp/iosApp.xcworkspace" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
+ <configuration default="false" name="iosApp" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" EXEC_TARGET_ID="AFF90CBC-9CF8-4E9B-AC30-C1052F49F0BE" XCODE_PROJECT="$PROJECT_DIR$/./iosApp/iosApp.xcworkspace" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
  <method v="2">
  <option name="com.jetbrains.kmm.ios.BuildIOSAppTask" enabled="true" />
  </method>

diff --git 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
@@ -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/...onMain/resources/MR/assets/some_asset.txt → ...Main/moko-resources/assets/some_asset.txt b/...onMain/resources/MR/assets/some_asset.txt → ...Main/moko-resources/assets/some_asset.txt
diff --git a/.../commonMain/resources/MR/base/plurals.xml → ...ommonMain/moko-resources/base/plurals.xml b/.../commonMain/resources/MR/base/plurals.xml → ...ommonMain/moko-resources/base/plurals.xml
diff --git a/.../commonMain/resources/MR/base/strings.xml → ...ommonMain/moko-resources/base/strings.xml b/.../commonMain/resources/MR/base/strings.xml → ...ommonMain/moko-resources/base/strings.xml
diff --git a/...commonMain/resources/MR/colors/colors.xml → ...mmonMain/moko-resources/colors/colors.xml b/...commonMain/resources/MR/colors/colors.xml → ...mmonMain/moko-resources/colors/colors.xml
diff --git a/...mmonMain/resources/MR/files/some_file.txt → ...onMain/moko-resources/files/some_file.txt b/...mmonMain/resources/MR/files/some_file.txt → ...onMain/moko-resources/files/some_file.txt
diff --git a/...n/resources/MR/fonts/cormorant-italic.otf → ...moko-resources/fonts/cormorant-italic.otf b/...n/resources/MR/fonts/cormorant-italic.otf → ...moko-resources/fonts/cormorant-italic.otf
diff --git a/...monMain/resources/MR/images/car_black.svg → ...nMain/moko-resources/images/car_black.svg b/...monMain/resources/MR/images/car_black.svg → ...nMain/moko-resources/images/car_black.svg
diff --git a/...Main/resources/MR/images/[email protected] → ...in/moko-resources/images/[email protected] b/...Main/resources/MR/images/[email protected] → ...in/moko-resources/images/[email protected]
diff --git a/...Main/resources/MR/images/[email protected] → ...in/moko-resources/images/[email protected] b/...Main/resources/MR/images/[email protected] → ...in/moko-resources/images/[email protected]
diff --git a/...Main/resources/MR/images/[email protected] → ...in/moko-resources/images/[email protected] b/...Main/resources/MR/images/[email protected] → ...in/moko-resources/images/[email protected]
diff --git a/...rc/commonMain/resources/MR/ru/plurals.xml → .../commonMain/moko-resources/ru/plurals.xml b/...rc/commonMain/resources/MR/ru/plurals.xml → .../commonMain/moko-resources/ru/plurals.xml
diff --git a/...rc/commonMain/resources/MR/ru/strings.xml → .../commonMain/moko-resources/ru/strings.xml b/...rc/commonMain/resources/MR/ru/strings.xml → .../commonMain/moko-resources/ru/strings.xml
diff --git 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/.../commonMain/resources/MR/base/strings.xml → ...ommonMain/moko-resources/base/strings.xml b/.../commonMain/resources/MR/base/strings.xml → ...ommonMain/moko-resources/base/strings.xml
diff --git 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
@@ -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
@@ -18,22 +18,22 @@ 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)
  }
  }
 
  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")