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
buildSrc/src/main/kotlin/mihon/buildlogic/tasks
gradle
i18n-sy
build.gradle.kts
src/commonMain/moko-resources
i18n
build.gradle.kts
src/commonMain/moko-resources
am
ar
base
be
bg
bn
ca
ceb
cs
cv
da
de
el
eo
es
eu
fa
fi
fil
fr
gl
he
hi
hr
hu
in
it
ja
jv
ka-rGE
kk
km
kn
ko
lt
lv
ml
mr
ms
nb-rNO
ne
@ -8,7 +8,7 @@ private val emptyResourcesElement = "<resources>\\s*</resources>|<resources/>".t
|
||||
|
||||
fun Project.getLocalesConfigTask(): TaskProvider<Task> {
|
||||
return tasks.register("generateLocalesConfig") {
|
||||
val locales = fileTree("$projectDir/src/commonMain/resources/MR/")
|
||||
val locales = fileTree("$projectDir/src/commonMain/moko-resources/")
|
||||
.matching { include("**/strings.xml") }
|
||||
.filterNot { it.readText().contains(emptyResourcesElement) }
|
||||
.map {
|
||||
|
@ -1,7 +1,7 @@
|
||||
[versions]
|
||||
aboutlib_version = "11.2.1"
|
||||
leakcanary = "2.14"
|
||||
moko = "0.23.0"
|
||||
moko = "0.24.1"
|
||||
okhttp_version = "5.0.0-alpha.14"
|
||||
richtext = "0.20.0"
|
||||
shizuku_version = "12.2.0"
|
||||
|
@ -11,14 +11,11 @@ kotlin {
|
||||
applyDefaultHierarchyTemplate()
|
||||
|
||||
sourceSets {
|
||||
val commonMain by getting {
|
||||
commonMain {
|
||||
dependencies {
|
||||
api(libs.moko.core)
|
||||
}
|
||||
}
|
||||
androidMain {
|
||||
dependsOn(commonMain) // https://github.com/icerockdev/moko-resources/issues/562
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -37,8 +34,8 @@ android {
|
||||
}
|
||||
|
||||
multiplatformResources {
|
||||
multiplatformResourcesClassName = "SYMR"
|
||||
multiplatformResourcesPackage = "tachiyomi.i18n.sy"
|
||||
resourcesClassName.set("SYMR")
|
||||
resourcesPackage.set("tachiyomi.i18n.sy")
|
||||
}
|
||||
|
||||
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
|
||||
|
@ -14,15 +14,11 @@ kotlin {
|
||||
applyDefaultHierarchyTemplate()
|
||||
|
||||
sourceSets {
|
||||
val commonMain by getting {
|
||||
commonMain {
|
||||
dependencies {
|
||||
api(libs.moko.core)
|
||||
}
|
||||
}
|
||||
|
||||
androidMain {
|
||||
dependsOn(commonMain) // https://github.com/icerockdev/moko-resources/issues/562
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -41,7 +37,7 @@ android {
|
||||
}
|
||||
|
||||
multiplatformResources {
|
||||
multiplatformResourcesPackage = "tachiyomi.i18n"
|
||||
resourcesPackage.set("tachiyomi.i18n")
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
0
i18n/src/commonMain/resources/MR/am/plurals.xml → i18n/src/commonMain/moko-resources/am/plurals.xml
0
i18n/src/commonMain/resources/MR/am/plurals.xml → i18n/src/commonMain/moko-resources/am/plurals.xml
0
i18n/src/commonMain/resources/MR/am/strings.xml → i18n/src/commonMain/moko-resources/am/strings.xml
0
i18n/src/commonMain/resources/MR/am/strings.xml → i18n/src/commonMain/moko-resources/am/strings.xml
0
i18n/src/commonMain/resources/MR/ar/plurals.xml → i18n/src/commonMain/moko-resources/ar/plurals.xml
0
i18n/src/commonMain/resources/MR/ar/plurals.xml → i18n/src/commonMain/moko-resources/ar/plurals.xml
0
i18n/src/commonMain/resources/MR/ar/strings.xml → i18n/src/commonMain/moko-resources/ar/strings.xml
0
i18n/src/commonMain/resources/MR/ar/strings.xml → i18n/src/commonMain/moko-resources/ar/strings.xml
0
i18n/src/commonMain/resources/MR/be/plurals.xml → i18n/src/commonMain/moko-resources/be/plurals.xml
0
i18n/src/commonMain/resources/MR/be/plurals.xml → i18n/src/commonMain/moko-resources/be/plurals.xml
0
i18n/src/commonMain/resources/MR/be/strings.xml → i18n/src/commonMain/moko-resources/be/strings.xml
0
i18n/src/commonMain/resources/MR/be/strings.xml → i18n/src/commonMain/moko-resources/be/strings.xml
0
i18n/src/commonMain/resources/MR/bg/plurals.xml → i18n/src/commonMain/moko-resources/bg/plurals.xml
0
i18n/src/commonMain/resources/MR/bg/plurals.xml → i18n/src/commonMain/moko-resources/bg/plurals.xml
0
i18n/src/commonMain/resources/MR/bg/strings.xml → i18n/src/commonMain/moko-resources/bg/strings.xml
0
i18n/src/commonMain/resources/MR/bg/strings.xml → i18n/src/commonMain/moko-resources/bg/strings.xml
0
i18n/src/commonMain/resources/MR/bn/plurals.xml → i18n/src/commonMain/moko-resources/bn/plurals.xml
0
i18n/src/commonMain/resources/MR/bn/plurals.xml → i18n/src/commonMain/moko-resources/bn/plurals.xml
0
i18n/src/commonMain/resources/MR/bn/strings.xml → i18n/src/commonMain/moko-resources/bn/strings.xml
0
i18n/src/commonMain/resources/MR/bn/strings.xml → i18n/src/commonMain/moko-resources/bn/strings.xml
0
i18n/src/commonMain/resources/MR/ca/plurals.xml → i18n/src/commonMain/moko-resources/ca/plurals.xml
0
i18n/src/commonMain/resources/MR/ca/plurals.xml → i18n/src/commonMain/moko-resources/ca/plurals.xml
0
i18n/src/commonMain/resources/MR/ca/strings.xml → i18n/src/commonMain/moko-resources/ca/strings.xml
0
i18n/src/commonMain/resources/MR/ca/strings.xml → i18n/src/commonMain/moko-resources/ca/strings.xml
0
i18n/src/commonMain/resources/MR/cs/plurals.xml → i18n/src/commonMain/moko-resources/cs/plurals.xml
0
i18n/src/commonMain/resources/MR/cs/plurals.xml → i18n/src/commonMain/moko-resources/cs/plurals.xml
0
i18n/src/commonMain/resources/MR/cs/strings.xml → i18n/src/commonMain/moko-resources/cs/strings.xml
0
i18n/src/commonMain/resources/MR/cs/strings.xml → i18n/src/commonMain/moko-resources/cs/strings.xml
0
i18n/src/commonMain/resources/MR/cv/plurals.xml → i18n/src/commonMain/moko-resources/cv/plurals.xml
0
i18n/src/commonMain/resources/MR/cv/plurals.xml → i18n/src/commonMain/moko-resources/cv/plurals.xml
0
i18n/src/commonMain/resources/MR/cv/strings.xml → i18n/src/commonMain/moko-resources/cv/strings.xml
0
i18n/src/commonMain/resources/MR/cv/strings.xml → i18n/src/commonMain/moko-resources/cv/strings.xml
0
i18n/src/commonMain/resources/MR/da/plurals.xml → i18n/src/commonMain/moko-resources/da/plurals.xml
0
i18n/src/commonMain/resources/MR/da/plurals.xml → i18n/src/commonMain/moko-resources/da/plurals.xml
0
i18n/src/commonMain/resources/MR/da/strings.xml → i18n/src/commonMain/moko-resources/da/strings.xml
0
i18n/src/commonMain/resources/MR/da/strings.xml → i18n/src/commonMain/moko-resources/da/strings.xml
0
i18n/src/commonMain/resources/MR/de/plurals.xml → i18n/src/commonMain/moko-resources/de/plurals.xml
0
i18n/src/commonMain/resources/MR/de/plurals.xml → i18n/src/commonMain/moko-resources/de/plurals.xml
0
i18n/src/commonMain/resources/MR/de/strings.xml → i18n/src/commonMain/moko-resources/de/strings.xml
0
i18n/src/commonMain/resources/MR/de/strings.xml → i18n/src/commonMain/moko-resources/de/strings.xml
0
i18n/src/commonMain/resources/MR/el/plurals.xml → i18n/src/commonMain/moko-resources/el/plurals.xml
0
i18n/src/commonMain/resources/MR/el/plurals.xml → i18n/src/commonMain/moko-resources/el/plurals.xml
0
i18n/src/commonMain/resources/MR/el/strings.xml → i18n/src/commonMain/moko-resources/el/strings.xml
0
i18n/src/commonMain/resources/MR/el/strings.xml → i18n/src/commonMain/moko-resources/el/strings.xml
0
i18n/src/commonMain/resources/MR/eo/plurals.xml → i18n/src/commonMain/moko-resources/eo/plurals.xml
0
i18n/src/commonMain/resources/MR/eo/plurals.xml → i18n/src/commonMain/moko-resources/eo/plurals.xml
0
i18n/src/commonMain/resources/MR/eo/strings.xml → i18n/src/commonMain/moko-resources/eo/strings.xml
0
i18n/src/commonMain/resources/MR/eo/strings.xml → i18n/src/commonMain/moko-resources/eo/strings.xml
0
i18n/src/commonMain/resources/MR/es/plurals.xml → i18n/src/commonMain/moko-resources/es/plurals.xml
0
i18n/src/commonMain/resources/MR/es/plurals.xml → i18n/src/commonMain/moko-resources/es/plurals.xml
0
i18n/src/commonMain/resources/MR/es/strings.xml → i18n/src/commonMain/moko-resources/es/strings.xml
0
i18n/src/commonMain/resources/MR/es/strings.xml → i18n/src/commonMain/moko-resources/es/strings.xml
0
i18n/src/commonMain/resources/MR/eu/plurals.xml → i18n/src/commonMain/moko-resources/eu/plurals.xml
0
i18n/src/commonMain/resources/MR/eu/plurals.xml → i18n/src/commonMain/moko-resources/eu/plurals.xml
0
i18n/src/commonMain/resources/MR/eu/strings.xml → i18n/src/commonMain/moko-resources/eu/strings.xml
0
i18n/src/commonMain/resources/MR/eu/strings.xml → i18n/src/commonMain/moko-resources/eu/strings.xml
0
i18n/src/commonMain/resources/MR/fa/plurals.xml → i18n/src/commonMain/moko-resources/fa/plurals.xml
0
i18n/src/commonMain/resources/MR/fa/plurals.xml → i18n/src/commonMain/moko-resources/fa/plurals.xml
0
i18n/src/commonMain/resources/MR/fa/strings.xml → i18n/src/commonMain/moko-resources/fa/strings.xml
0
i18n/src/commonMain/resources/MR/fa/strings.xml → i18n/src/commonMain/moko-resources/fa/strings.xml
0
i18n/src/commonMain/resources/MR/fi/plurals.xml → i18n/src/commonMain/moko-resources/fi/plurals.xml
0
i18n/src/commonMain/resources/MR/fi/plurals.xml → i18n/src/commonMain/moko-resources/fi/plurals.xml
0
i18n/src/commonMain/resources/MR/fi/strings.xml → i18n/src/commonMain/moko-resources/fi/strings.xml
0
i18n/src/commonMain/resources/MR/fi/strings.xml → i18n/src/commonMain/moko-resources/fi/strings.xml
0
i18n/src/commonMain/resources/MR/fr/plurals.xml → i18n/src/commonMain/moko-resources/fr/plurals.xml
0
i18n/src/commonMain/resources/MR/fr/plurals.xml → i18n/src/commonMain/moko-resources/fr/plurals.xml
0
i18n/src/commonMain/resources/MR/fr/strings.xml → i18n/src/commonMain/moko-resources/fr/strings.xml
0
i18n/src/commonMain/resources/MR/fr/strings.xml → i18n/src/commonMain/moko-resources/fr/strings.xml
0
i18n/src/commonMain/resources/MR/gl/plurals.xml → i18n/src/commonMain/moko-resources/gl/plurals.xml
0
i18n/src/commonMain/resources/MR/gl/plurals.xml → i18n/src/commonMain/moko-resources/gl/plurals.xml
0
i18n/src/commonMain/resources/MR/gl/strings.xml → i18n/src/commonMain/moko-resources/gl/strings.xml
0
i18n/src/commonMain/resources/MR/gl/strings.xml → i18n/src/commonMain/moko-resources/gl/strings.xml
0
i18n/src/commonMain/resources/MR/he/plurals.xml → i18n/src/commonMain/moko-resources/he/plurals.xml
0
i18n/src/commonMain/resources/MR/he/plurals.xml → i18n/src/commonMain/moko-resources/he/plurals.xml
0
i18n/src/commonMain/resources/MR/he/strings.xml → i18n/src/commonMain/moko-resources/he/strings.xml
0
i18n/src/commonMain/resources/MR/he/strings.xml → i18n/src/commonMain/moko-resources/he/strings.xml
0
i18n/src/commonMain/resources/MR/hi/plurals.xml → i18n/src/commonMain/moko-resources/hi/plurals.xml
0
i18n/src/commonMain/resources/MR/hi/plurals.xml → i18n/src/commonMain/moko-resources/hi/plurals.xml
0
i18n/src/commonMain/resources/MR/hi/strings.xml → i18n/src/commonMain/moko-resources/hi/strings.xml
0
i18n/src/commonMain/resources/MR/hi/strings.xml → i18n/src/commonMain/moko-resources/hi/strings.xml
0
i18n/src/commonMain/resources/MR/hr/plurals.xml → i18n/src/commonMain/moko-resources/hr/plurals.xml
0
i18n/src/commonMain/resources/MR/hr/plurals.xml → i18n/src/commonMain/moko-resources/hr/plurals.xml
0
i18n/src/commonMain/resources/MR/hr/strings.xml → i18n/src/commonMain/moko-resources/hr/strings.xml
0
i18n/src/commonMain/resources/MR/hr/strings.xml → i18n/src/commonMain/moko-resources/hr/strings.xml
0
i18n/src/commonMain/resources/MR/hu/plurals.xml → i18n/src/commonMain/moko-resources/hu/plurals.xml
0
i18n/src/commonMain/resources/MR/hu/plurals.xml → i18n/src/commonMain/moko-resources/hu/plurals.xml
0
i18n/src/commonMain/resources/MR/hu/strings.xml → i18n/src/commonMain/moko-resources/hu/strings.xml
0
i18n/src/commonMain/resources/MR/hu/strings.xml → i18n/src/commonMain/moko-resources/hu/strings.xml
0
i18n/src/commonMain/resources/MR/in/plurals.xml → i18n/src/commonMain/moko-resources/in/plurals.xml
0
i18n/src/commonMain/resources/MR/in/plurals.xml → i18n/src/commonMain/moko-resources/in/plurals.xml
0
i18n/src/commonMain/resources/MR/in/strings.xml → i18n/src/commonMain/moko-resources/in/strings.xml
0
i18n/src/commonMain/resources/MR/in/strings.xml → i18n/src/commonMain/moko-resources/in/strings.xml
0
i18n/src/commonMain/resources/MR/it/plurals.xml → i18n/src/commonMain/moko-resources/it/plurals.xml
0
i18n/src/commonMain/resources/MR/it/plurals.xml → i18n/src/commonMain/moko-resources/it/plurals.xml
0
i18n/src/commonMain/resources/MR/it/strings.xml → i18n/src/commonMain/moko-resources/it/strings.xml
0
i18n/src/commonMain/resources/MR/it/strings.xml → i18n/src/commonMain/moko-resources/it/strings.xml
0
i18n/src/commonMain/resources/MR/ja/plurals.xml → i18n/src/commonMain/moko-resources/ja/plurals.xml
0
i18n/src/commonMain/resources/MR/ja/plurals.xml → i18n/src/commonMain/moko-resources/ja/plurals.xml
0
i18n/src/commonMain/resources/MR/ja/strings.xml → i18n/src/commonMain/moko-resources/ja/strings.xml
0
i18n/src/commonMain/resources/MR/ja/strings.xml → i18n/src/commonMain/moko-resources/ja/strings.xml
0
i18n/src/commonMain/resources/MR/jv/plurals.xml → i18n/src/commonMain/moko-resources/jv/plurals.xml
0
i18n/src/commonMain/resources/MR/jv/plurals.xml → i18n/src/commonMain/moko-resources/jv/plurals.xml
0
i18n/src/commonMain/resources/MR/jv/strings.xml → i18n/src/commonMain/moko-resources/jv/strings.xml
0
i18n/src/commonMain/resources/MR/jv/strings.xml → i18n/src/commonMain/moko-resources/jv/strings.xml
0
i18n/src/commonMain/resources/MR/kk/plurals.xml → i18n/src/commonMain/moko-resources/kk/plurals.xml
0
i18n/src/commonMain/resources/MR/kk/plurals.xml → i18n/src/commonMain/moko-resources/kk/plurals.xml
0
i18n/src/commonMain/resources/MR/kk/strings.xml → i18n/src/commonMain/moko-resources/kk/strings.xml
0
i18n/src/commonMain/resources/MR/kk/strings.xml → i18n/src/commonMain/moko-resources/kk/strings.xml
0
i18n/src/commonMain/resources/MR/km/plurals.xml → i18n/src/commonMain/moko-resources/km/plurals.xml
0
i18n/src/commonMain/resources/MR/km/plurals.xml → i18n/src/commonMain/moko-resources/km/plurals.xml
0
i18n/src/commonMain/resources/MR/km/strings.xml → i18n/src/commonMain/moko-resources/km/strings.xml
0
i18n/src/commonMain/resources/MR/km/strings.xml → i18n/src/commonMain/moko-resources/km/strings.xml
0
i18n/src/commonMain/resources/MR/kn/plurals.xml → i18n/src/commonMain/moko-resources/kn/plurals.xml
0
i18n/src/commonMain/resources/MR/kn/plurals.xml → i18n/src/commonMain/moko-resources/kn/plurals.xml
0
i18n/src/commonMain/resources/MR/kn/strings.xml → i18n/src/commonMain/moko-resources/kn/strings.xml
0
i18n/src/commonMain/resources/MR/kn/strings.xml → i18n/src/commonMain/moko-resources/kn/strings.xml
0
i18n/src/commonMain/resources/MR/ko/plurals.xml → i18n/src/commonMain/moko-resources/ko/plurals.xml
0
i18n/src/commonMain/resources/MR/ko/plurals.xml → i18n/src/commonMain/moko-resources/ko/plurals.xml
0
i18n/src/commonMain/resources/MR/ko/strings.xml → i18n/src/commonMain/moko-resources/ko/strings.xml
0
i18n/src/commonMain/resources/MR/ko/strings.xml → i18n/src/commonMain/moko-resources/ko/strings.xml
0
i18n/src/commonMain/resources/MR/lt/plurals.xml → i18n/src/commonMain/moko-resources/lt/plurals.xml
0
i18n/src/commonMain/resources/MR/lt/plurals.xml → i18n/src/commonMain/moko-resources/lt/plurals.xml
0
i18n/src/commonMain/resources/MR/lt/strings.xml → i18n/src/commonMain/moko-resources/lt/strings.xml
0
i18n/src/commonMain/resources/MR/lt/strings.xml → i18n/src/commonMain/moko-resources/lt/strings.xml
0
i18n/src/commonMain/resources/MR/lv/plurals.xml → i18n/src/commonMain/moko-resources/lv/plurals.xml
0
i18n/src/commonMain/resources/MR/lv/plurals.xml → i18n/src/commonMain/moko-resources/lv/plurals.xml
0
i18n/src/commonMain/resources/MR/lv/strings.xml → i18n/src/commonMain/moko-resources/lv/strings.xml
0
i18n/src/commonMain/resources/MR/lv/strings.xml → i18n/src/commonMain/moko-resources/lv/strings.xml
0
i18n/src/commonMain/resources/MR/ml/plurals.xml → i18n/src/commonMain/moko-resources/ml/plurals.xml
0
i18n/src/commonMain/resources/MR/ml/plurals.xml → i18n/src/commonMain/moko-resources/ml/plurals.xml
0
i18n/src/commonMain/resources/MR/ml/strings.xml → i18n/src/commonMain/moko-resources/ml/strings.xml
0
i18n/src/commonMain/resources/MR/ml/strings.xml → i18n/src/commonMain/moko-resources/ml/strings.xml
0
i18n/src/commonMain/resources/MR/mr/plurals.xml → i18n/src/commonMain/moko-resources/mr/plurals.xml
0
i18n/src/commonMain/resources/MR/mr/plurals.xml → i18n/src/commonMain/moko-resources/mr/plurals.xml
0
i18n/src/commonMain/resources/MR/mr/strings.xml → i18n/src/commonMain/moko-resources/mr/strings.xml
0
i18n/src/commonMain/resources/MR/mr/strings.xml → i18n/src/commonMain/moko-resources/mr/strings.xml
0
i18n/src/commonMain/resources/MR/ms/plurals.xml → i18n/src/commonMain/moko-resources/ms/plurals.xml
0
i18n/src/commonMain/resources/MR/ms/plurals.xml → i18n/src/commonMain/moko-resources/ms/plurals.xml
0
i18n/src/commonMain/resources/MR/ms/strings.xml → i18n/src/commonMain/moko-resources/ms/strings.xml
0
i18n/src/commonMain/resources/MR/ms/strings.xml → i18n/src/commonMain/moko-resources/ms/strings.xml
0
i18n/src/commonMain/resources/MR/ne/plurals.xml → i18n/src/commonMain/moko-resources/ne/plurals.xml
0
i18n/src/commonMain/resources/MR/ne/plurals.xml → i18n/src/commonMain/moko-resources/ne/plurals.xml
0
i18n/src/commonMain/resources/MR/ne/strings.xml → i18n/src/commonMain/moko-resources/ne/strings.xml
0
i18n/src/commonMain/resources/MR/ne/strings.xml → i18n/src/commonMain/moko-resources/ne/strings.xml
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