From ef32d5adaa8acddb3478911bb89026087c5b2876 Mon Sep 17 00:00:00 2001 From: sspanak Date: Sat, 1 Mar 2025 13:43:58 +0200 Subject: [PATCH] the languages are now sorted during build time --- app/build-definitions.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build-definitions.gradle b/app/build-definitions.gradle index 17f02bcae..b91a06476 100644 --- a/app/build-definitions.gradle +++ b/app/build-definitions.gradle @@ -3,7 +3,7 @@ ext.mergeDefinitions = { String definitionsInputDir, String definitionsOutputPat merged.delete() boolean isFirst = true - fileTree(dir: definitionsInputDir).getFiles().each { file -> + fileTree(dir: definitionsInputDir).getFiles().sort().each { file -> if (!file.isFile() || !file.name.endsWith(".yml")) { return } @@ -16,7 +16,7 @@ ext.mergeDefinitions = { String definitionsInputDir, String definitionsOutputPat merged << file.text .replaceAll("\\s*#[^\n]+", "") - .replaceAll("^[ ]+\n", "") + .replaceAll("^ +\n", "") .trim() } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e7231875..7eff5efae 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@