Skip to content

Commit 92ae8ff

Browse files
committed
gradle: sort extracted locales rather than generated XML
Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent ac13957 commit 92ae8ff

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

ui/build.gradle.kts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
44
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
5-
import com.android.build.gradle.tasks.GenerateLocaleConfigTask
5+
import com.android.build.gradle.tasks.ExtractSupportedLocalesTask
66

77
// Grotesque workaround for https://issuetracker.google.com/issues/279780940
88
System.setProperty("com.android.tools.r8.disableApiModeling", "1")
@@ -97,12 +97,10 @@ tasks.withType<KotlinCompile>().configureEach {
9797
}
9898

9999
// Grotesque workaround for https://issuetracker.google.com/issues/281825213
100-
tasks.withType<GenerateLocaleConfigTask>().configureEach {
100+
tasks.withType<ExtractSupportedLocalesTask>().configureEach {
101101
doLast {
102-
localeConfig.asFileTree.files.forEach {
103-
val lines = it.readLines()
104-
val newLines = lines.subList(0, 2) + lines.subList(2, lines.size - 1).sorted() + lines.last()
105-
it.writeText(newLines.joinToString(separator = "\n"))
106-
}
102+
val file = localeList.asFile.get()
103+
val lines = file.readLines()
104+
file.writeText((listOf(lines[0]) + lines.subList(1, lines.size).sorted()).joinToString(separator = "\n"))
107105
}
108106
}

0 commit comments

Comments
 (0)