fix(deps): update moko to v0.24.1 (#933)
* fix(deps): update moko to v0.24.1 * Fix build --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com> (cherry picked from commit f58a05e91828a69c01d49d629e5bfa9ec7ae3ffc)
This commit is contained in:
parent
524f5cc6ab
commit
a3f2f49ab8
@ -8,7 +8,7 @@ private val emptyResourcesElement = "<resources>\\s*</resources>|<resources/>".t
|
|||||||
|
|
||||||
fun Project.getLocalesConfigTask(): TaskProvider<Task> {
|
fun Project.getLocalesConfigTask(): TaskProvider<Task> {
|
||||||
return tasks.register("generateLocalesConfig") {
|
return tasks.register("generateLocalesConfig") {
|
||||||
val locales = fileTree("$projectDir/src/commonMain/resources/MR/")
|
val locales = fileTree("$projectDir/src/commonMain/moko-resources/")
|
||||||
.matching { include("**/strings.xml") }
|
.matching { include("**/strings.xml") }
|
||||||
.filterNot { it.readText().contains(emptyResourcesElement) }
|
.filterNot { it.readText().contains(emptyResourcesElement) }
|
||||||
.map {
|
.map {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
[versions]
|
[versions]
|
||||||
aboutlib_version = "11.2.1"
|
aboutlib_version = "11.2.1"
|
||||||
leakcanary = "2.14"
|
leakcanary = "2.14"
|
||||||
moko = "0.23.0"
|
moko = "0.24.1"
|
||||||
okhttp_version = "5.0.0-alpha.14"
|
okhttp_version = "5.0.0-alpha.14"
|
||||||
richtext = "0.20.0"
|
richtext = "0.20.0"
|
||||||
shizuku_version = "12.2.0"
|
shizuku_version = "12.2.0"
|
||||||
|
@ -11,14 +11,11 @@ kotlin {
|
|||||||
applyDefaultHierarchyTemplate()
|
applyDefaultHierarchyTemplate()
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
val commonMain by getting {
|
commonMain {
|
||||||
dependencies {
|
dependencies {
|
||||||
api(libs.moko.core)
|
api(libs.moko.core)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
androidMain {
|
|
||||||
dependsOn(commonMain) // https://github.com/icerockdev/moko-resources/issues/562
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -37,8 +34,8 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
multiplatformResources {
|
multiplatformResources {
|
||||||
multiplatformResourcesClassName = "SYMR"
|
resourcesClassName.set("SYMR")
|
||||||
multiplatformResourcesPackage = "tachiyomi.i18n.sy"
|
resourcesPackage.set("tachiyomi.i18n.sy")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
|
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
|
||||||
|
@ -14,15 +14,11 @@ kotlin {
|
|||||||
applyDefaultHierarchyTemplate()
|
applyDefaultHierarchyTemplate()
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
val commonMain by getting {
|
commonMain {
|
||||||
dependencies {
|
dependencies {
|
||||||
api(libs.moko.core)
|
api(libs.moko.core)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
androidMain {
|
|
||||||
dependsOn(commonMain) // https://github.com/icerockdev/moko-resources/issues/562
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -41,7 +37,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
multiplatformResources {
|
multiplatformResources {
|
||||||
multiplatformResourcesPackage = "tachiyomi.i18n"
|
resourcesPackage.set("tachiyomi.i18n")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user