tbb-commits May 2021

tbb-commits@lists.torproject.org

4 participants
352 discussions

[tor-browser-build/maint-10.0-android] Bug 40251: Fix indentation in projects/android-toolchain/build
by sysrqb＠torproject.org 06 May '21

06 May '21

commit 4fe725400c5d9ad9c41ced7c4a944c6f0aa3d3ad Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 23 15:41:19 2021 +0100 Bug 40251: Fix indentation in projects/android-toolchain/build --- projects/android-toolchain/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index cd6caec..e352b67 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -20,7 +20,7 @@ unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME # so we only have to take care of one. See: #33557 (comment 2674649). cd $NDK_HOME/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]/toolchains/llvm/prebuilt/linux-x86_64/bin for f in `ls arm-linux-androideabi-*`; do - ln -s $f ${f//arm-linux-androideabi/armv7a-linux-androideabi} + ln -s $f ${f//arm-linux-androideabi/armv7a-linux-androideabi} done # Tool Archives

1 0

[tor-browser-build/maint-10.0-android] Bug 34108: Add scripts to check for needed toolchain updates
by sysrqb＠torproject.org 06 May '21

06 May '21

commit 9696b8e15ce1c766311c43b821997654e074af08 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 5 13:15:17 2021 +0200 Bug 34108: Add scripts to check for needed toolchain updates Checking toolchain updates can be done with the following commands: make list_toolchain_updates-geckoview make list_toolchain_updates-application-services make list_toolchain_updates-android-components make list_toolchain_updates-fenix --- Makefile | 12 ++ projects/android-components/config | 20 ++ .../list_toolchain_updates_checks | 85 +++++++++ projects/android-toolchain/config | 3 +- projects/application-services/config | 7 + .../list_toolchain_updates_checks | 97 ++++++++++ projects/common/list_toolchain_updates | 38 ++++ projects/fenix/config | 7 + projects/fenix/list_toolchain_updates_checks | 73 ++++++++ projects/geckoview/config | 5 + projects/geckoview/list_toolchain_updates_checks | 202 +++++++++++++++++++++ projects/glean/config | 9 + projects/llvm-project/config | 2 +- rbm.conf | 3 + 14 files changed, 561 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7e2e104..fa613e1 100644 --- a/Makefile +++ b/Makefile @@ -201,6 +201,18 @@ dmg2mar-alpha: submodule-update tools/update-responses/download_missing_versions alpha CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha +list_toolchain_updates-fenix: submodule-update + $(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + +list_toolchain_updates-android-components: submodule-update + $(rbm) build android-components --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + +list_toolchain_updates-application-services: submodule-update + $(rbm) build application-services --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + +list_toolchain_updates-geckoview: submodule-update + $(rbm) build geckoview --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + submodule-update: git submodule update --init diff --git a/projects/android-components/config b/projects/android-components/config index eb1b7de..c9c5d55 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -50,3 +50,23 @@ input_files: - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2 sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2 enable: '[% !c("var/fetch_gradle_dependencies") %]' + +steps: + list_toolchain_updates: + var: + container: + use_container: 0 + get_glean_version: | + #!/bin/bash + read -d '' p << 'EOF' || true + if (m/const\\sval\\smozilla_glean\\s=\\s"([^"]+)"/) { + print $1; + exit; + } + EOF + perl -ne "$p" < buildSrc/src/main/java/Dependencies.kt + glean_version: '[% exec(c("var/get_glean_version")) %]' + input_files: + - name: glean + project: glean + pkg_type: src diff --git a/projects/android-components/list_toolchain_updates_checks b/projects/android-components/list_toolchain_updates_checks new file mode 100644 index 0000000..a46afb4 --- /dev/null +++ b/projects/android-components/list_toolchain_updates_checks @@ -0,0 +1,85 @@ +#!/bin/bash + +# compileSdkVersion +read -d '' p << 'EOF' || true +if (m/compileSdkVersion:\\s+(.*)$/) { + print $1; + exit; +} +EOF +needed=$(cat .config.yml | perl -ne "$p") +current=30 +check_update_needed compileSdkVersion "$needed" "$current" + + +# targetSdkVersion +read -d '' p << 'EOF' || true +if (m/targetSdkVersion:\\s+(.*)$/) { + print $1; + exit; +} +EOF +needed=$(cat .config.yml | perl -ne "$p") +current=30 +check_update_needed targetSdkVersion "$needed" "$current" + + +# minSdkVersion +read -d '' p << 'EOF' || true +if (m/minSdkVersion:\\s+(.*)$/) { + print $1; + exit; +} +EOF +needed=$(cat .config.yml | perl -ne "$p") +current=21 +check_update_needed minSdkVersion "$needed" "$current" + + +# application-services +read -d '' p << 'EOF' || true +if (m/const\\sval\\smozilla_appservices\\s=\\s"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Dependencies.kt | perl -ne "$p") +current='[% pc("application-services", "version") %]' +check_update_needed application-services "$needed" "$current" + + +# glean_parser +read -d '' p << 'EOF' || true +if (m/^\\s*"glean_parser==([^"]+)",/) { + print $1; + exit; +} +EOF +tar xf $rootdir/[% c('input_files_by_name/glean') %] +needed=$(cat glean-[% c("var/glean_version") %]/glean-core/python/setup.py | perl -ne "$p") +current='[% c("var/glean_parser") %]' +check_update_needed glean_parser "$needed" "$current" + + +# gradle +read -d '' p << 'EOF' || true +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { + print $1; + exit; +} +EOF +needed=$(cat gradle/wrapper/gradle-wrapper.properties | perl -ne "$p") +current='[% c("var/gradle_version") %]' +check_update_needed gradle "$needed" "$current" + + +# android-gradle-plugin +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+android_gradle_plugin\\s+=\\s+"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Dependencies.kt | perl -ne "$p") +current='4.0.1' +check_update_needed android-gradle-plugin "$needed" "$current" diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index dc30b4d..6d78b37 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -31,6 +31,7 @@ var: android_platform_revision_new: 03 android_ndk_version: 21 android_ndk_revision: d + sdk_tools_version: 4333796 input_files: - project: container-image - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' @@ -54,7 +55,7 @@ input_files: - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("version") %]-linux.zip' name: platform_tools sha256sum: 633b6dfa245f5dc58d15da9ead655bcd14de5784196ec0f0dc7e37a5acb61be4 - - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip' + - URL: '[% c("var/google_repo") %]/sdk-tools-linux-[% c("var/sdk_tools_version") %].zip' name: android_sdk_tools sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]-linux-x86_64.zip' diff --git a/projects/application-services/config b/projects/application-services/config index 951d5b0..6a80ffc 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -81,3 +81,10 @@ input_files: - filename: viaduct-workaround.patch - filename: viaduct-workaround2.patch - filename: update-cargo-lock.patch + +steps: + list_toolchain_updates: + input_files: [] + var: + container: + use_container: 0 diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks new file mode 100644 index 0000000..69c232c --- /dev/null +++ b/projects/application-services/list_toolchain_updates_checks @@ -0,0 +1,97 @@ +#!/bin/bash + +# ndkVersion +read -d '' p << 'EOF' || true +if (m/^\\s*ndkVersion:\\s"([^"]*)",/) { + print $1; + exit; +} +EOF +needed=$(cat build.gradle | perl -ne "$p") +current='21.3.6528147' +check_update_needed ndkVersion "$needed" "$current" + + +# compileSdkVersion +read -d '' p << 'EOF' || true +if (m/^\\s*compileSdkVersion:\\s([^"]*),/) { + print $1; + exit; +} +EOF +needed=$(cat build.gradle | perl -ne "$p") +current=29 +check_update_needed compileSdkVersion "$needed" "$current" + + +# minSdkVersion +read -d '' p << 'EOF' || true +if (m/^\\s*minSdkVersion:\\s([^"]*),/) { + print $1; + exit; +} +EOF +needed=$(cat build.gradle | perl -ne "$p") +current=21 +check_update_needed minSdkVersion "$needed" "$current" + + +# gradle +read -d '' p << 'EOF' || true +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { + print $1; + exit; +} +EOF +needed=$(cat gradle/wrapper/gradle-wrapper.properties | perl -ne "$p") +current='[% c("var/gradle_version") %]' +check_update_needed gradle "$needed" "$current" + + +# nss-nspr +read -d '' p << 'EOF' || true +if (m/NSS_ARCHIVE="nss-(.*-with-nspr-.*)\\.tar\\.gz"/) { + print $1; + exit; +} +EOF +needed=$(cat libs/build-all.sh | perl -ne "$p") +current='[% pc("nss", "version") %]-with-nspr-[% pc("nss", "nspr_version") %]' +check_update_needed nss-nspr "$needed" "$current" + + +# sqlcipher +read -d '' p << 'EOF' || true +if (m/SQLCIPHER_VERSION="([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat libs/build-all.sh | perl -ne "$p") +current='[% pc("sqlcipher", "version") %]' +check_update_needed sqlcipher "$needed" "$current" + + +# android-gradle-plugin +read -d '' p << 'EOF' || true +if (m/^\\s*ext\\.android_gradle_plugin_version\\s=\\s'([^']*)'/) { + print $1; + exit; +} +EOF +needed=$(cat build.gradle | perl -ne "$p") +current='4.0.1' +check_update_needed android-gradle-plugin "$needed" "$current" + + +# android-components +read -d '' p << 'EOF' || true +if (m/^\\s*ext\\.android_components_version\\s=\\s'([^']*)'/) { + print $1; + exit; +} +EOF +needed=$(cat build.gradle | perl -ne "$p") +current=71.0.0 +check_update_needed android-components "$needed" "$current" + diff --git a/projects/common/list_toolchain_updates b/projects/common/list_toolchain_updates new file mode 100644 index 0000000..4cfd829 --- /dev/null +++ b/projects/common/list_toolchain_updates @@ -0,0 +1,38 @@ +#!/usr/bin/bash + +set -e + +rootdir="$(pwd)" +no_updates="$rootdir/no_updates.txt" +updates="$rootdir/updates.txt" + +tar -xf [% project %]-[% c('version') %].tar.gz +cd [% project %]-[% c('version') %] + +function check_update_needed() { + name="$1" + v1="$2" + v2="$3" + if test "$v1" = "$v2" + then + echo "* $name ($v1)" >> "$no_updates" + else + echo "* $name needs to be updated to $v1 (currently at $v2)" >> "$updates" + fi +} + +[% INCLUDE list_toolchain_updates_checks %] + +echo '### Component: [% project %] ([% c("git_hash") %])' + +if test -f "$updates" +then + echo "The following components need to be updated:" + cat "$updates" + echo +fi +if test -f "$no_updates" +then + echo "The following components don't need to be updated:" + cat "$no_updates" +fi diff --git a/projects/fenix/config b/projects/fenix/config index cabdb55..a72fff4 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -61,3 +61,10 @@ input_files: name: tor-android-service - project: tor-onion-proxy-library name: topl + +steps: + list_toolchain_updates: + input_files: [] + var: + container: + use_container: 0 diff --git a/projects/fenix/list_toolchain_updates_checks b/projects/fenix/list_toolchain_updates_checks new file mode 100644 index 0000000..43dd1b4 --- /dev/null +++ b/projects/fenix/list_toolchain_updates_checks @@ -0,0 +1,73 @@ +#!/bin/bash + +# android-components +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+VERSION\\s+=\\s+"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/AndroidComponents.kt | perl -ne "$p") +current='[% pc("android-components", "var/android_components_version") %]' +check_update_needed android-components "$needed" "$current" + + +# targetSdkVersion +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+targetSdkVersion\\s+=\\s+([^"]+)/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p") +current=29 +check_update_needed targetSdkVersion "$needed" "$current" + + +# compileSdkVersion +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+compileSdkVersion\\s+=\\s+([^"]+)/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p") +current=29 +check_update_needed compileSdkVersion "$needed" "$current" + + +# minSdkVersion +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+minSdkVersion\\s+=\\s+([^"]+)/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p") +current=21 +check_update_needed compileSdkVersion "$needed" "$current" + + +# gradle +read -d '' p << 'EOF' || true +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { + print $1; + exit; +} +EOF +needed=$(cat gradle/wrapper/gradle-wrapper.properties | perl -ne "$p") +current='[% c("var/gradle_version") %]' +check_update_needed gradle "$needed" "$current" + + +# android-gradle-plugin +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+android_gradle_plugin\\s+=\\s+"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Dependencies.kt | perl -ne "$p") +current='4.0.1' +check_update_needed android-gradle-plugin "$needed" "$current" + diff --git a/projects/geckoview/config b/projects/geckoview/config index a893d31..d186c8b 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -137,6 +137,11 @@ steps: target_prepend: - torbrowser-android-x86_64 + list_toolchain_updates: + input_files: [] + var: + container: + use_container: 0 targets: nightly: diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks new file mode 100644 index 0000000..ffc5e23 --- /dev/null +++ b/projects/geckoview/list_toolchain_updates_checks @@ -0,0 +1,202 @@ +#!/bin/bash + +# ndk version +read -d '' p << 'EOF' || true +if (m/^\\s*NDK_VERSION\\s*=\\s*"(.+)"/) { + print $1; + exit; +} +EOF +needed=$(cat python/mozboot/mozboot/android.py | perl -ne "$p") +current='r[% pc("android-toolchain", "var/android_ndk_version") %][% pc("android-toolchain", "var/android_ndk_revision") %]' +check_update_needed ndk_version "$needed" "$current" + + +# rust +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/rust.yml'); +foreach my $t (keys %$d) { + if ($d->{$t}{run}{'toolchain-alias'} eq 'linux64-rust-android') { + my $channel; + foreach my $arg (@{$d->{$t}{run}{arguments}}) { + if ($arg eq '--channel') { + $channel = 1; + next; + } + if ($channel) { + print $arg; + exit; + } + } + } +} +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("rust", "version") %]' +check_update_needed rust "$needed" "$current" + + +# build_tools +read -d '' p << 'EOF' || true +if (m/build_tools_version\\s*=\\s*"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat build/moz.configure/android-sdk.configure | perl -ne "$p") +current='[% pc("android-toolchain", "version") %]' +check_update_needed build_tools "$needed" "$current" + + +# target_sdk +read -d '' p << 'EOF' || true +if (m/target_sdk_version\\s*=\\s*"(.+)"/) { + print $1; + exit; +} +EOF +needed=$(cat build/moz.configure/android-sdk.configure | perl -ne "$p") +current='[% pc("android-toolchain", "var/android_api_level") %]' +check_update_needed target_sdk "$needed" "$current" + + +# sdk-tools +read -d '' p << 'EOF' || true +if (m|https://dl\\.google\\.com/android/repository/sdk-tools-.+-([^-]+).zip|) { + print $1; + exit; +} +EOF +needed=$(cat python/mozboot/mozboot/android.py | perl -ne "$p") +current='[% pc("android-toolchain", "var/sdk_tools_version") %]' +check_update_needed sdk-tools "$needed" "$current" + + +# min-android +read -d '' p << 'EOF' || true +use Path::Tiny; +use Digest::SHA qw(sha256_hex); +my $f; +my $min_indent; +foreach (path('build/moz.configure/android-ndk.configure')->lines_utf8) { + if ($_ eq "def min_android_version(target):\\n") { + $f = $_; + next; + } else { + next unless $f; + } + m/^(\\s*)/; + my $indent = length $1; + $min_indent = $indent unless $min_indent; + last if $indent < $min_indent; + $f .= $_; +} +print substr(sha256_hex($f), 0, 10); +EOF +needed=$(perl -e "$p") +# We can't easily parse the min_android_version function. +# Instead we get a checksum of the function, and manually check it when +# it was updated. +# Current value of min_android_version is: +# 21 on aarch64, x86_64 +# 16 on other archs +current=303de6de36 +check_update_needed min-android "$needed" "$current" + + +# min_sdk +read -d '' p << 'EOF' || true +if (m/^\\s*MOZ_ANDROID_MIN_SDK_VERSION\\s*=\\s*([^\\s]+)/) { + print $1; + exit; +} +EOF +needed=$(cat mobile/android/confvars.sh | perl -ne "$p") +current=16 +check_update_needed min_sdk "$needed" "$current" + + +# gradle +read -d '' p << 'EOF' || true +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { + print $1; + exit; +} +EOF +needed=$(cat gradle/wrapper/gradle-wrapper.properties | perl -ne "$p") +current='[% c("var/gradle_version") %]' +check_update_needed gradle "$needed" "$current" + + +# cbindgen +read -d '' p << 'EOF' || true +if (m/^\\s*cbindgen_min_version\\s*=\\s*Version\$"([^"]+)"\$/) { + print $1; + exit; +} +EOF +needed=$(cat build/moz.configure/bindgen.configure | perl -ne "$p") +current='[% pc("cbindgen", "version") %]' +check_update_needed cbindgen "$needed" "$current" + + +# nasm +read -d '' p << 'EOF' || true +if (m/^\\s*MODERN_NASM_VERSION\\s*=\\s*LooseVersion\$"([^"]+)"\$/) { + print $1; + exit; +} +EOF +needed=$(cat python/mozboot/mozboot/base.py | perl -ne "$p") +current='2.14' +check_update_needed nasm "$needed" "$current" + + +# clang +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/clang.yml'); +my $clang_toolchain; +foreach my $t (keys %$d) { + if ($d->{$t}{run}{'toolchain-alias'} eq 'linux64-clang-android-cross') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + $clang_toolchain = $fetch if $fetch =~ m/^clang-.*/; + } + last; + } +} + +if (!$clang_toolchain) { + print STDERR "Error: could not find clang toolchain"; + exit 1; +} + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +print $fetch->{$clang_toolchain}{fetch}{revision}; +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("llvm-project", "git_hash") %]' +check_update_needed clang "$needed" "$current" + + +# node +read -d '' p << 'EOF' || true +if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { + print $1; + exit; +} +EOF +needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +current='[% pc("node", "version") %]' +check_update_needed node "$needed" "$current" + + +# python +read -d '' p << 'EOF' || true +if (m/find_python3_executable\\(min_version\\s*=\\s*"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat build/moz.configure/init.configure | perl -ne "$p") +current=3.6.0 +check_update_needed python "$needed" "$current" diff --git a/projects/glean/config b/projects/glean/config new file mode 100644 index 0000000..45bc43b --- /dev/null +++ b/projects/glean/config @@ -0,0 +1,9 @@ +# vim: filetype=yaml sw=2 +git_hash: 'v[% c("version") %]' +git_url: https://github.com/mozilla/glean.git +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: '[% pc(c("origin_project"), "var/glean_version", { step => "list_toolchain_updates" }) %]' + +src: | + #!/bin/bash + mv -f [% project %]-[% c('version') %].tar.gz [% dest_dir %]/[% c('filename') %] diff --git a/projects/llvm-project/config b/projects/llvm-project/config index 822f08d..c6fa2d8 100644 --- a/projects/llvm-project/config +++ b/projects/llvm-project/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 version: 11.0.1 -git_hash: 43ff75f2c3feef64f9d73328230d34dac8832a9 +git_hash: 43ff75f2c3feef64f9d73328230d34dac8832a91 git_url: https://github.com/llvm/llvm-project filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' diff --git a/rbm.conf b/rbm.conf index cbc705a..646f353 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,6 +15,9 @@ steps: set -e mkdir -p '[% dest_dir %]' mv -vf '[% project %]-[% c("version") %].tar.xz' '[% dest_dir %]/[% c("filename") %]' + list_toolchain_updates: + build_log: '-' + list_toolchain_updates: '[% INCLUDE list_toolchain_updates %]' # buildconf contains build options that the user can change in rbm.local.conf # When adding a new option to buildconf, a default value should be defined

1 0

[tor-browser-build/maint-10.0-android] Bug 40266: Make the list of components updates for switch to mozilla88-based Fenix
by sysrqb＠torproject.org 06 May '21

06 May '21

commit 55478c86e335f1716f9506ec7c17b1eeb9e38e47 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 5 13:46:10 2021 +0200 Bug 40266: Make the list of components updates for switch to mozilla88-based Fenix --- projects/android-components/config | 3 +++ projects/application-services/config | 1 + projects/fenix/config | 3 +++ projects/geckoview/config | 4 ++++ 4 files changed, 11 insertions(+) diff --git a/projects/android-components/config b/projects/android-components/config index c9c5d55..ce9eafd 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -53,6 +53,9 @@ input_files: steps: list_toolchain_updates: + git_url: https://github.com/mozilla-mobile/android-components.git + git_hash: v74.0.6 + tag_gpg_id: 0 var: container: use_container: 0 diff --git a/projects/application-services/config b/projects/application-services/config index 6a80ffc..0cf0dd2 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -84,6 +84,7 @@ input_files: steps: list_toolchain_updates: + git_hash: 'v74.0.1' input_files: [] var: container: diff --git a/projects/fenix/config b/projects/fenix/config index a72fff4..9336d9e 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -64,6 +64,9 @@ input_files: steps: list_toolchain_updates: + git_url: https://github.com/mozilla-mobile/fenix.git + git_hash: v88.0.0-beta.4 + tag_gpg_id: 0 input_files: [] var: container: diff --git a/projects/geckoview/config b/projects/geckoview/config index d186c8b..84d212d 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -138,6 +138,10 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: + git_url: https://github.com/mozilla/gecko-dev.git + # 88.0b8 + git_hash: 43ab49774f70a5c70b2cd69a2b2a8bc0a3be20bf + tag_gpg_id: 0 input_files: [] var: container:

1 0

[tor-browser-build/maint-10.0-android] Bug 40272: Add script to generate glean depencies tarballs
by sysrqb＠torproject.org 06 May '21

06 May '21

commit ccd393a67f8c8aba2944fae23a52b07f951a048a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 9 17:28:55 2021 +0200 Bug 40272: Add script to generate glean depencies tarballs --- Makefile | 6 ++++ projects/common/how-to-update-glean-parser.txt | 30 +++++++----------- projects/glean/config | 44 ++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index fa613e1..d4562ac 100644 --- a/Makefile +++ b/Makefile @@ -213,6 +213,12 @@ list_toolchain_updates-application-services: submodule-update list_toolchain_updates-geckoview: submodule-update $(rbm) build geckoview --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 +create_glean_deps_tarball: submodule-update + $(rbm)build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 + +create_glean_deps_tarball-with_torsocks: submodule-update + $(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 --target with_torsocks + submodule-update: git submodule update --init diff --git a/projects/common/how-to-update-glean-parser.txt b/projects/common/how-to-update-glean-parser.txt index a125f5f..625049e 100644 --- a/projects/common/how-to-update-glean-parser.txt +++ b/projects/common/how-to-update-glean-parser.txt @@ -3,42 +3,36 @@ distribute Glean dependencies beforehand.[1] There are three steps involved in the process: 1) Finding out the `glean_parser` version - 2) Downloading and verifying the dependencies - 3) Bundling the dependencies up and pushing them to the sources mirror + 2) Downloading and verifying the dependencies, and creating the tarball + 3) Pushing it to the sources mirror 1) -The `glean_parser` version is available in glean-core/python/setup.py in the -Glean code repositoroy.[2] So, make sure which Glean version your -`android-components` tag is using (`mozilla_glean` in -buildSrc/src/main/java/Dependencies.kt has it) and then track `glean_parser` -down in the respective Glean tag. +Running `make list_toolchain_updates-android-components` should tell +you which version of `glean_parser` is needed. 2) -Create a directory `glean-wheels` and change into it. Then download packages for -`glean_parser` and its dependencies using +Update `steps/create_glean_deps_tarball/version` in `projects/glean/config` +to the version from step 1 above. -`python3 -m pip download glean_parser==$glean_parser` +Run this command to generate the tarball: -($glean_parser being the version from step 1 above and Python 3 needs to be 3.6; -ideally, we take the artifact we built and will use during the build later on as -well.) + make create_glean_deps_tarball There is no really good way (yet) to verify that `pip` gave us actually what we wanted. We can download `glean_parser` and its dependencies using a different network path, though, e.g. by using `torsocks`. Comparing the results of both downloads should yield the exact same binaries. -3) +If you want to use torsocks, you can use this command: -Update the `glean_parser` version in `rbm.conf, tar `glean-wheels` up and -compress it: + make create_glean_deps_tarball-with_torsocks -`tar cfj glean-wheels-$glean_parser.tar.bz2 glean-wheels` +3) Upload the compressed tarball to the sources mirror and update the SHA-256 sum of -it in the respective projects. +it as well as the `glean_parser` version in the respective projects. [1] See: https://bugzilla.mozilla.org/show_bug.cgi?id=1651662 for details. [2] https://github.com/mozilla/glean diff --git a/projects/glean/config b/projects/glean/config index 45bc43b..6fd6ce2 100644 --- a/projects/glean/config +++ b/projects/glean/config @@ -7,3 +7,47 @@ version: '[% pc(c("origin_project"), "var/glean_version", { step => "list_toolch src: | #!/bin/bash mv -f [% project %]-[% c('version') %].tar.gz [% dest_dir %]/[% c('filename') %] + +steps: + create_glean_deps_tarball: + git_url: '' + version: 2.2.0 + filename: 'glean-wheels-[% c("version") %].tar.xz' + build_log: '-' + var: + container: + use_container: 1 + create_glean_deps_tarball: | + #!/bin/bash + [% c("var/set_default_env") -%] + [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] + mkdir glean-wheels + cd glean-wheels + [% IF c("var/use_torsocks") %]torsocks [% END%]python3 -m pip download glean_parser==[% c("version") %] + cd .. + [% c('tar', { + tar_src => [ 'glean-wheels' ], + tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename'), + }) %] + cd '[% dest_dir %]' + sha256sum [% c('filename') %] + echo 'The file is ready to be uploaded:' + echo ' scp -p out/glean/[% c("filename") %] people.torproject.org:public_html/mirrors/sources/' + input_files: + - project: container-image + pkg_type: build + - project: python + name: python + pkg_type: build + +targets: + with_torsocks: + var: + # The `container-image` project looks at the deps list in origin_project + # in the same step (build), so we cannot put this inside the + # `create_glean_deps_tarball` step. + # rbm#40020 should allow us to fix that. + deps: + - torsocks + - xz-utils + use_torsocks: 1

1 0

[tor-browser-build/maint-10.0-android] Bug 40259: Update components for mozilla88-based Fenix (android-components part)
by sysrqb＠torproject.org 06 May '21

06 May '21

commit 960d035da16bb8c247ea2a98b6280b1ac8fa1c1d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 9 18:47:52 2021 +0200 Bug 40259: Update components for mozilla88-based Fenix (android-components part) --- projects/android-components/build | 2 +- projects/android-components/config | 16 +- .../gradle-dependencies-list.txt | 186 ++++++++++----------- projects/android-components/mavenLocal.patch | 29 ++-- 4 files changed, 119 insertions(+), 114 deletions(-) diff --git a/projects/android-components/build b/projects/android-components/build index 279525c..896ba3a 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -44,7 +44,7 @@ patch -p1 < $rootdir/git.patch gradle --debug --no-daemon assemble [% ELSE %] # Prepare Glean dependencies for offline build - tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 + tar -xf $rootdir/[% c('input_files_by_name/glean') %] # We need to set `LC_ALL` and `LANG` to something that is not ASCII as encoding # otherwise `click` barfs. See: https://click.palletsprojects.com/python3/ export LC_ALL=C.UTF-8 diff --git a/projects/android-components/config b/projects/android-components/config index ce9eafd..531b278 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -8,16 +8,17 @@ gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]' var: - android_components_version: 73.0.11 + android_components_version: 74.0.6 torbrowser_branch: 10.0 container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 21 + gradle_dependencies_version: 22 # Switch to make it easier to grab all dependencies during a dry-run. # Note: Use the commit before support for new GeckoView interfaces gets added. fetch_gradle_dependencies: 0 gradle_version: 6.6.1 + glean_parser: 2.2.0 targets: nightly: @@ -47,15 +48,16 @@ input_files: - filename: git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' - - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2 - sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2 + - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %].tar.xz + name: glean + sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6 enable: '[% !c("var/fetch_gradle_dependencies") %]' steps: list_toolchain_updates: - git_url: https://github.com/mozilla-mobile/android-components.git - git_hash: v74.0.6 - tag_gpg_id: 0 + #git_url: https://github.com/mozilla-mobile/android-components.git + #git_hash: v74.0.6 + #tag_gpg_id: 0 var: container: use_container: 0 diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index 1debd7f..ab3da10 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -29,8 +29,8 @@ f7eab60c57addd94bb06275832fe7600611beaaae1a1ec597c231956faf96c8b | https://dl.go 48167eeedc8da79c4d29deaf0d0cd9b5d8fedcae01f1a6efb3f28f08e8982f71 | https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asyncl… 270c7b7d99942d5ec1dd88594e4648feb33d8e31d8c3c2ab2321d49d9abdfc1f | https://dl.google.com/dl/android/maven2/androidx/biometric/biometric/1.1.0/… aeb69e76988f43b06c84fca25efab2e418bb98b5aabcd03fa7913bd3ed1bcaa9 | https://dl.google.com/dl/android/maven2/androidx/biometric/biometric/1.1.0/… -8a28c71070271b6f802f5a285ab9ae5b424e60a4f4bb4e73c0c6f53c1375506d | https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.2.0/brow… -0125474b4ff9dd64d9ebaa003ba0a19f782354e4490e270fc9fb2a39b33c1115 | https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.2.0/brow… +e740b1beeac82303415d68bee9d5c1f259716f560a829ca07c7ce97e60850e1b | https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.3.0/brow… +d82e1df52624a1fe2757055258e225ccc3aebc3f5a3d523414d7f1bbc80055f8 | https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.3.0/brow… 1193c04c22a3d6b5946dae9f4e8c59d6adde6a71b6bd5d87fb99d82dda1afec7 | https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/ca… e64ef4e08b58358fe27b599e6fe80a1b153db014c644beee630ab271061c3e6c | https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/ca… a7913a5275ad68e555d2612ebe8c14c367b153e14ca48a1872a64899020e54ef | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.… @@ -345,85 +345,34 @@ efe2431a01a188d3037d02a08e60900ec7406de626e4bd5b4995f28d409c0ebd | https://dl.go d7a2ff3a2fdbd0801f832df3de81dab06d9db7e4a57dfa6d768e7c6e5fa22280 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messag… 79b705ecf5140d3a2601b44ef058b4588878432eb6fb2f9d65da0551cb0a8e20 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messag… e953cbf59b797ceb11ce312e8da19bb8afc013ef548d8946711c116bc2500482 | https://download.jetbrains.com/kotlin/native/builds/releases/1.4.30/linux/k… -07c3d82ca7eaf4722f00b2da807dc7860f6169ae60cfedcf5d40218f90880a46 | https://jcenter.bintray.com/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.… -940676b124a8eea8ad7576f9be072c82d7dc7fe350ad895a36081f0c93ae99a6 | https://jcenter.bintray.com/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.… -f57c6f089beeedb5b73cdaca7167998ce74505ae9a3d9aeacd72e0ebb0fbf4bc | https://jcenter.bintray.com/com/squareup/okhttp3/parent/3.12.1/parent-3.12.… -e81f40146f2a0eb394b10fa3a175c85ab9fbe757aa418aa44d4b760efe16f024 | https://jcenter.bintray.com/com/squareup/okio/okio-parent/1.17.2/okio-paren… -f80ce42d2ffac47ad4c47e1d6f980d604d247ceb1a886705cf4581ab0c9fe2b8 | https://jcenter.bintray.com/com/squareup/okio/okio/1.17.2/okio-1.17.2.jar -cd57f75443ab6a714b203da51994ee64ed0e919fea81f04e4f4b5324e4bb03f0 | https://jcenter.bintray.com/com/squareup/okio/okio/1.17.2/okio-1.17.2.pom -ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0… -965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0… -affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601 | https://jcenter.bintray.com/org/jetbrains/intellij/deps/trove4j/1.0.2018121… -310a6aa2d90534c32b8f46f1fc98cd0edae95dcdfca23e2847e5efa9ae0c019a | https://jcenter.bintray.com/org/jetbrains/intellij/deps/trove4j/1.0.2018121… -79500b867b1194cf781ac98d5c706331a3d3ce8448437f536f8d4cc2faff50c3 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable… -2bad6c031302519db14517bcc33af09f137845de40e5b223b778e8a38c561fd7 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable… -1a4b999a2d9051382430994126c4bebd143c853e26d6bca4fd4c31924072ef5e | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-daemon-embeddable/1… -eabab80e05fe2a31e2f2395cedf589cd72fb8df0a82e08e93c2e36fe953b8d59 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-daemon-embeddable/1… -b0e6d0ab0c1f1dd2e2e5f540eeb6e5791820bdbe4f34597b4af183145dd2a493 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1… -eedb363ba1f4b999e62b34d264f1b37492f986169d808ec94ca72a67938291db | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1… -110fc7e4602f7aa47286a74756b673903ff3db5044312a16172eac38f7ba1224 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-model… -fce78c0c595493d89f90fa4ddba466abf4497e61aac6f2f0449ca1541c167413 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-model… -bf3e4edef51b7af7f1a8927fb58dca402e87668d246bfd0ad6520b9f2e3adebb | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-native-utils/1.3.72… -21d04a0720be4a46804e1b73b733c72269c16900896ae463a9e87a1d04ed50c6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-native-utils/1.3.72… -a188d9367de1c4ee9479db630985c0597b20709c83161b1430d24edb27e38c40 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotl… -61653ccfae8caa4203e267b479821bd90faab3fef744a7ab0fdd9f61150f970c | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotl… -8e525c7a19a94aea294403d531fd61eed3f08b2992e313a594cb531b75ffc35d | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-sam-with-receiver/1… -4961812a7df6b98c49618bb67d497d5aeabf4e73ec3d346558f162f0c6d39d68 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-sam-with-receiver/1… -d372f2dc8051f3d1d4fae3bd50e5fa109d3ec870c4a4830112f9afc8560aacfd | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-script-runtime/1.3.… -65a3e614b27b2372f350cc015848d44cb14ca3225d8d41e1c54e60ce95e2131f | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-script-runtime/1.3.… -420198546b466bfa9c38d1d7fb2ffcdfb8f518026e8f4a7ca3851fbdd525a538 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-common/1.… -ad6cfeaefa234918fde058ab1f376168abe54cd1e7d12824fb15cc8a07aa0f03 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-common/1.… -e91befa8242e5894158c0275d26d883599fe6e6c57b6952129aebec17a2ef0aa | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-… -de70f4db2a9d7d7aa42f88f217d59b61ed4357d4de138fadd3e459320abe52ba | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-… -d9a1cb78976db75b6173b51ad04efaebc2b3772636ad0b45cac4cd2d53222dc9 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-… -0e1311cc6bcd06f373cf8ef7c4d7380087f36de70d9c72acc432e02dabc30a9b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-… -5a9cced336697fbf2fb4b6c8a321787747f5e375227b7e355ebf3259365c024e | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.7… -6a1ba16592546ab118186a5634c9b24589ae2ed64f0cdd41a913ffb3c2b13db6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.7… -5e7d1552863e480c1628b1cc39ce230ef829f5b7230106215a05acda5172203a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.7… -24781edf5b0934804930dcafc8911b9e710d146239a82699889132e7b37be9dc | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.7… -40566c0c08d414b9413ba556ff7f8a0b04b98b9f0f424d122dd2088510efccc4 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/… -9d5a13d9abc33445e1366d258af0a77e42f01945acef7c0917b9d539854e2fce | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/… -133da70cfc07b56094282eac5c59bccd59f167ee2ead22e5282876d8bc10bf95 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/… -a6d50f0321bdb52838c99136930c8dcc78c3074a592d526862ec01be91fa622b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/… -3856a7349ebacd6d1be6802b2fed9c4dc2c5a564ea92b6b945ac988243d4b16b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotli… -4f0d574a969ea93c45628a163e1ed3ffabb4584278d72c647ec124f8c8109481 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotli… -9ef3d0277fe54384104a01089c8c718a9c2a7ab2b5292ff803ecfc9d38e7d6cb | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-io/1.3.72/kotl… -8131897af3fb30af2464efe56161a349087bca1544cbf57495158714875163e4 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-io/1.3.72/kotl… -7177ed4629704537e0252537629886f5409526ecd041d8d8e308e20624b14394 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… -6f7523ea8a56d7f12d11a004cfe5a4577bfba3ed6c84cc5ac48b72d54975552c | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… -1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-… -5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-… -b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom -13009fb5ede3cf2be5a8d0f1602155aeaa0ce5ef5f9366892bd258d8d3d4d2b1 | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar -1e1beb22ca906209700122b5cacf6f2719324538c5b1e3c27bf91564c8d31dbd | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.pom -8f618bf515269c02037d89a555295e39422c759f7b550a74ea3edbe355ebd1ee | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/71.0.0/au… -a1fe528647f8e20b45ea0e32bbec271c32e68b865622c42c9a37816a076be998 | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/71.0.0/au… -d85f563fe91e796d3bc213ee32e98137f0cd92f00cd495d703135d29834d63c7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… -adb969fb3bfef2fc3bb3db62365dd2f68d86203d26746f3c44952c63442f0282 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… -17dbf3d3f2cdcdbd666e6770161066214cc15f58298a9188ee8d58e27e4e5ee6 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/71.0… -8f9fd5e44dacf9f7b5e6e6ca09fde27f8c9877f09f68cd7539f5a3d980a060ff | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/71.0… -525d738af64c99669369b374154dd0d7e4ce32bc034f9736aaa05dc64f373743 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/71.0.0/f… -4f1e345f4e1f41ea2463befa35413ee12b465b3e60f0ab03758b53a17136a091 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/71.0.0/f… -373c9e30a547da6931309ba988242409292f752b0bd41b8a49972bb78546f0a0 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/71.0.0/… -3cb0d177eb6e731633140b2e854c48edee90ef755026b128016e964e5dfbc3e3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/71.0.0/… -4cea81555a8c822e382f18495e2c852a6baa4d599ecde4a11ddd5dc27685e247 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/71.0.0/logi… -86e8a90f5deeb76843286c3afd5e65216b4f05729b4b0d7e93aca51d74b98f48 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/71.0.0/logi… -fa8d2f9ab6a387a164e0c0b78fd72012db661b3d43848f778fb9288f17de0e52 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/71.… -382af2131c727357578c4fdab03a03232a9bdfca3b1036d52fd71ef65a8cf701 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/71.… -8d72e31784fac0c350e063453d537b1d2389f928c67235c897fc4cadfb3a2ca5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/71.0.0/nimb… -d11541433d5795a8d801e03637fc68e6a8baf684a3b7f56ec19684428b5575bf | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/71.0.0/nimb… -54934a2cd59b9562345e019e9b44dd1e23d1e2ede61ae7184e29e4e510e4d422 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/71.0.0/plac… -88e9eed6c49b167ed69864d1d0825123d7c48edfe542cafa203897a75b8fc272 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/71.0.0/plac… -16bc9f4070b9e8bfe0be8a8ce70e922dda4e4fb74d1e20db9dc1739a8d5c5c0d | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/71.0.0/push-7… -a882723e6aca50bb0438a21f2ae1447d9cab19f433181459cf9b7086c2d54892 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/71.0.0/push-7… -04e220d599dd5d5071bc5ee127c5d9db3e6fe378a831c8d002fb1363883711d4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/71.0.0/rus… -eed6764e8fd13edbaa2ceccf976174b4dd618f9807e2ca265c7b193007b2de69 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/71.0.0/rus… -57c4acea81f73043ab62dd4dc341a524d38682d6bc2e69bb48822f9e0ac7f48b | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/71.0.0/sync… -b9a7f2da1c0af1f88fd8bb47d04d11b4cc14f19a0f7dee13bc960ac75e87fd74 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/71.0.0/sync… -a50a7c02a36e5950ab0ca0c3a9486b87fd8de95582d0ddbcaa72af173230254b | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/71.0.0… -3b180681c076339b42e20967f95881fa11b5753ae7f597e3c3c8288c09aa9b5e | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/71.0.0… -6d23b30049cae26d35cbc1c892a785e6bdf9e0399cbbedf5584a48a8dc5cf5c9 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/71.0.0/tabs-7… -383823dd20adbea1eec86fd59097feb3f84f4dda77531a1d79ebe801b4d6d283 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/71.0.0/tabs-7… +6d600e6f04708c1393db6a3fb57ee273068fd8e7f95dcc32c184e3c2bb767599 | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/74.0.1/au… +ca74e10892b729a0026257b89e953c03e77e44582d1686f65e8796d969ba16fd | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/74.0.1/au… +5c40c0df6784f1d6ae1748196945c3c314d626153c81fc626c9dfd9847719bfa | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… +fe0fefe2babe6d2dbfab5357e649c4bf6eefc9806fba8a9cb1de22fe24f70bfd | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… +27f6e3a04e31d8053e832a446b4bf20bcfd04da56d4a390a28f3392378b88fa1 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/74.0… +c91395a9254a9bb3c836440397d1cca9fd3b541e528d4570c646594fbd448436 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/74.0… +71c137d337bdd5448e12d6dfd8054089e4a137be234d1f6f632f5b86d351a3bf | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/74.0.1/f… +02a188b095ee842e4e4b0abd94267fa4e5d927c9c1254c10fa33ccdabd1b1eba | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/74.0.1/f… +d14aed2d965a26b800233d2cfde8af9c0b3ffcd407755c8573ce3d95d32b4295 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/74.0.1/… +b871986d31a139a52b7c48125eccf4a4ee051397340c34610e852b2fa5d2d8ba | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/74.0.1/… +088949b73a203b67f985b4176f000a76eccd81b6a9aed6306860593ab52a8b6a | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/74.0.1/logi… +72b5589ae447235096e976b35cf492283a51f47ff89dcb9aecc221128cc3aab7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/74.0.1/logi… +fa8d2f9ab6a387a164e0c0b78fd72012db661b3d43848f778fb9288f17de0e52 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/74.… +411555e4106ad9a1530aeed5b669f6ffed5aad31d238c11dd954e9fd16aecff0 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/74.… +3897c1ad3624ed1804dc673e3dbf5b3002304c41d78fb355e76c3d1008e34b7d | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/74.0.1/nimb… +8cf93085518e4573284a88ab0446149f088c602942b83237cc553a22e436f380 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/74.0.1/nimb… +25e7dc1ab9c98d45fb4cfafb66835ec6bc6a90e984101745700175a35088db2e | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/74.0.1/plac… +34f6b257886def31cec92fa6425fd1a455471a0fbb635dc1b4691dfcf1f3fbac | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/74.0.1/plac… +b8840f92f21c7c0785d10eb55e14f3bcdff6e35544ab1b08b56f8fc74d91f6e2 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/74.0.1/push-7… +202dbe51a9abc34f3448d9430507dd89411188da630ed5797129ab0fbdcea61f | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/74.0.1/push-7… +ea871f7d5fab5a4315f41402de15f94e13481d03366396ea1bf3880f4f242c1a | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/74.0.1/rus… +83bcb4a06dfea23a55d24bef657827cd6b09e534a3426d857a458332e356c2d4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/74.0.1/rus… +57c4acea81f73043ab62dd4dc341a524d38682d6bc2e69bb48822f9e0ac7f48b | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/74.0.1/sync… +81dc9452086d8e8fe360bfc4b9bf4345acd6888863fa07ac5f02110fa887c558 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/74.0.1/sync… +264d997abfd49412dc0ef5b2d1811d6b9dc62dea06011ee07fc105002b314a4a | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/74.0.1… +cc7f7850bc9e5fecd8c699d0464e96bdb6765778e6463bcfc1c1efed08ba6ceb | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/74.0.1… +4ecc86b606e1713faa7b75b01fbcd52d7d521f0c5c99784f07d87188cd73ea9c | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/74.0.1/tabs-7… +c93fe881fec0df7da21f151b05652ea79157f08ad680d674d9591f6bd9843cea | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/74.0.1/tabs-7… e5801430997ccd358df0b4b48f101402b924a72de87cc5f12d80a32bb6d61865 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0… 5d08cc1bb3c2432ab3ecaaa6c06ca0603a9957ece9524643b9db4fb77a01f7b8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0… bfbb680afd838af36e4609d1b7236dbef93f47e92b386bb7ca08efca910e2e59 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/71.0.… @@ -436,19 +385,19 @@ d1741144ed2ea215a84f5d94d779cafcfaf778cce8cc7224437a2884cb1101bc | https://maven 7b0a3bd6d32c8002f785db8fdbf3b08e3541366e784cac1304cb3f49642b916a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/… f7bf27270904abd8639b543151b6eaf268b821b8e6235c8decf8031e02ec8648 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.… 0b80acf7d1dd0d9484b0e82cd1a04ae57270d7f7e6b339ce39424554d48798e3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.… -587abedeb0d539781c3a64e1d97f94e4e58598d59a110ec35a5291f5c471f441 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/87.0.… -04a3e6fb38caf74c58fe80b36ba585aba5ba4a22d06e40ffc2d9f7a47015fa99 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/87.0.… -005dc96a0f19c75ac3e83661a4c4e4b6b39fd71ab4d26d4903735fa860da8293 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/88… -cce46579b4a5fd731d5c12f62170287bec4f1ed8a2f24e8cb9a31998c1ea59ab | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/88… -e019974021cfdc86752984eba6309e7f865e3efe6d4ad40a012be212f4925251 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/87.0.20210… -66ad663a2b60d756dadefa2024f664b7befe6fb22535da80aa88b024fe9b64f5 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/87.0.20210… -c9a1855277e7863529fd20a6bdfd09659b472026a98b547b5fa6a19c5ef0d67e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… -22cc8c400823e3fc8eda2e644083b137a9fe867333845ea29c57051349afbb3a | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… -60e34ac4879aa0f8e32fb117669b09ee8946aa34e9372cfe0008995807e876a7 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -0b981a04d70ee3b438359a3da2548f56b188d594dd67bd297a09f0fa0845e348 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… +4c496ab63c3900ebbd9bde50d520c28c29ddd594ae3958f161f41a5810ba60fa | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.… +e55a5d7ebdd6cae43d2a820c16f771ad8d87f25b181828ebd10c721f8ad445dc | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.… +d622b92149ed8477aca47dabe0fd53de75191a29ff4d79a0cfc718736bb4aa2a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/89… +8d6bc0c248af8f3d1f4f45abd4e04bf76044fbce518ca3c384ff83fe9acb38b4 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/89… +418b2052928c75f4071b533cf864baaf22d0f134f6418200b8ab807c93428161 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/87.0.20210… +9c4b5dd3e37936890909a0795be552664dd861f9f28a9815a72a4abc7660c700 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/87.0.20210… +1eb5321d64bdd07865bd8599b6b981193b54661f25bbb8e3ccdc6f8210c9ae38 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… +f62de54f66aa4086100f26884927dbff06a1cbea7fb17010312d10d71cea3f01 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… +624e642862770feb72c22cd80cd96f0e5d53340ded862987b3ec9c537c8bed29 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… +93d7a411ea527507fb1510d58c764aed2ec029cdd0b3c42df00ceea01afa8f45 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… d6394ad35c63daca22246363ff826749deb62d514a1843eea27d8f39dfb778e6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.1.2/glean-3… -5d942e4a68aef1fab1b219f51e2882eb61dfd27d4bdcd9265b6d375ce5e5fb3b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/34.1.0/glean-3… -681374f4e97bd97098c1266973d89167ff9c592ccb89617832e224135af72637 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/34.1.0/glean-3… +953648b707c804301df08d70db75086b70c141e72d66826e88f34f7aa9ab880e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/35.0.0/glean-3… +9acbb9dba515f2142695a17cb9ac123032dcba24423b660f5e0f0b95adfd22bf | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/35.0.0/glean-3… 8f1fec72b91a71ea39ec39f5f778c4d1124b6b097c6d55b3a50b554a52237b27 | https://plugins.gradle.org/m2/com/google/code/gson/gson-parent/2.8.5/gson-p… 233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81 | https://plugins.gradle.org/m2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar b8308557a7fccc92d9fe7c8cd0599258b361285d2ecde7689eda98843255a092 | https://plugins.gradle.org/m2/com/google/code/gson/gson/2.8.5/gson-2.8.5.pom @@ -461,24 +410,65 @@ aa42cf65e9f7475bc7cb2fa7cb7dbf99938dd47de864bbed68135e5a12d3a482 | https://plugi 74a54eb154e18b54fc69ac03ab8d186f3ba293b976eca8b336566248ea2633b4 | https://plugins.gradle.org/m2/org/gradle/kotlin/kotlin-dsl/org.gradle.kotli… bdce53a751fdb27af6608039df81214ba22d902ed4169540a3daeb5828c99cad | https://plugins.gradle.org/m2/org/gradle/kotlin/plugins/1.3.6/plugins-1.3.6… 785f12a193912d77fe3b8714567ad5f01d727512a47c5a43aef57852cc1bc9e2 | https://plugins.gradle.org/m2/org/gradle/kotlin/plugins/1.3.6/plugins-1.3.6… +ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://plugins.gradle.org/m2/org/jetbrains/annotations/13.0/annotations-13… +965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://plugins.gradle.org/m2/org/jetbrains/annotations/13.0/annotations-13… 77d7638a32bcae42c929eea307c9a3b48ae1a5abd00cd29f7abf6d51079d83a9 | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-android-gradle-plug… 92f058aef966deca25ddcf1b1ad028d822f94891bf61491ebc914a08a3481e86 | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-android-gradle-plug… e9215460b1bb674b616cb9c8f1a1b172cdd7b3f4749662d864ebd3f319f0d73d | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-gradle-plugin/0.9.1… f41e2f85d75abe256ae3f522066ad40ff9b3dc90b0f6e455508a90ba78046871 | https://plugins.gradle.org/m2/org/jetbrains/dokka/dokka-gradle-plugin/0.9.1… +affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601 | https://plugins.gradle.org/m2/org/jetbrains/intellij/deps/trove4j/1.0.20181… +310a6aa2d90534c32b8f46f1fc98cd0edae95dcdfca23e2847e5efa9ae0c019a | https://plugins.gradle.org/m2/org/jetbrains/intellij/deps/trove4j/1.0.20181… 30278f88cfefb7bb328bedd73374242f8e3e55211e53884e4820dba271132fab | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-android-extension… 5d87527b1f65a82d0a6a4f56cceab960522001a0fd010159a723ab897d58da0c | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-android-extension… 35d8e287a1d74dc55024a42bd788567e1f73e2059eb804319876d652f249ef59 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-annotation-proces… 2d97af231b25d4f463438a66c7c368a8e395e49ebb623b595ca860cef917334a | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-annotation-proces… dc0d14042176647d0bde5954aba8a435f6a8857f9648bbc454b94366bc1cff06 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-build-common/1.3.… 5a6bb0d142ed04c1df96200c35bb72bc63c3ae7ea6c876834f37d83938f1e3d4 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-build-common/1.3.… +79500b867b1194cf781ac98d5c706331a3d3ce8448437f536f8d4cc2faff50c3 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-compiler-embeddab… +2bad6c031302519db14517bcc33af09f137845de40e5b223b778e8a38c561fd7 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-compiler-embeddab… a2d8622ef0e2877577e368ec3a2ffbe7978b4512aab456d0db6427d9fae39d47 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-compiler-runner/1… 6816c427914a4e4ead92300c0b643339b07e7cbb3355d48d5932dbcdaac7d058 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-compiler-runner/1… 8f3ef9192e17768cd4e1f3c1f1c225ebd3b500a67ad05a735b31aa16e01c181c | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-daemon-client/1.3… 215e6f1bb1980a8bdbef9c155557d17e5a16fbae84d5cae5bf2fd20b86b87d2b | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-daemon-client/1.3… +1a4b999a2d9051382430994126c4bebd143c853e26d6bca4fd4c31924072ef5e | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-daemon-embeddable… +eabab80e05fe2a31e2f2395cedf589cd72fb8df0a82e08e93c2e36fe953b8d59 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-daemon-embeddable… +b0e6d0ab0c1f1dd2e2e5f540eeb6e5791820bdbe4f34597b4af183145dd2a493 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin-api… +eedb363ba1f4b999e62b34d264f1b37492f986169d808ec94ca72a67938291db | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin-api… +110fc7e4602f7aa47286a74756b673903ff3db5044312a16172eac38f7ba1224 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin-mod… +fce78c0c595493d89f90fa4ddba466abf4497e61aac6f2f0449ca1541c167413 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin-mod… b914cbcd8e55e76f221cc863912c38b1fe6ce56800300c147f85410aaa8789ab | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.3… 8ec81474695b94779488b99183955cf0e1f50fe4d048af920b756ca71b72ac90 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.3… +bf3e4edef51b7af7f1a8927fb58dca402e87668d246bfd0ad6520b9f2e3adebb | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-native-utils/1.3.… +21d04a0720be4a46804e1b73b733c72269c16900896ae463a9e87a1d04ed50c6 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-native-utils/1.3.… +a188d9367de1c4ee9479db630985c0597b20709c83161b1430d24edb27e38c40 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-reflect/1.3.72/ko… +61653ccfae8caa4203e267b479821bd90faab3fef744a7ab0fdd9f61150f970c | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-reflect/1.3.72/ko… +8e525c7a19a94aea294403d531fd61eed3f08b2992e313a594cb531b75ffc35d | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-sam-with-receiver… +4961812a7df6b98c49618bb67d497d5aeabf4e73ec3d346558f162f0c6d39d68 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-sam-with-receiver… +d372f2dc8051f3d1d4fae3bd50e5fa109d3ec870c4a4830112f9afc8560aacfd | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-script-runtime/1.… +65a3e614b27b2372f350cc015848d44cb14ca3225d8d41e1c54e60ce95e2131f | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-script-runtime/1.… +420198546b466bfa9c38d1d7fb2ffcdfb8f518026e8f4a7ca3851fbdd525a538 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-common/… +ad6cfeaefa234918fde058ab1f376168abe54cd1e7d12824fb15cc8a07aa0f03 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-common/… +e91befa8242e5894158c0275d26d883599fe6e6c57b6952129aebec17a2ef0aa | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-compile… +de70f4db2a9d7d7aa42f88f217d59b61ed4357d4de138fadd3e459320abe52ba | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-compile… +d9a1cb78976db75b6173b51ad04efaebc2b3772636ad0b45cac4cd2d53222dc9 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-compile… +0e1311cc6bcd06f373cf8ef7c4d7380087f36de70d9c72acc432e02dabc30a9b | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-compile… +5a9cced336697fbf2fb4b6c8a321787747f5e375227b7e355ebf3259365c024e | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3… +6a1ba16592546ab118186a5634c9b24589ae2ed64f0cdd41a913ffb3c2b13db6 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3… +5e7d1552863e480c1628b1cc39ce230ef829f5b7230106215a05acda5172203a | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3… +24781edf5b0934804930dcafc8911b9e710d146239a82699889132e7b37be9dc | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3… +40566c0c08d414b9413ba556ff7f8a0b04b98b9f0f424d122dd2088510efccc4 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.7… +9d5a13d9abc33445e1366d258af0a77e42f01945acef7c0917b9d539854e2fce | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.7… +133da70cfc07b56094282eac5c59bccd59f167ee2ead22e5282876d8bc10bf95 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.7… +a6d50f0321bdb52838c99136930c8dcc78c3074a592d526862ec01be91fa622b | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.7… +3856a7349ebacd6d1be6802b2fed9c4dc2c5a564ea92b6b945ac988243d4b16b | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kot… +4f0d574a969ea93c45628a163e1ed3ffabb4584278d72c647ec124f8c8109481 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kot… +9ef3d0277fe54384104a01089c8c718a9c2a7ab2b5292ff803ecfc9d38e7d6cb | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-util-io/1.3.72/ko… +8131897af3fb30af2464efe56161a349087bca1544cbf57495158714875163e4 | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-util-io/1.3.72/ko… 3825cbc39ac9b557bf11ed52ed8552200831004a60e845eba61c77ba972a2d9f | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-util-klib/1.3.72/… 0e10935a94077c217ec5107b451c0859e89a27f67fd09543bd044c798cb154cf | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-util-klib/1.3.72/… +7177ed4629704537e0252537629886f5409526ecd041d8d8e308e20624b14394 | https://plugins.gradle.org/m2/org/jetbrains/kotlinx/kotlinx-coroutines-core… +6f7523ea8a56d7f12d11a004cfe5a4577bfba3ed6c84cc5ac48b72d54975552c | https://plugins.gradle.org/m2/org/jetbrains/kotlinx/kotlinx-coroutines-core… +b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://plugins.gradle.org/m2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom f5759b7fcdfc83a525a036deedcbd32e5b536b625ebc282426f16ca137eb5902 | https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util… 770471090ca40a17b9e436ee2ec00819be42042da6f4085ece1d37916dc08ff9 | https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util… 2bf4e59f3acd106fea6145a9a88fe8956509f8b9c0fdd11eb96fee757269e3f3 | https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1-alpha-2/cl… @@ -616,13 +606,19 @@ efd442f0c35276739da19b5f6c8c3792a87bb309df199e0478dacc8c8c6de4fe | https://repo. efb8644c55fffaf1f229893ac5c99864c9cef677478a206a729af96262ba9078 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnect… 4aca3e552afb1ceb47f8956685f6295a276e49fa03f9066f8b6be83bec56fb66 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.10.0/okh… d94e3316e6b8e49897d10bb3aa0e2e7d0693be526a4aa265ca0792bc77ebc333 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.10.0/okh… +07c3d82ca7eaf4722f00b2da807dc7860f6169ae60cfedcf5d40218f90880a46 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okh… +940676b124a8eea8ad7576f9be072c82d7dc7fe350ad895a36081f0c93ae99a6 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okh… 0ab41a713e2a638efc1f4610ef34c07fef398f9d7b9d79a6f5406b779b0011a5 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.13.1/okh… 73416ac947490016bb1269faf8dc354841abe4c0c08ce455f34d281fecd09160 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.13.1/okh… 2c35da6696e905e8c116caef4d6b92c9d6130532c4974ad1b70cd9fe78e4250e | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.10.0/par… +f57c6f089beeedb5b73cdaca7167998ce74505ae9a3d9aeacd72e0ebb0fbf4bc | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/par… 4e374858730d3ec488695db9710d28fd476ea84a040900ff6b47bc1c9e7b4218 | https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.13.1/par… 18d1f68a7d7d03b0e935c03ae335c51b15d2ba4664964b96e07542af390aee85 | https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.14.0/o… +e81f40146f2a0eb394b10fa3a175c85ab9fbe757aa418aa44d4b760efe16f024 | https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.17.2/o… 4633c331f50642ebe795dc089d6a5928aff43071c9d17e7840a009eea2fe95a3 | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.14.0/okio-1.1… 0922137559cb91f6fe88e2643f4d986f566913883f9a82ef91e5d0675466f81e | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.14.0/okio-1.1… +f80ce42d2ffac47ad4c47e1d6f980d604d247ceb1a886705cf4581ab0c9fe2b8 | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.2/okio-1.1… +cd57f75443ab6a714b203da51994ee64ed0e919fea81f04e4f4b5324e4bb03f0 | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.2/okio-1.1… e58c97406a6bb1138893750299ac63c6aa04b38b6b49eae1bfcad1a63ef9ba1b | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.2.2/okio-2.2.… fd621988f7f6957025735dc6dd090b00a20f3a3bb8d77ca79036077f629b140b | https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.2.2/okio-2.2.… 1d8518e3ac7532a104e4f7be77def37c982e530723c6bdb3d67708cce2b0c2c4 | https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0… @@ -891,6 +887,8 @@ f8c8b7485d4a575e38e5e94945539d1d4eccd3228a199e1a9aa094e8c26174ee | https://repo. 497a7639820ba0758d4e0c1d6f82fdc8a9b6f6c2a28d91fe03c6b0776db4be40 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… e49454af130e066a4e1c31255c5fd9a23f31105324f48e98406325b051638908 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata… f928d533d912546b6d97904bab53e983f8fe2cda303af9fa953c1438ccf38470 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata… +1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824… +c94b0b73790c70c709bcd445a01247908888211e38cc59e946ff6fe900785ae9 | https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824… 518080049ba83181914419d11a25d9bc9833a2d729b6a6e7469fa52851356da8 | https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.j… c7e660c50bf4ecda0fc81ab62b489db9171e207fa784ddcb48c6c85bb40b49f5 | https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.p… 95b05d9590af4154c6513b9c5dc1fb2e55b539972ba0a9ef28e9a0c01d83ad77 | https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1… @@ -934,5 +932,7 @@ c513995cf019d9213d4fda666589937b2bf1bea5c4cdd337e6170e80b18406ee | https://repo. fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-pare… a45da61abed61568a533fdece125093180828edeb0d4b6f6d572e0cf457465f6 | https://repo.maven.apache.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-j… 5806cf36dd28bfe961f7fe12679f4a2748a03e7a1d0070c22c411c19f01f266a | https://repo.maven.apache.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-j… +13009fb5ede3cf2be5a8d0f1602155aeaa0ce5ef5f9366892bd258d8d3d4d2b1 | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.23/snakeyaml-1.23… +1e1beb22ca906209700122b5cacf6f2719324538c5b1e3c27bf91564c8d31dbd | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.23/snakeyaml-1.23… d3f7f09989d5b0ce5c4791818ef937ee7663f1e359c2ef2d312f938aad0763da | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.24/snakeyaml-1.24… 174d423722256823edbe2af8d7e3385c4645cf72382a22da0485b3b674394f37 | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.24/snakeyaml-1.24… diff --git a/projects/android-components/mavenLocal.patch b/projects/android-components/mavenLocal.patch index 9d6d66c..3b5f064 100644 --- a/projects/android-components/mavenLocal.patch +++ b/projects/android-components/mavenLocal.patch @@ -1,11 +1,17 @@ -From 6a88b59457dd38f0e8d69f0c2988bb2952075536 Mon Sep 17 00:00:00 2001 +From d1263dbcc33e3f587abbc4bbf8c24c0bb567f194 Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Wed, 20 May 2020 14:18:12 +0000 Subject: [PATCH] mavenLocal() fixes +--- + build.gradle | 2 ++ + buildSrc/build.gradle | 1 + + buildSrc/settings.gradle | 7 ++++++- + settings.gradle | 7 +++++++ + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle -index 9f298887a..278245d30 100644 +index f412f91f4..944a19e9a 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType @@ -16,7 +22,7 @@ index 9f298887a..278245d30 100644 if (project.hasProperty("googleRepo")) { maven { name "Google" -@@ -48,6 +49,7 @@ plugins { +@@ -39,6 +40,7 @@ plugins { allprojects { repositories { @@ -25,7 +31,7 @@ index 9f298887a..278245d30 100644 maven { name "Google" diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle -index 9f05b8434..f97029ccf 100644 +index c9f83be52..c01e9ab01 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -7,6 +7,7 @@ plugins { @@ -33,9 +39,9 @@ index 9f05b8434..f97029ccf 100644 repositories { + mavenLocal() - jcenter() - } + mavenCentral() + if (project.hasProperty("centralRepo")) { diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index c31ad3840..fb6526db3 100644 --- a/buildSrc/settings.gradle @@ -59,7 +65,7 @@ index c31ad3840..fb6526db3 100644 \ No newline at end of file +} diff --git a/settings.gradle b/settings.gradle -index a6e8dfa49..049fa29d6 100644 +index e1204312f..428e9ddcd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,8 +4,15 @@ @@ -75,9 +81,6 @@ index a6e8dfa49..049fa29d6 100644 buildscript { repositories { + mavenLocal() - jcenter() - } - --- -2.28.0 - + if (hasProperty("centralRepo")) { + maven { + name "MavenCentral"

1 0

[tor-browser-build/maint-10.0-android] Bug 40259: Update components for mozilla88-based Fenix (application-services part)
by sysrqb＠torproject.org 06 May '21

06 May '21

commit 2a344744b12060d66641130fa5e378c0b001a9c6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 7 12:54:00 2021 +0200 Bug 40259: Update components for mozilla88-based Fenix (application-services part) --- projects/application-services/build | 1 - projects/application-services/config | 14 ++-- .../application-services/update-cargo-lock.patch | 93 +++++++++----------- .../application-services/viaduct-workaround.patch | 12 +-- .../application-services/viaduct-workaround2.patch | 98 ---------------------- 5 files changed, 52 insertions(+), 166 deletions(-) diff --git a/projects/application-services/build b/projects/application-services/build index 4d1ab07..b7461bf 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -52,7 +52,6 @@ EOF patch -p1 < $rootdir/update-cargo-lock.patch cd components/external/nimbus-sdk patch -p1 < $rootdir/viaduct-workaround.patch -patch -p1 < $rootdir/viaduct-workaround2.patch cd ../../../ # Move NSS and SQLCipher to the right place diff --git a/projects/application-services/config b/projects/application-services/config index 0cf0dd2..588d573 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 71.0.0 -git_hash: 1ee6b32f3ee569036fdf1015cf7ffc01ded2860f +version: 74.0.1 +git_hash: ad7b64fa03eeeb00815125e635d1fb8809befd40 git_url: https://github.com/mozilla/application-services git_submodule: 1 @@ -11,7 +11,7 @@ var: # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 5 # This should be updated when the list of rust dependencies is changed. - rust_vendor_version: 4 + rust_vendor_version: 5 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 gradle_version: 6.5 @@ -70,21 +70,19 @@ input_files: enable: '[% !c("var/fetch_gradle_dependencies") %]' # `cargo vendor vendor -s components/external/nimbus-sdk/nimbus/Cargo.toml` # in the `application-services` directory has vendored the sources, - # after applying update-cargo-lock.patch, viaduct-workaround.patch and - # viaduct-workaround2.patch + # after applying update-cargo-lock.patch and viaduct-workaround.patch - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-v… c('var/rust_vendor_version') %].tar.bz2 - sha256sum: 500d0fa471c8ad2037c4bbe648e716e77da1ff1fc5678542b144cd257a34abbf + sha256sum: 5f1c9e1bc0db283e88516bd1d78187145bacbf4aeb72972ac09875c1147d2215 - filename: no-git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: target.patch - filename: viaduct-workaround.patch - - filename: viaduct-workaround2.patch - filename: update-cargo-lock.patch steps: list_toolchain_updates: - git_hash: 'v74.0.1' + #git_hash: 'v74.0.1' input_files: [] var: container: diff --git a/projects/application-services/update-cargo-lock.patch b/projects/application-services/update-cargo-lock.patch index 5e28cca..3a42019 100644 --- a/projects/application-services/update-cargo-lock.patch +++ b/projects/application-services/update-cargo-lock.patch @@ -1,14 +1,14 @@ -From cdcce5ffd9e49d4648dd6b23a6dfbc8011352883 Mon Sep 17 00:00:00 2001 +From 3d6b82d24bcf05b26c69702f6dcb1a0ac91c13a1 Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Fri, 27 Nov 2020 09:55:49 +0000 Subject: [PATCH] update cargo.lock --- - Cargo.lock | 390 +++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 273 insertions(+), 117 deletions(-) + Cargo.lock | 384 +++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 267 insertions(+), 117 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 813c475c..20b6e4d0 100644 +index 69d2dae0..2c1a3aa3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -86,9 +86,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" @@ -176,7 +176,7 @@ index 813c475c..20b6e4d0 100644 [[package]] name = "cpuid-bool" -@@ -548,7 +577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -559,7 +588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ "cfg-if 1.0.0", @@ -185,7 +185,7 @@ index 813c475c..20b6e4d0 100644 ] [[package]] -@@ -559,18 +588,18 @@ checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +@@ -570,18 +599,18 @@ checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -208,7 +208,7 @@ index 813c475c..20b6e4d0 100644 "lazy_static", "memoffset", "scopeguard", -@@ -578,26 +607,20 @@ dependencies = [ +@@ -589,26 +618,20 @@ dependencies = [ [[package]] name = "crossbeam-utils" @@ -241,7 +241,7 @@ index 813c475c..20b6e4d0 100644 [[package]] name = "csv" -@@ -743,7 +766,7 @@ version = "1.2.1" +@@ -754,7 +777,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d97f19730c1eb3332d0657d0f3ca72795d77c61d8eb26bdd7f15edc0c61eb2" dependencies = [ @@ -250,7 +250,7 @@ index 813c475c..20b6e4d0 100644 "byteorder", "once_cell", "serde", -@@ -1039,6 +1062,16 @@ version = "0.1.1" +@@ -1042,6 +1065,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" @@ -267,7 +267,7 @@ index 813c475c..20b6e4d0 100644 [[package]] name = "fuchsia-cprng" version = "0.1.1" -@@ -1061,53 +1094,59 @@ version = "0.3.3" +@@ -1064,53 +1097,59 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" @@ -340,7 +340,7 @@ index 813c475c..20b6e4d0 100644 "pin-utils", "slab", ] -@@ -1117,7 +1156,7 @@ name = "fxa-client" +@@ -1120,7 +1159,7 @@ name = "fxa-client" version = "0.1.0" dependencies = [ "anyhow", @@ -349,7 +349,7 @@ index 813c475c..20b6e4d0 100644 "error-support", "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex", -@@ -1278,7 +1317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1275,7 +1314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7539c8d8699bae53238aacd3f93cfb0bcaef77b85dc963902b9367c5d7a84c48" dependencies = [ "anyhow", @@ -358,7 +358,7 @@ index 813c475c..20b6e4d0 100644 "log 0.4.11", "once_cell", "thiserror", -@@ -1367,7 +1406,7 @@ dependencies = [ +@@ -1364,7 +1403,7 @@ dependencies = [ "httparse", "httpdate", "itoa", @@ -367,7 +367,7 @@ index 813c475c..20b6e4d0 100644 "socket2", "tokio", "tower-service", -@@ -1494,7 +1533,7 @@ dependencies = [ +@@ -1491,7 +1530,7 @@ dependencies = [ name = "jwcrypto" version = "0.1.0" dependencies = [ @@ -376,7 +376,7 @@ index 813c475c..20b6e4d0 100644 "rc_crypto", "serde", "serde_derive", -@@ -1527,6 +1566,19 @@ version = "1.4.0" +@@ -1524,6 +1563,19 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" @@ -600,7 +600,7 @@ index 813c475c..20b6e4d0 100644 "web-sys", "winreg", ] -@@ -2852,14 +2929,14 @@ dependencies = [ +@@ -2829,14 +2906,14 @@ dependencies = [ [[package]] name = "rust-argon2" @@ -619,7 +619,7 @@ index 813c475c..20b6e4d0 100644 ] [[package]] -@@ -2902,6 +2979,12 @@ dependencies = [ +@@ -2879,6 +2956,12 @@ dependencies = [ "winapi 0.3.9", ] @@ -632,7 +632,7 @@ index 813c475c..20b6e4d0 100644 [[package]] name = "scopeguard" version = "1.1.0" -@@ -2910,9 +2993,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +@@ -2887,9 +2970,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "security-framework" @@ -644,7 +644,7 @@ index 813c475c..20b6e4d0 100644 dependencies = [ "bitflags 1.2.1", "core-foundation", -@@ -2923,9 +3006,9 @@ dependencies = [ +@@ -2900,9 +2983,9 @@ dependencies = [ [[package]] name = "security-framework-sys" @@ -656,7 +656,7 @@ index 813c475c..20b6e4d0 100644 dependencies = [ "core-foundation-sys", "libc", -@@ -3018,6 +3101,18 @@ dependencies = [ +@@ -2995,6 +3078,18 @@ dependencies = [ "url", ] @@ -675,7 +675,7 @@ index 813c475c..20b6e4d0 100644 [[package]] name = "sha2" version = "0.9.2" -@@ -3051,11 +3146,11 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +@@ -3028,11 +3123,11 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "socket2" @@ -690,20 +690,7 @@ index 813c475c..20b6e4d0 100644 "libc", "redox_syscall", "winapi 0.3.9", -@@ -3072,6 +3167,12 @@ dependencies = [ - "rusqlite", - ] - -+[[package]] -+name = "static_assertions" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -+ - [[package]] - name = "strsim" - version = "0.8.0" -@@ -3104,9 +3205,9 @@ dependencies = [ +@@ -3087,9 +3182,9 @@ dependencies = [ [[package]] name = "syn" @@ -715,7 +702,7 @@ index 813c475c..20b6e4d0 100644 dependencies = [ "proc-macro2", "quote", -@@ -3117,7 +3218,7 @@ dependencies = [ +@@ -3100,7 +3195,7 @@ dependencies = [ name = "sync-guid" version = "0.1.0" dependencies = [ @@ -724,7 +711,7 @@ index 813c475c..20b6e4d0 100644 "rand 0.7.3", "rusqlite", "serde", -@@ -3129,7 +3230,7 @@ name = "sync-test" +@@ -3112,7 +3207,7 @@ name = "sync-test" version = "0.1.0" dependencies = [ "anyhow", @@ -733,7 +720,7 @@ index 813c475c..20b6e4d0 100644 "env_logger", "fxa-client", "interrupt-support", -@@ -3157,7 +3258,7 @@ version = "0.1.0" +@@ -3140,7 +3235,7 @@ version = "0.1.0" dependencies = [ "anyhow", "base16", @@ -742,7 +729,7 @@ index 813c475c..20b6e4d0 100644 "env_logger", "error-support", "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -3324,6 +3425,12 @@ dependencies = [ +@@ -3295,6 +3390,12 @@ dependencies = [ "viaduct", ] @@ -755,7 +742,7 @@ index 813c475c..20b6e4d0 100644 [[package]] name = "tempdir" version = "0.3.7" -@@ -3371,18 +3478,18 @@ dependencies = [ +@@ -3342,18 +3443,18 @@ dependencies = [ [[package]] name = "termcolor" @@ -778,7 +765,7 @@ index 813c475c..20b6e4d0 100644 dependencies = [ "libc", "winapi 0.3.9", -@@ -3458,6 +3565,15 @@ dependencies = [ +@@ -3429,6 +3530,15 @@ dependencies = [ "winapi 0.3.9", ] @@ -794,7 +781,7 @@ index 813c475c..20b6e4d0 100644 [[package]] name = "tinytemplate" version = "1.1.0" -@@ -3470,15 +3586,24 @@ dependencies = [ +@@ -3441,15 +3551,24 @@ dependencies = [ [[package]] name = "tinyvec" @@ -823,7 +810,7 @@ index 813c475c..20b6e4d0 100644 dependencies = [ "bytes", "fnv", -@@ -3488,7 +3613,7 @@ dependencies = [ +@@ -3459,7 +3578,7 @@ dependencies = [ "memchr", "mio", "num_cpus", @@ -832,7 +819,7 @@ index 813c475c..20b6e4d0 100644 "slab", ] -@@ -3512,7 +3637,7 @@ dependencies = [ +@@ -3483,7 +3602,7 @@ dependencies = [ "futures-core", "futures-sink", "log 0.4.11", @@ -841,7 +828,7 @@ index 813c475c..20b6e4d0 100644 "tokio", ] -@@ -3533,13 +3658,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" +@@ -3504,13 +3623,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" @@ -859,7 +846,7 @@ index 813c475c..20b6e4d0 100644 "tracing-core", ] -@@ -3604,18 +3729,18 @@ dependencies = [ +@@ -3575,18 +3694,18 @@ dependencies = [ [[package]] name = "unicode-normalization" @@ -882,16 +869,16 @@ index 813c475c..20b6e4d0 100644 [[package]] name = "unicode-width" -@@ -3647,7 +3772,7 @@ dependencies = [ +@@ -3618,7 +3737,7 @@ dependencies = [ "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static", "log 0.4.11", - "paste 1.0.2", + "paste 1.0.3", + "static_assertions", ] - [[package]] -@@ -3678,10 +3803,11 @@ dependencies = [ +@@ -3662,10 +3781,11 @@ dependencies = [ [[package]] name = "url" @@ -905,7 +892,7 @@ index 813c475c..20b6e4d0 100644 "idna", "matches", "percent-encoding", -@@ -3843,6 +3969,30 @@ version = "0.2.68" +@@ -3827,6 +3947,30 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307" @@ -936,16 +923,16 @@ index 813c475c..20b6e4d0 100644 [[package]] name = "web-sys" version = "0.3.45" -@@ -3906,7 +4056,7 @@ version = "0.11.0" +@@ -3890,7 +4034,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37" + checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" dependencies = [ - "nom", + "nom 5.1.2", ] [[package]] -@@ -3986,6 +4136,12 @@ dependencies = [ +@@ -3970,6 +4114,12 @@ dependencies = [ "winapi-build", ] diff --git a/projects/application-services/viaduct-workaround.patch b/projects/application-services/viaduct-workaround.patch index b5b0121..933b4bf 100644 --- a/projects/application-services/viaduct-workaround.patch +++ b/projects/application-services/viaduct-workaround.patch @@ -1,7 +1,7 @@ -From 5020520a2b240512284a7396e99ed22c54042257 Mon Sep 17 00:00:00 2001 +From 4a7eb7890108939993444ad350dd064dc7448160 Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Wed, 2 Dec 2020 09:26:24 +0000 -Subject: [PATCH 1/2] Bug 40156: viaduct*-workaround +Subject: [PATCH] Bug 40156: viaduct*-workaround See: https://github.com/mozilla/application-services/issues/3732. --- @@ -9,7 +9,7 @@ See: https://github.com/mozilla/application-services/issues/3732. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nimbus/Cargo.toml b/nimbus/Cargo.toml -index b19acc9..fd267b5 100644 +index 4dc51b3..0e30dd0 100644 --- a/nimbus/Cargo.toml +++ b/nimbus/Cargo.toml @@ -26,7 +26,7 @@ serde_derive = "1" @@ -20,9 +20,9 @@ index b19acc9..fd267b5 100644 +viaduct = { path = "../../../viaduct" } thiserror = "1" url = "2.1" - rkv = "0.15" -@@ -41,7 +41,7 @@ uniffi = { version = "0.7", optional = true } - uniffi_build = { version = "0.7", features = [ "builtin-bindgen" ], optional = true } + rkv = "0.17" +@@ -41,7 +41,7 @@ uniffi = { version = "^0.8.0", optional = true } + uniffi_build = { version = "^0.8.0", features = [ "builtin-bindgen" ], optional = true } [dev-dependencies] -viaduct-reqwest = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"} diff --git a/projects/application-services/viaduct-workaround2.patch b/projects/application-services/viaduct-workaround2.patch deleted file mode 100644 index 1bc27bb..0000000 --- a/projects/application-services/viaduct-workaround2.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 9f3cf867a22a807cf997d2b0af283c7ce9d298fe Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Wed, 2 Dec 2020 09:26:43 +0000 -Subject: [PATCH 2/2] Bug 40156: Cargo.lock update after viaduct*-workaround - ---- - nimbus/Cargo.lock | 43 +++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 41 insertions(+), 2 deletions(-) - -diff --git a/nimbus/Cargo.lock b/nimbus/Cargo.lock -index 9caa76c..a73e464 100644 ---- a/nimbus/Cargo.lock -+++ b/nimbus/Cargo.lock -@@ -223,6 +223,16 @@ dependencies = [ - "winapi 0.3.9", - ] - -+[[package]] -+name = "console_error_panic_hook" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" -+dependencies = [ -+ "cfg-if 0.1.10", -+ "wasm-bindgen", -+] -+ - [[package]] - name = "core-foundation" - version = "0.9.1" -@@ -1326,6 +1336,7 @@ dependencies = [ - "url", - "wasm-bindgen", - "wasm-bindgen-futures", -+ "wasm-bindgen-test", - "web-sys", - "winreg", - ] -@@ -1369,6 +1380,12 @@ dependencies = [ - "winapi 0.3.9", - ] - -+[[package]] -+name = "scoped-tls" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" -+ - [[package]] - name = "security-framework" - version = "2.0.0" -@@ -1850,7 +1867,6 @@ checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" - [[package]] - name = "viaduct" - version = "0.1.0" --source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664…" - dependencies = [ - "ffi-support", - "log", -@@ -1866,7 +1882,6 @@ dependencies = [ - [[package]] - name = "viaduct-reqwest" - version = "0.1.0" --source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664…" - dependencies = [ - "ffi-support", - "lazy_static", -@@ -1959,6 +1974,30 @@ version = "0.2.69" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" - -+[[package]] -+name = "wasm-bindgen-test" -+version = "0.3.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34d1cdc8b98a557f24733d50a1199c4b0635e465eecba9c45b214544da197f64" -+dependencies = [ -+ "console_error_panic_hook", -+ "js-sys", -+ "scoped-tls", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "wasm-bindgen-test-macro", -+] -+ -+[[package]] -+name = "wasm-bindgen-test-macro" -+version = "0.3.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8fb9c67be7439ee8ab1b7db502a49c05e51e2835b66796c705134d9b8e1a585" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+] -+ - [[package]] - name = "web-sys" - version = "0.3.46"

1 0

[tor-browser-build/maint-10.0-android] Bug 40270: Improve process to generate gradle-dependencies-list.txt
by sysrqb＠torproject.org 06 May '21

06 May '21

commit 0ef5812083c3cdd2d4aedf15144fc75074645aa8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 13 17:59:12 2021 +0200 Bug 40270: Improve process to generate gradle-dependencies-list.txt --- Makefile | 9 +++++ projects/android-components/build | 4 ++- projects/android-components/config | 14 ++++++-- projects/application-services/build | 4 ++- projects/application-services/config | 23 +++++++++++-- {tools => projects/common}/gen_gradle_deps_file.sh | 0 .../how-to-create-gradle-dependencies-list.txt | 40 ++++++++++++++++------ projects/fenix/build | 7 +++- projects/fenix/config | 33 ++++++++++++------ 9 files changed, 105 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index d4562ac..c30c70b 100644 --- a/Makefile +++ b/Makefile @@ -219,6 +219,15 @@ create_glean_deps_tarball: submodule-update create_glean_deps_tarball-with_torsocks: submodule-update $(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 --target with_torsocks +get_gradle_dependencies_list-fenix: submodule-update + $(rbm) build fenix --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 + +get_gradle_dependencies_list-application-services: submodule-update + $(rbm) build application-services --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 + +get_gradle_dependencies_list-android-components: submodule-update + $(rbm) build android-components --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 + submodule-update: git submodule update --init diff --git a/projects/android-components/build b/projects/android-components/build index 896ba3a..e14b803 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -41,7 +41,9 @@ patch -p1 < $rootdir/git.patch # XXX: fetching deps for `assembleGeckoBeta -x lint` by using that same target # results in some missing dependencies for yet unknown reasons. Thus, we use # `assemble` instead for now. - gradle --debug --no-daemon assemble + gradle --debug --no-daemon assemble > gradle.log 2>&1 || ( cat gradle.log; exit 1 ) + $rootdir/gen_gradle_deps_file.sh gradle.log + mv gradle-dependencies-list.txt '[% dest_dir _ "/" _ c("filename") %]' [% ELSE %] # Prepare Glean dependencies for offline build tar -xf $rootdir/[% c('input_files_by_name/glean') %] diff --git a/projects/android-components/config b/projects/android-components/config index 531b278..33bcdaf 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -14,9 +14,6 @@ var: use_container: 1 # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 22 - # Switch to make it easier to grab all dependencies during a dry-run. - # Note: Use the commit before support for new GeckoView interfaces gets added. - fetch_gradle_dependencies: 0 gradle_version: 6.6.1 glean_parser: 2.2.0 @@ -27,10 +24,13 @@ targets: input_files: - project: container-image + pkg_type: build - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + pkg_type: build - project: gradle name: gradle + pkg_type: build - name: geckoview project: geckoview pkg_type: merge_aars @@ -52,6 +52,8 @@ input_files: name: glean sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6 enable: '[% !c("var/fetch_gradle_dependencies") %]' + - filename: gen_gradle_deps_file.sh + enable: '[% c("var/fetch_gradle_dependencies") %]' steps: list_toolchain_updates: @@ -75,3 +77,9 @@ steps: - name: glean project: glean pkg_type: src + + get_gradle_dependencies_list: + filename: 'gradle-dependencies-list-[% c("var/android_components_version") %].txt' + get_gradle_dependencies_list: '[% INCLUDE build %]' + var: + fetch_gradle_dependencies: 1 diff --git a/projects/application-services/build b/projects/application-services/build index b7461bf..40001cd 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -83,7 +83,9 @@ patch -p1 < $rootdir/target.patch [% IF c('var/fetch_gradle_dependencies') %] # XXX: `assemble` is still not enough to see all fetched dependencies via # Gradle's --debug. See: tor-browser-build#40056. - gradle --debug --no-daemon assemble + gradle --debug --no-daemon assemble > gradle.log 2>&1 || ( cat gradle.log; exit 1 ) + $rootdir/gen_gradle_deps_file.sh gradle.log + mv gradle-dependencies-list.txt '[% dest_dir _ "/" _ c("filename") %]' [% ELSE %] # Prepare Glean dependencies for offline build tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 diff --git a/projects/application-services/config b/projects/application-services/config index 588d573..456ce87 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -12,50 +12,61 @@ var: gradle_dependencies_version: 5 # This should be updated when the list of rust dependencies is changed. rust_vendor_version: 5 - # Switch to make it easier to grab all dependencies during a dry-run. - fetch_gradle_dependencies: 0 gradle_version: 6.5 input_files: - project: container-image + pkg_type: build - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' + pkg_type: build - project: gradle name: gradle + pkg_type: build - project: rust name: rust + pkg_type: build - project: uniffi-rs name: uniffi-rs + pkg_type: build - project: nss name: nss-armv7 + pkg_type: build target_prepend: - android-armv7 - project: nss name: nss-aarch64 + pkg_type: build target_prepend: - android-aarch64 - project: nss name: nss-x86 + pkg_type: build target_prepend: - android-x86 - project: nss name: nss-x86_64 + pkg_type: build target_prepend: - android-x86_64 - project: sqlcipher name: sqlcipher-armv7 + pkg_type: build target_prepend: - android-armv7 - project: sqlcipher name: sqlcipher-aarch64 + pkg_type: build target_prepend: - android-aarch64 - project: sqlcipher name: sqlcipher-x86 + pkg_type: build target_prepend: - android-x86 - project: sqlcipher name: sqlcipher-x86_64 + pkg_type: build target_prepend: - android-x86_64 - name: python @@ -79,6 +90,8 @@ input_files: - filename: target.patch - filename: viaduct-workaround.patch - filename: update-cargo-lock.patch + - filename: gen_gradle_deps_file.sh + enable: '[% c("var/fetch_gradle_dependencies") %]' steps: list_toolchain_updates: @@ -87,3 +100,9 @@ steps: var: container: use_container: 0 + + get_gradle_dependencies_list: + filename: 'gradle-dependencies-list-[% c("version") %].txt' + get_gradle_dependencies_list: '[% INCLUDE build %]' + var: + fetch_gradle_dependencies: 1 diff --git a/tools/gen_gradle_deps_file.sh b/projects/common/gen_gradle_deps_file.sh similarity index 100% rename from tools/gen_gradle_deps_file.sh rename to projects/common/gen_gradle_deps_file.sh diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt index 940f810..b233eec 100644 --- a/projects/common/how-to-create-gradle-dependencies-list.txt +++ b/projects/common/how-to-create-gradle-dependencies-list.txt @@ -3,9 +3,17 @@ If additional Android dependencies are required by the project's build, then the Gradle build will fail due to missing dependencies. To find out what the missing dependencies are take the following steps. -If the dependencies for `application-services`, `android-components`, or `fenix` -are needed, set the `fetch_gradle_dependencies` flag in their `config` files to -`1`. +1) Updating gradle dependencies for `application-services`, `android-components` + or `fenix` + +The following makefile rules can be used: + + make get_gradle_dependencies_list-application-services + make get_gradle_dependencies_list-android-components + make get_gradle_dependencies_list-fenix + +which should create the gradle-dependencies-list.txt files in the +corresponding out/$project directory, using nightly's branch. Note: `android-components` and `fenix` require modified `geckoview` and `android-components` artifacts to compile successfully. In order to generate the @@ -18,7 +26,16 @@ breaks). For `fenix` dependencies there is still a manual processing required afterwards right now as e.g. our tor-android-service related artifacts are not picked up. -For the firefox project, comment out the following line in the project's build file: + +2) Updating gradle dependencies for `geckoview`, `tor-android-service` + or `tor-onion-proxy-library` + +The `geckoview`, `tor-android-service` and `tor-onion-proxy-library` +projects don't have (yet) a makefile rule to generate their +gradle-dependencies-list.txt file, so a few more steps are needed. + +For the geckoview project, comment out the following line in the project's +build file: export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo" @@ -34,11 +51,14 @@ Finally, allow network access during the build by setting Dependent artifacts will show up as downloads in the logs. You can pull out these dependencies into a list by passing the log file to the gradle dependency -list script in the tools directory: +list script in the projects/common directory: + +`projects/common/gen_gradle_deps_file.sh /path/to/log/file` + -`./gen_gradle_deps_file.sh /path/to/log/file` +3) Copying the resulting `gradle-dependencies-list.txt` -Copy the resulting `gradle-dependencies-list.txt` over the one in the respective -project. Then, in the project's config file, increment the -`var/gradle_dependencies_version` and make sure to restore the project's build -file back to original or set `fetch_gradle_dependencies` to `0` again. +Copy the resulting `gradle-dependencies-list.txt` (from step 1. or 2.) +over the one in the respective project. Then, in the project's config +file, increment the `var/gradle_dependencies_version` and make sure to +restore the project's build file back to original if you modified it. diff --git a/projects/fenix/build b/projects/fenix/build index b118cdc..6de75cf 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -42,7 +42,12 @@ 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/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} -PdisableOptimization + $GRADLE_HOME/gradle/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] \ + app:assembleAndroidTest -x lint -PtestBuildType=${v,} -PdisableOptimization \ + > gradle.log 2>&1 \ + || ( cat gradle.log; exit 1 ) + $rootdir/gen_gradle_deps_file.sh gradle.log + mv gradle-dependencies-list.txt '[% dest_dir _ "/" _ c("filename") %]' [% ELSE %] # Add our localized strings [% FOREACH lang = c('var/locales_mobile'); diff --git a/projects/fenix/config b/projects/fenix/config index af2772e..b9371d9 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -15,9 +15,6 @@ var: use_container: 1 # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 24 - # 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 glean_parser: 2.2.0 @@ -35,30 +32,22 @@ input_files: name: gradle - name: android-components project: android-components - enable: '[% !c("var/fetch_gradle_dependencies") %]' - name: application-services project: application-services - enable: '[% !c("var/fetch_gradle_dependencies") %]' - name: geckoview project: geckoview pkg_type: merge_aars - enable: '[% !c("var/fetch_gradle_dependencies") %]' - name: python project: python - enable: '[% !c("var/fetch_gradle_dependencies") %]' - name: tba-translation project: tba-translation - enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies - enable: '[% !c("var/fetch_gradle_dependencies") %]' exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %].tar.xz name: glean sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6 - enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: mavenLocal.patch - enable: '[% !c("var/fetch_gradle_dependencies") %]' - project: tor-android-service name: tor-android-service - project: tor-onion-proxy-library @@ -73,3 +62,25 @@ steps: var: container: use_container: 0 + + get_gradle_dependencies_list: + filename: 'gradle-dependencies-list-[% c("var/fenix_version") %].txt' + get_gradle_dependencies_list: '[% INCLUDE build %]' + var: + fetch_gradle_dependencies: 1 + input_files: + - project: container-image + pkg_type: build + - filename: gen_gradle_deps_file.sh + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + pkg_type: build + - project: gradle + name: gradle + pkg_type: build + - project: tor-android-service + name: tor-android-service + pkg_type: build + - project: tor-onion-proxy-library + name: topl + pkg_type: build

1 0

[tor-browser-build/maint-10.0-android] Bug 40293: Patch app-services' vendored uniffi_bindgen
by sysrqb＠torproject.org 06 May '21

06 May '21

commit 30388aad1a5b284893c623ed8fefefb87245e040 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 28 19:38:39 2021 +0000 Bug 40293: Patch app-services' vendored uniffi_bindgen --- ...niverse-of-known-types-in-an-ordered-BTre.patch | 51 ++++++++++++++++++++++ projects/application-services/build | 9 ++++ projects/application-services/config | 1 + 3 files changed, 61 insertions(+) diff --git a/projects/application-services/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch b/projects/application-services/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch new file mode 100644 index 0000000..947b2f6 --- /dev/null +++ b/projects/application-services/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch @@ -0,0 +1,51 @@ +From 4b9826025ac3242580efd7549d9b55d4466112e3 Mon Sep 17 00:00:00 2001 +From: Matthew Finkel <sysrqb(a)torproject.org> +Date: Wed, 28 Apr 2021 18:38:47 +0000 +Subject: [PATCH] Store the universe of known types in an ordered BTreeSet + (#374) + +The set of types is used in multiple places during FFI creation. When +the data structure does not guarantee the order of elements, such as +HashSet, the resulting generated source code is not deterministic. Using +a BTreeSet resolves this issue by providing a well-defined element order +over which the the set may be iterated. +--- + uniffi_bindgen/src/interface/types/mod.rs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/uniffi_bindgen/src/interface/types/mod.rs b/uniffi_bindgen/src/interface/types/mod.rs +index c4b0094..670b4bb 100644 +--- a/uniffi_bindgen/src/interface/types/mod.rs ++++ b/uniffi_bindgen/src/interface/types/mod.rs +@@ -21,7 +21,7 @@ + //! about how these API-level types map into the lower-level types of the FFI layer as represented + //! by the [`ffi::FFIType`] enum, but that's a detail that is invisible to end users. + +-use std::{collections::hash_map::Entry, collections::HashMap, collections::HashSet}; ++use std::{collections::hash_map::Entry, collections::BTreeSet, collections::HashMap}; + + use anyhow::{bail, Result}; + +@@ -35,7 +35,7 @@ pub(super) use resolver::{resolve_builtin_type, TypeResolver}; + /// Represents all the different high-level types that can be used in a component interface. + /// At this level we identify user-defined types by name, without knowing any details + /// of their internal structure apart from what type of thing they are (record, enum, etc). +-#[derive(Debug, Clone, Eq, PartialEq, Hash)] ++#[derive(Debug, Clone, Eq, PartialEq, Hash, Ord, PartialOrd)] + pub enum Type { + // Primitive types. + UInt8, +@@ -159,8 +159,8 @@ impl Into<FFIType> for &Type { + pub(crate) struct TypeUniverse { + // Named type definitions (including aliases). + type_definitions: HashMap<String, Type>, +- // All the types in the universe, by canonical type name. +- all_known_types: HashSet<Type>, ++ // All the types in the universe, by canonical type name, in a well-defined order. ++ all_known_types: BTreeSet<Type>, + } + + impl TypeUniverse { +-- +2.25.1 + diff --git a/projects/application-services/build b/projects/application-services/build index 40001cd..b22b4c7 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -49,6 +49,15 @@ directory = "/var/tmp/build/application-services/vendor" offline=true EOF +# Bug 40293: Patch vendored uniffi_bindgen. +pushd /var/tmp/build/application-services/vendor/ +patch -p1 < $rootdir/0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch +# Update the expected checksum in the vendored source. +sed -i \ + 's/e39e61458d0d28c2b3425852c8a55625cc185ce806fbc7c0c6682f8cc93dec8d/0909e5214eedf1f2e709909176b1cbda39887002b26388535c3bc551fb04da1b/' \ + uniffi_bindgen/.cargo-checksum.json +popd + patch -p1 < $rootdir/update-cargo-lock.patch cd components/external/nimbus-sdk patch -p1 < $rootdir/viaduct-workaround.patch diff --git a/projects/application-services/config b/projects/application-services/config index ba5acc1..efbe321 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -90,6 +90,7 @@ input_files: - filename: update-cargo-lock.patch - filename: gen_gradle_deps_file.sh enable: '[% c("var/fetch_gradle_dependencies") %]' + - filename: 0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch steps: list_toolchain_updates:

1 0

[tor-browser-build/maint-10.0-android] Bug 40271: Improve process to generate rust vendor tarballs
by sysrqb＠torproject.org 06 May '21

06 May '21

commit 11420c1d0785bbf38dbfabeb1ab29a9faa9f8f96 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 21 17:23:40 2021 +0200 Bug 40271: Improve process to generate rust vendor tarballs --- Makefile | 15 +++++++++++++++ projects/application-services/config | 17 ++++++++++++++--- projects/cbindgen/config | 9 +++++++++ projects/lucetc/config | 10 ++++++++-- projects/uniffi-rs/config | 9 ++++++++- rbm.conf | 30 ++++++++++++++++++++++++++++++ 6 files changed, 84 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c30c70b..0092cc2 100644 --- a/Makefile +++ b/Makefile @@ -228,6 +228,21 @@ get_gradle_dependencies_list-application-services: submodule-update get_gradle_dependencies_list-android-components: submodule-update $(rbm) build android-components --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 +cargo_vendor-application-services: submodule-update + $(rbm) build application-services --step cargo_vendor --target nightly + +cargo_vendor-cbindgen-android: submodule-update + $(rbm) build cbindgen --step cargo_vendor --target nightly --target android + +cargo_vendor-cbindgen: submodule-update + $(rbm) build cbindgen --step cargo_vendor --target nightly + +cargo_vendor-lucetc: submodule-update + $(rbm) build lucetc --step cargo_vendor --target nightly + +cargo_vendor-uniffi-rs: submodule-update + $(rbm) build uniffi-rs --step cargo_vendor --target nightly + submodule-update: git submodule update --init diff --git a/projects/application-services/config b/projects/application-services/config index 456ce87..ba5acc1 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -79,9 +79,7 @@ input_files: - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2 sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2 enable: '[% !c("var/fetch_gradle_dependencies") %]' - # `cargo vendor vendor -s components/external/nimbus-sdk/nimbus/Cargo.toml` - # in the `application-services` directory has vendored the sources, - # after applying update-cargo-lock.patch and viaduct-workaround.patch + # Use `make cargo_vendor-application-services` to re-generate the vendor tarball - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-v… c('var/rust_vendor_version') %].tar.bz2 sha256sum: 5f1c9e1bc0db283e88516bd1d78187145bacbf4aeb72972ac09875c1147d2215 - filename: no-git.patch @@ -106,3 +104,16 @@ steps: get_gradle_dependencies_list: '[% INCLUDE build %]' var: fetch_gradle_dependencies: 1 + + cargo_vendor: + filename: '[% project %]-vendor-[% c("version") %].tar.bz2' + var: + cargo_vendor_opts: '-s components/external/nimbus-sdk/nimbus/Cargo.toml' + pre_cargo_vendor: | + patch -p1 < $rootdir/update-cargo-lock.patch + patch -d components/external/nimbus-sdk -p1 < $rootdir/viaduct-workaround.patch + input_files: + - project: container-image + pkg_type: build + - filename: viaduct-workaround.patch + - filename: update-cargo-lock.patch diff --git a/projects/cbindgen/config b/projects/cbindgen/config index a4e9cb7..43c2fb8 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -23,5 +23,14 @@ input_files: - name: rust project: rust # `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 sha256sum: '[% c("var/cbindgen_vendor_hash") %]' + +steps: + cargo_vendor: + filename: '[% project %]-vendor-[% c("version") %].tar.bz2' + input_files: + - project: container-image + pkg_type: build diff --git a/projects/lucetc/config b/projects/lucetc/config index 72b79fe..e806685 100644 --- a/projects/lucetc/config +++ b/projects/lucetc/config @@ -27,7 +27,13 @@ input_files: project: rust - name: wasi-sysroot project: wasi-sysroot - # `cargo vendor vendor` in the `lucetc-sandbox-compiler` directory has vendored - # the sources. + # Use `make cargo_vendor-lucetc` to re-generate the vendor tarball - URL: https://people.torproject.org/~gk/mirrors/sources/lucetc-vendor.tar.bz2 sha256sum: 12ba97fca12177e7ed5b5409fcfdbd31dc7db2e82282768d99dee5bcb1b1246a + +steps: + cargo_vendor: + filename: '[% project %]-vendor-[% c("version") %].tar.bz2' + input_files: + - project: container-image + pkg_type: build diff --git a/projects/uniffi-rs/config b/projects/uniffi-rs/config index acd9d2d..c8ad51c 100644 --- a/projects/uniffi-rs/config +++ b/projects/uniffi-rs/config @@ -12,7 +12,14 @@ input_files: - project: container-image - name: rust project: rust - # `cargo vendor vendor` in the `uniffi-rs` directory has vendored the sources. + # Use `make cargo_vendor-uniffi-rs` to re-generate the vendor tarball - URL: https://people.torproject.org/~boklm/mirrors/sources/uniffi-rs-vendor-[% c('version') %].tar.bz2 sha256sum: 8f201df618b3e7bcaaf01a87e0d55171605b80abeb1b660fe4dd0b9bfc10a0d8 - filename: btreeset.patch + +steps: + cargo_vendor: + filename: '[% project %]-vendor-[% c("version") %].tar.bz2' + input_files: + - project: container-image + pkg_type: build diff --git a/rbm.conf b/rbm.conf index 646f353..3228453 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,40 @@ steps: set -e mkdir -p '[% dest_dir %]' mv -vf '[% project %]-[% c("version") %].tar.xz' '[% dest_dir %]/[% c("filename") %]' + list_toolchain_updates: build_log: '-' list_toolchain_updates: '[% INCLUDE list_toolchain_updates %]' + cargo_vendor: + output_dir: "out/[% project %]/cargo_vendor" + var: + container: + suite: buster + arch: amd64 + pre_pkginst: '' + deps: + - cargo + - patch + cargo_vendor: | + #!/bin/bash + [% c("var/set_default_env") %] + tar -xf [% project %]-[% c('version') %].tar.gz + cd [% project %]-[% c('version') %] + [% c("var/pre_cargo_vendor") %] + cargo vendor vendor [% c("var/cargo_vendor_opts") %] + [% c('tar', { + tar_src => [ 'vendor' ], + tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'), + }) %] + cd [% dest_dir %] + fname="out/[% project %]/cargo_vendor/[% c('filename') %]" + echo + echo "Finished creating $fname" + sha256sum "[% c('filename') %]" + echo "You can upload it with:" + echo " scp -p $fname people.torproject.org:public_html/mirrors/sources" + # buildconf contains build options that the user can change in rbm.local.conf # When adding a new option to buildconf, a default value should be defined # in var/build_id, so that changing this option does not affect the build_id.

1 0

[tor-browser-build/maint-10.0-android] Bug 40291: Correctly print the fenix minSdkVersion
by sysrqb＠torproject.org 06 May '21

06 May '21

commit 06c8072b2a0e1abcc2cb9beacadf93c788118bf7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 28 10:52:11 2021 +0200 Bug 40291: Correctly print the fenix minSdkVersion --- projects/fenix/list_toolchain_updates_checks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fenix/list_toolchain_updates_checks b/projects/fenix/list_toolchain_updates_checks index 43dd1b4..1b8e02c 100644 --- a/projects/fenix/list_toolchain_updates_checks +++ b/projects/fenix/list_toolchain_updates_checks @@ -45,7 +45,7 @@ if (m/const\\s+val\\s+minSdkVersion\\s+=\\s+([^"]+)/) { EOF needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p") current=21 -check_update_needed compileSdkVersion "$needed" "$current" +check_update_needed minSdkVersion "$needed" "$current" # gradle

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits May 2021