From fdcd24feb10b4cc6be4cb5682df14f5857677212 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 31 Dec 2025 16:10:37 -0500
Subject: [PATCH] Fix ordering issues in updateStaticFilesAndQa.

---
 .../plugins/src/main/java/translations.gradle.kts  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/build-logic/plugins/src/main/java/translations.gradle.kts b/build-logic/plugins/src/main/java/translations.gradle.kts
index 784bd85938..a2d260387c 100644
--- a/build-logic/plugins/src/main/java/translations.gradle.kts
+++ b/build-logic/plugins/src/main/java/translations.gradle.kts
@@ -49,6 +49,7 @@ tasks.register("pushTranslations") {
 tasks.register("pullTranslations") {
   group = "Translations"
   description = "Pulls translated strings.xml files from Smartling for all locales"
+  mustRunAfter("pushTranslations")
 
   doLast {
     val client = createSmartlingClient()
@@ -102,6 +103,7 @@ tasks.register("pullTranslations") {
 tasks.register("replaceEllipsis") {
   group = "Static Files"
   description = "Process strings for ellipsis characters."
+  mustRunAfter("pullTranslations")
   doLast {
     allStringsResourceFiles { f ->
       val before = f.readText()
@@ -117,6 +119,7 @@ tasks.register("replaceEllipsis") {
 tasks.register("cleanApostropheErrors") {
   group = "Static Files"
   description = "Fix smartling apostrophe string errors."
+  mustRunAfter("pullTranslations")
   doLast {
     val pattern = Regex("""([^\\=08])(')""")
     allStringsResourceFiles { f ->
@@ -135,6 +138,7 @@ tasks.register("cleanApostropheErrors") {
 tasks.register("excludeNonTranslatables") {
   group = "Static Files"
   description = "Remove strings that are marked \"translatable\"=\"false\" or are ExtraTranslations."
+  mustRunAfter("pullTranslations")
   doLast {
     val englishFile = file("src/main/res/values/strings.xml")
 
@@ -215,7 +219,15 @@ tasks.register("resolveStaticIps") {
 tasks.register("updateStaticFilesAndQa") {
   group = "Static Files"
   description = "Runs tasks to update static files. This includes translations, static IPs, and licenses. Runs QA afterwards to verify all went well. Intended to be run before cutting a release."
-  dependsOn("pushTranslations", "pullTranslations", "replaceEllipsis", "cleanApostropheErrors", "excludeNonTranslatables", "resolveStaticIps", ":qa")
+  dependsOn("pushTranslations", "pullTranslations", "replaceEllipsis", "cleanApostropheErrors", "excludeNonTranslatables", "resolveStaticIps", "postTranslateQa")
+}
+
+// This is a wrapper task just so that we can add a mustRunAfter in the context of the translation tasks.
+tasks.register("postTranslateQa") {
+  group = "Static Files"
+  description = "Runs QA to check validity of updated strings, and ensure presence of any new languages in internal lists."
+  mustRunAfter("replaceEllipsis", "cleanApostropheErrors", "excludeNonTranslatables", "resolveStaticIps")
+  dependsOn(":qa")
 }
 
 private fun allStringsResourceFiles(action: (File) -> Unit) {