diff --git a/features/category/build.gradle.kts b/features/category/build.gradle.kts index b6f6f3522..13921347d 100644 --- a/features/category/build.gradle.kts +++ b/features/category/build.gradle.kts @@ -32,6 +32,7 @@ kotlin { implementation(libs.kotlinx.collections.immutable) implementation(libs.moko.resources.compose) implementation(libs.moko.mvvm.compose) + implementation(libs.moko.parcelize) } commonTestDependencies { diff --git a/features/home/build.gradle.kts b/features/home/build.gradle.kts index c4edad153..1be0bc8f8 100644 --- a/features/home/build.gradle.kts +++ b/features/home/build.gradle.kts @@ -31,15 +31,6 @@ kotlin { implementation(libs.moko.mvvm.compose) } - // Explicit dependency due to Moko issues with Kotlin 1.9.0 - // https://github.com/icerockdev/moko-resources/issues/531 - sourceSets { - val commonMain by getting - val androidMain by getting { - dependsOn(commonMain) - } - } - androidTarget { @OptIn(ExperimentalKotlinGradlePluginApi::class) compilerOptions { diff --git a/features/preference/src/commonMain/kotlin/com/escodro/preference/presentation/OpenSource.kt b/features/preference/src/commonMain/kotlin/com/escodro/preference/presentation/OpenSource.kt index fab859aaa..4376eef98 100644 --- a/features/preference/src/commonMain/kotlin/com/escodro/preference/presentation/OpenSource.kt +++ b/features/preference/src/commonMain/kotlin/com/escodro/preference/presentation/OpenSource.kt @@ -27,7 +27,7 @@ fun OpenSource(onUpPress: () -> Unit, modifier: Modifier = Modifier) { @Composable private fun OpenSourceContent(modifier: Modifier = Modifier) { - val licenses by MR.files.aboutlibraries.readTextAsState() + val licenses by MR.files.aboutlibraries_json.readTextAsState() LibrariesContainer( aboutLibsJson = licenses ?: "", diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 080226d4e..280d209f9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -52,7 +52,7 @@ sqldelight = "2.0.0" # Moko moko = "0.16.1" moko_parcelize = "0.9.0" -moko_resources = "0.23.0" +moko_resources = "0.24.0-beta-4" moko_permissions = "0.18.0" # AtomicFU diff --git a/resources/build.gradle.kts b/resources/build.gradle.kts index c8cdc49aa..099d21a76 100644 --- a/resources/build.gradle.kts +++ b/resources/build.gradle.kts @@ -14,15 +14,6 @@ kotlin { implementation(libs.moko.resources.core) implementation(libs.koin.core) } - - // Explicit dependency due to Moko issues with Kotlin 1.9.0 - // https://github.com/icerockdev/moko-resources/issues/531 - sourceSets { - val commonMain by getting - val androidMain by getting { - dependsOn(commonMain) - } - } } android { @@ -30,17 +21,6 @@ android { } multiplatformResources { - multiplatformResourcesPackage = "com.escodro.resources" + resourcesPackage.set("com.escodro.resources") iosBaseLocalizationRegion = "en-US" } - -// Define explicit dependency for Moko resources -// https://github.com/icerockdev/moko-resources/issues/421 -afterEvaluate { - tasks.named("iosSimulatorArm64ProcessResources") { - dependsOn("generateMRcommonMain") - } - tasks.named("iosX64ProcessResources") { - dependsOn("generateMRcommonMain") - } -} diff --git a/resources/src/commonMain/resources/MR/base/plurals.xml b/resources/src/commonMain/moko-resources/base/plurals.xml similarity index 100% rename from resources/src/commonMain/resources/MR/base/plurals.xml rename to resources/src/commonMain/moko-resources/base/plurals.xml diff --git a/resources/src/commonMain/resources/MR/base/strings.xml b/resources/src/commonMain/moko-resources/base/strings.xml similarity index 100% rename from resources/src/commonMain/resources/MR/base/strings.xml rename to resources/src/commonMain/moko-resources/base/strings.xml diff --git a/resources/src/commonMain/resources/MR/colors/colors.xml b/resources/src/commonMain/moko-resources/colors/colors.xml similarity index 100% rename from resources/src/commonMain/resources/MR/colors/colors.xml rename to resources/src/commonMain/moko-resources/colors/colors.xml diff --git a/resources/src/commonMain/resources/MR/files/aboutlibraries.json b/resources/src/commonMain/moko-resources/files/aboutlibraries.json similarity index 100% rename from resources/src/commonMain/resources/MR/files/aboutlibraries.json rename to resources/src/commonMain/moko-resources/files/aboutlibraries.json diff --git a/resources/src/commonMain/resources/MR/images/ic_bookmark.svg b/resources/src/commonMain/moko-resources/images/ic_bookmark.svg similarity index 100% rename from resources/src/commonMain/resources/MR/images/ic_bookmark.svg rename to resources/src/commonMain/moko-resources/images/ic_bookmark.svg diff --git a/resources/src/commonMain/resources/MR/pt-br/plurals.xml b/resources/src/commonMain/moko-resources/pt-br/plurals.xml similarity index 100% rename from resources/src/commonMain/resources/MR/pt-br/plurals.xml rename to resources/src/commonMain/moko-resources/pt-br/plurals.xml diff --git a/resources/src/commonMain/resources/MR/pt-br/strings.xml b/resources/src/commonMain/moko-resources/pt-br/strings.xml similarity index 100% rename from resources/src/commonMain/resources/MR/pt-br/strings.xml rename to resources/src/commonMain/moko-resources/pt-br/strings.xml diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 57b6d2035..f35207ec4 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -84,15 +84,6 @@ kotlin { implementation(libs.koin.test) implementation(libs.kotlinx.datetime) } - - // Explicit dependency due to Moko issues with Kotlin 1.9.0 - // https://github.com/icerockdev/moko-resources/issues/531 - sourceSets { - val commonMain by getting - val androidMain by getting { - dependsOn(commonMain) - } - } } android { @@ -104,7 +95,7 @@ android { } multiplatformResources { - multiplatformResourcesPackage = "com.escodro.alkaa" + resourcesPackage.set("com.escodro.alkaa") } // Add compile options to link sqlite3 library allowing iOS UI testing