diff --git a/build/sparse-profiles/taskgraph b/build/sparse-profiles/taskgraph index afbc860021c7..5922768d0e49 100644 --- a/build/sparse-profiles/taskgraph +++ b/build/sparse-profiles/taskgraph @@ -62,6 +62,7 @@ path:testing/web-platform/mozilla/tests/ glob:testing/web-platform/*.py # For scheduling android-gradle-dependencies. +path:gradle/wrapper/gradle-wrapper.properties path:mobile/android/config/ glob:**/*.gradle diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9530d6..9bbc975c742b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc253b857..37f853b1c84d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME 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 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3b0d4f..faf93008b77e 100755 --- a/gradlew +++ b/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # 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. # * 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. diff --git a/mobile/android/android-components/gradle/wrapper/gradle-wrapper.jar b/mobile/android/android-components/gradle/wrapper/gradle-wrapper.jar index a4b76b9530d6..9bbc975c742b 100644 Binary files a/mobile/android/android-components/gradle/wrapper/gradle-wrapper.jar and b/mobile/android/android-components/gradle/wrapper/gradle-wrapper.jar differ diff --git a/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties b/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties index e18bc253b857..37f853b1c84d 100644 --- a/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME 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 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/mobile/android/android-components/gradlew b/mobile/android/android-components/gradlew index f3b75f3b0d4f..faf93008b77e 100755 --- a/mobile/android/android-components/gradlew +++ b/mobile/android/android-components/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # 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. # * 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. diff --git a/mobile/android/fenix/gradle/wrapper/gradle-wrapper.jar b/mobile/android/fenix/gradle/wrapper/gradle-wrapper.jar index a4b76b9530d6..9bbc975c742b 100644 Binary files a/mobile/android/fenix/gradle/wrapper/gradle-wrapper.jar and b/mobile/android/fenix/gradle/wrapper/gradle-wrapper.jar differ diff --git a/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties b/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties index e18bc253b857..37f853b1c84d 100644 --- a/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME 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 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/mobile/android/fenix/gradlew b/mobile/android/fenix/gradlew index f3b75f3b0d4f..faf93008b77e 100755 --- a/mobile/android/fenix/gradlew +++ b/mobile/android/fenix/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # 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. # * 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. diff --git a/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.jar b/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.jar index a4b76b9530d6..9bbc975c742b 100644 Binary files a/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.jar and b/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties index e18bc253b857..37f853b1c84d 100644 --- a/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME 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 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/mobile/android/focus-android/gradlew b/mobile/android/focus-android/gradlew index f3b75f3b0d4f..faf93008b77e 100755 --- a/mobile/android/focus-android/gradlew +++ b/mobile/android/focus-android/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # 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. # * 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. diff --git a/taskcluster/kinds/toolchain/android.yml b/taskcluster/kinds/toolchain/android.yml index 297044d7c73a..f5a70c9a4677 100644 --- a/taskcluster/kinds/toolchain/android.yml +++ b/taskcluster/kinds/toolchain/android.yml @@ -231,14 +231,15 @@ linux64-android-gradle-dependencies: script: android-gradle-dependencies.sh sparse-profile: null resources: - - 'taskcluster/scripts/misc/android-gradle-dependencies/**' - '*.gradle' + - 'gradle/wrapper/gradle-wrapper.properties' - '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/common*' - 'mobile/android/gradle.configure' - - 'mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt' - - 'mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt' + - 'taskcluster/scripts/misc/android-gradle-dependencies/**' toolchain-artifact: public/build/android-gradle-dependencies.tar.zst toolchain-alias: android-gradle-dependencies fetches: @@ -263,14 +264,15 @@ linux64-android-gradle-dependencies-lite: script: android-gradle-dependencies-lite.sh sparse-profile: null resources: - - 'taskcluster/scripts/misc/android-gradle-dependencies/**' - '*.gradle' + - 'gradle/wrapper/gradle-wrapper.properties' - '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/common*' - 'mobile/android/gradle.configure' - - 'mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt' - - 'mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt' + - 'taskcluster/scripts/misc/android-gradle-dependencies/**' toolchain-artifact: public/build/android-gradle-dependencies.tar.zst toolchain-alias: android-gradle-dependencies-lite fetches: