tor-browser

commit c2eea22a5b1fee57a0ce4ce447c18305755f6c35
parent c23b1bff8458d23914f4d222feb95ebebc5d8239
Author: mcarare <48995920+mcarare@users.noreply.github.com>
Date:   Tue, 16 Dec 2025 23:05:54 +0000

Bug 1980525 - Ensure OSS CleanUp tasks run before DependencyTask in Fenix and Focus r=android-reviewers,nalexander

Differential Revision: https://phabricator.services.mozilla.com/D276481

Diffstat:
M
mobile/android/fenix/app/build.gradle
 | 
20
+++++++++++++++-----
M
mobile/android/focus-android/app/build.gradle
 | 
12
+++++++++++-

2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/mobile/android/fenix/app/build.gradle b/mobile/android/fenix/app/build.gradle
@@ -1,6 +1,11 @@
 import com.android.build.api.variant.FilterConfiguration
+import com.google.android.gms.oss.licenses.plugin.DependencyTask
+import groovy.json.JsonOutput
+
 import java.time.format.DateTimeFormatter
 
+import static org.gradle.api.tasks.testing.TestResult.ResultType
+
 buildscript {
     repositories {
         gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
@@ -36,11 +41,6 @@ if (gradle.mozconfig.substs.MOZILLA_OFFICIAL) {
     apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 }
 
-import groovy.json.JsonOutput
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-import static org.gradle.api.tasks.testing.TestResult.ResultType
-
 apply from: 'benchmark.gradle'
 
 ext.getAbi = { output ->
@@ -911,3 +911,13 @@ def getSupportedLocales() {
     def foundLocalesString = foundLocales.toString().replaceAll(',}', '}')
     return foundLocalesString
 }
+
+// Fix for Gradle 9 strictness: Ensure CleanUp runs before DependencyTask
+tasks.withType(DependencyTask).configureEach { task ->
+    // The OSS plugin creates a "LicensesCleanUp" task for every "DependencyTask"
+    // e.g., nightlyOssDependencyTask -> nightlyOssLicensesCleanUp
+    def cleanUpTaskName = task.name.replace("DependencyTask", "LicensesCleanUp")
+
+    // make the dependency task depend on its cleanup task.
+    task.dependsOn(tasks.named(cleanUpTaskName))
+}
diff --git a/mobile/android/focus-android/app/build.gradle b/mobile/android/focus-android/app/build.gradle
@@ -22,8 +22,8 @@ if (findProject(":geckoview") != null) {
 apply from: versionCodeGradle
 
 import com.android.build.api.variant.FilterConfiguration
+import com.google.android.gms.oss.licenses.plugin.DependencyTask
 import groovy.json.JsonOutput
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 import static org.gradle.api.tasks.testing.TestResult.ResultType
 
@@ -672,6 +672,16 @@ tasks.register('printVariants') {
     }
 }
 
+// Fix for Gradle 9 strictness: Ensure CleanUp runs before DependencyTask
+tasks.withType(DependencyTask).configureEach { task ->
+    // The OSS plugin creates a "LicensesCleanUp" task for every "DependencyTask"
+    // e.g., nightlyOssDependencyTask -> nightlyOssLicensesCleanUp
+    def cleanUpTaskName = task.name.replace("DependencyTask", "LicensesCleanUp")
+
+    // make the dependency task depend on its cleanup task.
+    task.dependsOn(tasks.named(cleanUpTaskName))
+}
+
 afterEvaluate {
 
     // Format test output. Copied from Fenix, which was ported from AC #2401