[tbb-commits] [tor-browser-build/master] Bug 40172: Remove gradle 6.5.1 from android-toolchain

[sysrqb at torproject.org]

commit 13a415f6b59d637e80315147c579f4f8ea8fa547
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Mar 4 19:41:58 2021 +0100

    Bug 40172: Remove gradle 6.5.1 from android-toolchain
---
 projects/android-toolchain/build  | 2 --
 projects/android-toolchain/config | 4 ----
 projects/fenix/build              | 6 ++++--
 projects/fenix/config             | 3 +++
 projects/gradle/config            | 1 +
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index a0d5ee8..ff132be 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -20,8 +20,6 @@ unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME
 unzip -qq [% c("input_files_by_name/gradle511") %] -d $GRADLE_HOME
 # application-services is using a comparatively new Gradle, bundle it, too.
 unzip -qq [% c("input_files_by_name/gradle63") %] -d $GRADLE_HOME
-# Fenix switched to a fairly recent Gradle, add it as well.
-unzip -qq [% c("input_files_by_name/gradle651") %] -d $GRADLE_HOME
 
 # NDK Archive
 for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do
diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config
index f3214ab..648b1d9 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -32,7 +32,6 @@ var:
   android_ndk_version: 21
   android_ndk_version_old: 20
   android_ndk_revision: d
-  gradle651: 6.5.1
   gradle63: 6.3
   gradle564: 5.6.4
   gradle511: 5.1.1
@@ -62,9 +61,6 @@ input_files:
   - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip'
     name: android_ndk_compiler_old
     sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0
-  - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle651") %]-bin.zip
-    name: gradle651
-    sha256sum: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a
   - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle63") %]-bin.zip
     name: gradle63
     sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768
diff --git a/projects/fenix/build b/projects/fenix/build
index c91dce3..c2f6f32 100644
--- a/projects/fenix/build
+++ b/projects/fenix/build
@@ -6,6 +6,8 @@ builddir=/var/tmp/build/[% project %]
 mkdir -p $distdir/[% project %]
 mkdir -p /var/tmp/build
 
+tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %]
+
 cat > get-moz-build-date << "EOF"
 [% INCLUDE "get-moz-build-date" %]
 EOF
@@ -40,7 +42,7 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/
 # XXX We need the build variant in lower case. Do something smarter here.
 v=[% c("variant") %]
 [% IF c("var/fetch_gradle_dependencies") %]
-  $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,}
+  $GRADLE_HOME/gradle/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,}
 [% ELSE %]
   # Add our localized strings
   [% FOREACH lang = c('var/locales_mobile');
@@ -65,7 +67,7 @@ v=[% c("variant") %]
   fi
 
   version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version") %]-[% c("variant") %])'
-  $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,}
+  $GRADLE_HOME/gradle/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,}
   cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %]
   cp app/build/outputs/apk/androidTest/${v,}/app-${v,}-androidTest.apk $distdir/[% project %]
 
diff --git a/projects/fenix/config b/projects/fenix/config
index ae81e3f..79c9cd1 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -18,6 +18,7 @@ var:
   # Switch to make it easier to grab all dependencies during a dry-run.
   # Note: Use the commit that integrates Tor.
   fetch_gradle_dependencies: 0
+  gradle_version: 6.5.1
 
 targets:
   nightly:
@@ -29,6 +30,8 @@ input_files:
   - project: container-image
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
+  - project: gradle
+    name: gradle
   - name: android-components
     project: android-components
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
diff --git a/projects/gradle/config b/projects/gradle/config
index 4ad4a16..3f0f412 100644
--- a/projects/gradle/config
+++ b/projects/gradle/config
@@ -9,6 +9,7 @@ var:
     - unzip
   gradle_sha256sum:
     6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f
+    6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a
     6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac
 
 input_files: