corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1950694 - Update Gradle to version 8.13. r=android-reviewers,mcarare

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D239810
This commit is contained in:
Ryan VanderMeulen
2025-03-03 23:10:43 +00:00
parent de5da3721b
commit fad78190ee
14 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/sparse-profiles/taskgraph
View File

@@ -62,6 +62,7 @@ path:testing/web-platform/mozilla/tests/
glob:testing/web-platform/*.py glob:testing/web-platform/*.py
# For scheduling android-gradle-dependencies. # For scheduling android-gradle-dependencies.
path:gradle/wrapper/gradle-wrapper.properties
path:mobile/android/config/ path:mobile/android/config/
glob:**/*.gradle glob:**/*.gradle

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
gradlew vendored
View File

@@ -205,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command: # Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped. # and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line. # treated as '${Hostname}' itself on the command line.

BIN
mobile/android/android-components/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
mobile/android/android-components/gradlew vendored
View File

@@ -205,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command: # Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped. # and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line. # treated as '${Hostname}' itself on the command line.

BIN
mobile/android/fenix/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
mobile/android/fenix/gradlew vendored
View File

@@ -205,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command: # Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped. # and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line. # treated as '${Hostname}' itself on the command line.

BIN
mobile/android/focus-android/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
mobile/android/focus-android/gradlew vendored
View File

@@ -205,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command: # Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped. # and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line. # treated as '${Hostname}' itself on the command line.

14
taskcluster/kinds/toolchain/android.yml
View File

@@ -231,14 +231,15 @@ linux64-android-gradle-dependencies:
script: android-gradle-dependencies.sh script: android-gradle-dependencies.sh
sparse-profile: null sparse-profile: null
resources: resources:
- 'taskcluster/scripts/misc/android-gradle-dependencies/**'
- '*.gradle' - '*.gradle'
- 'gradle/wrapper/gradle-wrapper.properties'
- 'mobile/android/**/*.gradle' - 'mobile/android/**/*.gradle'
- 'mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt'
- 'mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt'
- 'mobile/android/config/mozconfigs/android-arm-gradle-dependencies/**' - 'mobile/android/config/mozconfigs/android-arm-gradle-dependencies/**'
- 'mobile/android/config/mozconfigs/common*' - 'mobile/android/config/mozconfigs/common*'
- 'mobile/android/gradle.configure' - 'mobile/android/gradle.configure'
- 'mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt' - 'taskcluster/scripts/misc/android-gradle-dependencies/**'
- 'mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt'
toolchain-artifact: public/build/android-gradle-dependencies.tar.zst toolchain-artifact: public/build/android-gradle-dependencies.tar.zst
toolchain-alias: android-gradle-dependencies toolchain-alias: android-gradle-dependencies
fetches: fetches:
@@ -263,14 +264,15 @@ linux64-android-gradle-dependencies-lite:
script: android-gradle-dependencies-lite.sh script: android-gradle-dependencies-lite.sh
sparse-profile: null sparse-profile: null
resources: resources:
- 'taskcluster/scripts/misc/android-gradle-dependencies/**'
- '*.gradle' - '*.gradle'
- 'gradle/wrapper/gradle-wrapper.properties'
- 'mobile/android/**/*.gradle' - 'mobile/android/**/*.gradle'
- 'mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt'
- 'mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt'
- 'mobile/android/config/mozconfigs/android-arm-gradle-dependencies/**' - 'mobile/android/config/mozconfigs/android-arm-gradle-dependencies/**'
- 'mobile/android/config/mozconfigs/common*' - 'mobile/android/config/mozconfigs/common*'
- 'mobile/android/gradle.configure' - 'mobile/android/gradle.configure'
- 'mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt' - 'taskcluster/scripts/misc/android-gradle-dependencies/**'
- 'mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt'
toolchain-artifact: public/build/android-gradle-dependencies.tar.zst toolchain-artifact: public/build/android-gradle-dependencies.tar.zst
toolchain-alias: android-gradle-dependencies-lite toolchain-alias: android-gradle-dependencies-lite
fetches: fetches: