tor-browser

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

Bug 1980525 - Replace deprecated buildDir with layout.buildDirectory in Gradle files r=geckoview-reviewers,android-reviewers,nalexander

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

Diffstat:
M
mobile/android/android-components/plugins/config/build.gradle
 | 
2
+-
M
mobile/android/android-components/plugins/dependencies/build.gradle
 | 
2
+-
M
mobile/android/android-components/plugins/publicsuffixlist/build.gradle
 | 
2
+-
M
mobile/android/fenix/plugins/apksize/build.gradle
 | 
2
+-
M
mobile/android/shared-settings.gradle
 | 
6
++++--

5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/mobile/android/android-components/plugins/config/build.gradle b/mobile/android/android-components/plugins/config/build.gradle
@@ -6,7 +6,7 @@ plugins {
     alias(libs.plugins.kotlin.dsl)
 }
 
-buildDir = "${gradle.mozconfig.topobjdir}/gradle/build/mobile/android/android-components/plugins/config"
+layout.buildDirectory.set(file("${gradle.mozconfig.topobjdir}/gradle/build/mobile/android/android-components/plugins/config"))
 
 repositories {
     gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
diff --git a/mobile/android/android-components/plugins/dependencies/build.gradle b/mobile/android/android-components/plugins/dependencies/build.gradle
@@ -6,7 +6,7 @@ plugins {
     alias(libs.plugins.kotlin.dsl)
 }
 
-buildDir = "${gradle.mozconfig.topobjdir}/gradle/build/mobile/android/android-components/plugins/dependencies"
+layout.buildDirectory.set(file("${gradle.mozconfig.topobjdir}/gradle/build/mobile/android/android-components/plugins/dependencies"))
 
 repositories {
         gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
diff --git a/mobile/android/android-components/plugins/publicsuffixlist/build.gradle b/mobile/android/android-components/plugins/publicsuffixlist/build.gradle
@@ -6,7 +6,7 @@ plugins {
     alias(libs.plugins.kotlin.dsl)
 }
 
-buildDir = "${gradle.mozconfig.topobjdir}/gradle/build/mobile/android/android-components/plugins/publicsuffixlist"
+layout.buildDirectory.set(file("${gradle.mozconfig.topobjdir}/gradle/build/mobile/android/android-components/plugins/publicsuffixlist"))
 
 repositories {
         gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
diff --git a/mobile/android/fenix/plugins/apksize/build.gradle b/mobile/android/fenix/plugins/apksize/build.gradle
@@ -6,7 +6,7 @@ plugins {
     alias(libs.plugins.kotlin.dsl)
 }
 
-buildDir = "${gradle.mozconfig.topobjdir}/gradle/build/mobile/android/fenix/plugins/apksize"
+layout.buildDirectory.set(file("${gradle.mozconfig.topobjdir}/gradle/build/mobile/android/fenix/plugins/apksize"))
 
 repositories {
         gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
diff --git a/mobile/android/shared-settings.gradle b/mobile/android/shared-settings.gradle
@@ -2,9 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import java.time.format.DateTimeFormatter
+
 import org.yaml.snakeyaml.Yaml
 
+import java.time.format.DateTimeFormatter
+
 buildscript {
     if (!gradle.root.hasProperty("mozconfig")){
         apply from: file('./gradle/mozconfig.gradle')
@@ -203,7 +205,7 @@ gradle.projectsLoaded { ->
             // This is consistent with existing gradle / taskcluster
             // configurations but less consistent with the result of the
             // non-gradle build system.
-            buildDir = topObjPath.resolve("gradle/build").resolve(relativePath)
+            project.layout.buildDirectory.set(topObjPath.resolve("gradle/build").resolve(relativePath).toFile())
         }
     }
 }