From 0936dc81f7fa94989a273554dda24fff8d86929d Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@torproject.org>
Date: Wed, 28 Apr 2021 11:11:51 +0200
Subject: [PATCH 1/3] Bug 40290: Update components for mozilla89-based Fenix
 (GeckoView part)

---
 projects/cbindgen/config  | 10 ++++++----
 projects/geckoview/config |  2 +-
 projects/rust/config      |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/projects/cbindgen/config b/projects/cbindgen/config
index 43c2fb89..125d0e43 100644
--- a/projects/cbindgen/config
+++ b/projects/cbindgen/config
@@ -8,15 +8,17 @@ var:
   cbindgen_version: 0.14.1
   cbindgen_hash: 0761b9bbe48d01ded1bbec45bbeea5544b3b1002
   cbindgen_vendor_hash: 1c500bc1b8de4eb400f90a528c4b5c6b2c7357e401a95c5354469a18fd365dbc
+  cbindgen_vendor_people_tpo_user: gk
   container:
     use_container: 1
 
 targets:
   android:
     var:
-      cbindgen_version: 0.16.0
-      cbindgen_hash: a00b4215a907601680f6e9acaf93df1cbafa8ded
-      cbindgen_vendor_hash: f470dcf6a60374f07786491fb2971e8b96f9b7ff18956eb24c4e2577e55440d6
+      cbindgen_version: 0.19.0
+      cbindgen_hash: d9e490ce8b836194595bd30611253a7028059da2
+      cbindgen_vendor_hash: 7d99c195b180e28ca7499d8744d020b864f952a5ba699716707aec9a06b4ee8b
+      cbindgen_vendor_people_tpo_user: boklm
 
 input_files:
   - project: container-image
@@ -25,7 +27,7 @@ input_files:
   # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources.
   # Use `make cargo_vendor-cbindgen` or `make cargo_vendor-cbindgen-android`
   # (for the Android version) to re-generate the vendor tarball
-  - URL: https://people.torproject.org/~gk/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2
+  - URL: https://people.torproject.org/~[% c('var/cbindgen_vendor_people_tpo_user') %]/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2
     sha256sum: '[% c("var/cbindgen_vendor_hash") %]'
 
 steps:
diff --git a/projects/geckoview/config b/projects/geckoview/config
index a48631bc..e45bc6fe 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  geckoview_version: 88.0.1
+  geckoview_version: 89.0b2
   torbrowser_branch: 10.5
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:
diff --git a/projects/rust/config b/projects/rust/config
index 0095a8a8..4060488a 100644
--- a/projects/rust/config
+++ b/projects/rust/config
@@ -11,8 +11,8 @@ var:
 targets:
   android:
     var:
-      current_version: 1.50.0
-      previous_version: 1.49.0
+      current_version: 1.51.0
+      previous_version: 1.50.0
       arch_deps:
         - libssl-dev
         - pkg-config
-- 
GitLab


From e69cbb78884ee18b4197179564fcc68110986eeb Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@torproject.org>
Date: Thu, 29 Apr 2021 16:51:40 +0200
Subject: [PATCH 2/3] Bug 40290: Update components for mozilla89-based Fenix
 (fenix part)

---
 projects/fenix/list_toolchain_updates_checks | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/fenix/list_toolchain_updates_checks b/projects/fenix/list_toolchain_updates_checks
index 1b8e02c0..1a75e288 100644
--- a/projects/fenix/list_toolchain_updates_checks
+++ b/projects/fenix/list_toolchain_updates_checks
@@ -20,7 +20,7 @@ if (m/const\\s+val\\s+targetSdkVersion\\s+=\\s+([^"]+)/) {
 }
 EOF
 needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p")
-current=29
+current=30
 check_update_needed targetSdkVersion "$needed" "$current"
 
 
@@ -32,7 +32,7 @@ if (m/const\\s+val\\s+compileSdkVersion\\s+=\\s+([^"]+)/) {
 }
 EOF
 needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p")
-current=29
+current=30
 check_update_needed compileSdkVersion "$needed" "$current"
 
 
-- 
GitLab


From cfdb7618c648ddfe42a93721f255e50bcef2fcc7 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@torproject.org>
Date: Thu, 13 May 2021 10:41:37 +0200
Subject: [PATCH 3/3] Bug 40290: Update components for mozilla89-based Fenix
 (android-components part)

---
 projects/android-components/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/android-components/config b/projects/android-components/config
index 3b709a6d..3ee85e69 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -8,7 +8,7 @@ gpg_keyring: torbutton.gpg
 variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'
 
 var:
-  android_components_version: 74.0.13
+  android_components_version: 75.0.11
   torbrowser_branch: 10.5
   container:
     use_container: 1
-- 
GitLab