commit c78b311dc7ddb8e552b428bbf534078c9f9de4d9 Author: Nicolas Vigier boklm@torproject.org Date: Mon Oct 11 17:46:09 2021 +0200

Bug 40372: Make the list of android components updates for switch to mozilla93-based Fenix --- projects/android-components/config | 2 +- projects/android-components/list_toolchain_updates_checks | 2 +- projects/application-services/config | 2 +- projects/fenix/config | 2 +- projects/fenix/list_toolchain_updates_checks | 2 +- projects/geckoview/config | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/projects/android-components/config b/projects/android-components/config index 0047529..b789049 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -58,7 +58,7 @@ input_files: steps: list_toolchain_updates: git_url: https://github.com/mozilla-mobile/android-components.git - git_hash: releases/91.0 + git_hash: releases/93.0 #tag_gpg_id: 0 var: container: diff --git a/projects/android-components/list_toolchain_updates_checks b/projects/android-components/list_toolchain_updates_checks index a46afb4..c11b9b6 100644 --- a/projects/android-components/list_toolchain_updates_checks +++ b/projects/android-components/list_toolchain_updates_checks @@ -63,7 +63,7 @@ check_update_needed glean_parser "$needed" "$current"

# gradle read -d '' p << 'EOF' || true -if (m|distributionUrl=https\\://services.gradle.org/distributions/gradle-(.*)-all.zip|) { +if (m|distributionUrl=https\\://services.gradle.org/distributions/gradle-(.*)-bin.zip|) { print $1; exit; } diff --git a/projects/application-services/config b/projects/application-services/config index c41a812..71dcb4f 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -90,7 +90,7 @@ input_files:

steps: list_toolchain_updates: - git_hash: 'v79.0.0' + git_hash: 'v82.1.0' input_files: [] var: container: diff --git a/projects/fenix/config b/projects/fenix/config index c38ff99..f2490b0 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -59,7 +59,7 @@ input_files: steps: list_toolchain_updates: git_url: https://github.com/mozilla-mobile/fenix.git - git_hash: releases_v91.0.0 + git_hash: releases_v93.0.0 #tag_gpg_id: 0 input_files: [] var: diff --git a/projects/fenix/list_toolchain_updates_checks b/projects/fenix/list_toolchain_updates_checks index 1a75e28..221e7c3 100644 --- a/projects/fenix/list_toolchain_updates_checks +++ b/projects/fenix/list_toolchain_updates_checks @@ -50,7 +50,7 @@ check_update_needed minSdkVersion "$needed" "$current"

# gradle read -d '' p << 'EOF' || true -if (m|distributionUrl=https\\://services.gradle.org/distributions/gradle-(.*)-all.zip|) { +if (m|distributionUrl=https\\://services.gradle.org/distributions/gradle-(.*)-bin.zip|) { print $1; exit; } diff --git a/projects/geckoview/config b/projects/geckoview/config index 08d906f..62a499b 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -133,8 +133,7 @@ steps:

list_toolchain_updates: git_url: https://github.com/mozilla/gecko-dev.git - # beta - git_hash: beta + git_hash: release tag_gpg_id: 0 input_files: [] var: