Merge branch 'mokores'

# Conflicts: # gradle/libs.versions.toml
softartdev · Feb 7, 2024 · abb7f99 · abb7f99
2 parents b39369f + 17705fc
commit abb7f99
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ decompose = "2.2.1-compose-experimental"
 koin = "3.5.0"
 kotlinx-datetime = "0.5.0"
 napier = "2.7.1"
-mokoResources = "0.23.0"
+mokoResources = "0.24.0-alpha-3"
 materialThemePrefs = "0.6.3"
 androidxActivityCompose = "1.8.2"
 androidxComposeTest = "1.5.4"

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -55,7 +55,7 @@ android {
     namespace = "com.softartdev.notedelight.shared"
 }
 multiplatformResources {
-    multiplatformResourcesPackage = "com.softartdev.notedelight"
+    resourcesPackage.set("com.softartdev.notedelight")
 }
 kotlin {
     jvmToolchain(libs.versions.jdk.get().toInt())

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/...nMain/resources/MR/images/[email protected] → ...ain/moko-resources/images/[email protected] b/...nMain/resources/MR/images/[email protected] → ...ain/moko-resources/images/[email protected]
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