tor-browser

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

Bug 1980525 - Rename getArtifactId to computeArtifactId in build files. r=geckoview-reviewers,android-reviewers,ohall,nalexander

This change renames the `getArtifactId` function to `computeArtifactId` in both `mobile/android/android-components/components/browser/engine-gecko/build.gradle` and `mobile/android/geckoview/build.gradle`. This avoids potential conflicts with standard Gradle getters or properties and clarifies that the value is computed based on configuration.

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

Diffstat:
M
mobile/android/android-components/components/browser/engine-gecko/build.gradle
 | 
10
+++++-----
M
mobile/android/geckoview/build.gradle
 | 
6
+++---

2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/mobile/android/android-components/components/browser/engine-gecko/build.gradle b/mobile/android/android-components/components/browser/engine-gecko/build.gradle
@@ -154,7 +154,7 @@ def getArtifactSuffix() {
     return suffix
 }
 
-def getArtifactId() {
+def computeArtifactId() {
     def id = "geckoview" + getArtifactSuffix()
 
     if (!gradle.mozconfig.substs.MOZ_ANDROID_GECKOVIEW_LITE) {
@@ -177,9 +177,9 @@ def getArtifactId() {
 def getGeckoViewDependency() {
     // on try, relax geckoview version pin to allow for --use-existing-task
     if ('https://hg.mozilla.org/try' == System.env.GECKO_HEAD_REPOSITORY) {
-        rootProject.logger.lifecycle("Getting geckoview on try: ${getArtifactId()}:+")
-        return "org.mozilla.geckoview:${getArtifactId()}:+"
+        rootProject.logger.lifecycle("Getting geckoview on try: ${computeArtifactId()}:+")
+        return "org.mozilla.geckoview:${computeArtifactId()}:+"
     }
-    rootProject.logger.lifecycle("Getting geckoview: ${getArtifactId()}:${getVersionNumber()}")
-    return "org.mozilla.geckoview:${getArtifactId()}:${getVersionNumber()}"
+    rootProject.logger.lifecycle("Getting geckoview: ${computeArtifactId()}:${getVersionNumber()}")
+    return "org.mozilla.geckoview:${computeArtifactId()}:${getVersionNumber()}"
 }
diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle
@@ -198,7 +198,7 @@ configurations {
             }
             afterEvaluate {
                 // Implicit capability
-                capability("org.mozilla.geckoview:${getArtifactId()}:${projectVersion}")
+                capability("org.mozilla.geckoview:${computeArtifactId()}:${projectVersion}")
             }
         }
     }
@@ -397,7 +397,7 @@ version = getVersionNumber()
 println("GeckoView version = " + version)
 group = 'org.mozilla.geckoview'
 
-def getArtifactId() {
+def computeArtifactId() {
     def id = "geckoview" + project.ext.artifactSuffix
 
     if (!mozconfig.substs.MOZ_ANDROID_GECKOVIEW_LITE) {
@@ -425,7 +425,7 @@ publishing {
 
                 pom {
                     afterEvaluate {
-                        artifactId = getArtifactId()
+                        artifactId = computeArtifactId()
                     }
 
                     url = 'https://geckoview.dev'