[tor-commits] [tor-browser-build/master] Bug 40311: Make the list of components updates for switch to mozilla90-based Fenix (beta 4)

[sysrqb at torproject.org]

commit dac2b35d64153c183165d0955b0e42f502798794
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Jun 18 12:14:26 2021 +0200

    Bug 40311: Make the list of components updates for switch to mozilla90-based Fenix (beta 4)
---
 projects/android-components/config                          | 4 ++--
 projects/application-services/config                        | 2 +-
 projects/application-services/list_toolchain_updates_checks | 4 ++--
 projects/fenix/config                                       | 4 ++--
 projects/geckoview/config                                   | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/projects/android-components/config b/projects/android-components/config
index 0d8d88c..bf3b8a4 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -58,8 +58,8 @@ input_files:
 
 steps:
   list_toolchain_updates:
-    #git_url: https://github.com/mozilla-mobile/android-components.git
-    #git_hash: v75.0.22
+    git_url: https://github.com/mozilla-mobile/android-components.git
+    git_hash: v90.0.7
     #tag_gpg_id: 0
     var:
       container:
diff --git a/projects/application-services/config b/projects/application-services/config
index efbe321..93f8f5c 100644
--- a/projects/application-services/config
+++ b/projects/application-services/config
@@ -94,7 +94,7 @@ input_files:
 
 steps:
   list_toolchain_updates:
-    #git_hash: 'v74.0.1'
+    git_hash: 'v77.0.2'
     input_files: []
     var:
       container:
diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks
index 69c232c..b028d10 100644
--- a/projects/application-services/list_toolchain_updates_checks
+++ b/projects/application-services/list_toolchain_updates_checks
@@ -74,7 +74,7 @@ check_update_needed sqlcipher "$needed" "$current"
 
 # android-gradle-plugin
 read -d '' p << 'EOF' || true
-if (m/^\\s*ext\\.android_gradle_plugin_version\\s=\\s'([^']*)'/) {
+if (m/^\\s*android_gradle_plugin_version\\s=\\s'([^']*)'/) {
   print $1;
   exit;
 }
@@ -86,7 +86,7 @@ check_update_needed android-gradle-plugin "$needed" "$current"
 
 # android-components
 read -d '' p << 'EOF' || true
-if (m/^\\s*ext\\.android_components_version\\s=\\s'([^']*)'/) {
+if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) {
   print $1;
   exit;
 }
diff --git a/projects/fenix/config b/projects/fenix/config
index a25aaa0..296ab7c 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -56,8 +56,8 @@ input_files:
 
 steps:
   list_toolchain_updates:
-    #git_url: https://github.com/mozilla-mobile/fenix.git
-    #git_hash: v89.1.1
+    git_url: https://github.com/mozilla-mobile/fenix.git
+    git_hash: v90.0.0-beta.4
     tag_gpg_id: 0
     input_files: []
     var:
diff --git a/projects/geckoview/config b/projects/geckoview/config
index 0695277..c46901e 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -138,9 +138,9 @@ steps:
           - torbrowser-android-x86_64
 
   list_toolchain_updates:
-    #git_url: https://github.com/mozilla/gecko-dev.git
-    # 89.0b10
-    #git_hash: 702dfbec3d62823d0dfca870995540383ab39183
+    git_url: https://github.com/mozilla/gecko-dev.git
+    # 90.0b9
+    git_hash: 92485800ccb404788bfd215e59c3850b314d3905
     tag_gpg_id: 0
     input_files: []
     var: