December 2021 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40373: Update components for mozilla93: gradle part
by sysrqb＠torproject.org 17 Dec '21

17 Dec '21

commit cc9a96e5939796c62be991e0ebd826a7ce545b91 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 11 18:14:13 2021 +0200 Bug 40373: Update components for mozilla93: gradle part --- projects/gradle/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/gradle/config b/projects/gradle/config index 8e732f5..de9b8ff 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -13,6 +13,9 @@ var: 6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f 6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a 6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac + 6.7.1: 3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d + 6.9.1: 8c12154228a502b784f451179846e518733cf856efc7d45b2e6691012977b2fe + 7.0.2: 0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c input_files: - project: container-image

1 0

[tor-browser-build/master] Bug 40373: Don't set ANDROID_SDK_HOME
by sysrqb＠torproject.org 17 Dec '21

17 Dec '21

commit b72c51a44471b8d533003f0b015f564bd3182c59 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Oct 19 12:02:54 2021 +0200 Bug 40373: Don't set ANDROID_SDK_HOME While building android-components with gradle 7.0.2 we get the following error: A problem occurred evaluating project ':browser-awesomebar'. > Failed to apply plugin 'com.android.internal.library'. > ANDROID_SDK_HOME is set to the root of your SDK: /var/tmp/dist/android-toolchain/android-sdk-linux ANDROID_SDK_HOME was meant to be the parent path of the preference folder expected by the Android tools. It is now deprecated. To set a custom preference folder location, use ANDROID_USER_HOME. It should NOT be set to the same directory as the root of your SDK. To set a custom SDK location, use ANDROID_HOME. To avoid this error, we don't set ANDROID_SDK_HOME and only set ANDROID_HOME. --- projects/android-toolchain/config | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index b854189..47108de 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -13,16 +13,15 @@ var: setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] - export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux + export ANDROID_HOME=/var/tmp/dist/[% project %]/android-sdk-linux # By default we use the old NDK which is the one GeckoView is using. # However, we can overwrite that per project if needed (e.g. # application-services is currently on a newer NDK). - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] + export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME export ANDROID_NDK_API_VERSION=[% c("var/android_ndk_version") %][% c('var/android_ndk_revision') %] export NDK_HOST_TAG=linux-x86_64 export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle - export ANDROID_HOME=$ANDROID_SDK_HOME export GRADLE_USER_HOME=$GRADLE_HOME export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin mkdir -p "$GRADLE_HOME"

1 0

[tor-browser-build/master] Bug 40373: Update components for mozilla93: fenix part
by sysrqb＠torproject.org 17 Dec '21

17 Dec '21

commit f635f33202e7a8e01b8690ca8a03d7e42831ecaf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 27 10:38:12 2021 +0200 Bug 40373: Update components for mozilla93: fenix part --- projects/fenix/config | 2 +- projects/fenix/list_toolchain_updates_checks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fenix/config b/projects/fenix/config index f2490b0..5e74ba0 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -16,7 +16,7 @@ var: use_container: 1 # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 32 - gradle_version: 6.5.1 + gradle_version: 7.0.2 glean_parser: 3.4.0 arch_deps: - python3-venv diff --git a/projects/fenix/list_toolchain_updates_checks b/projects/fenix/list_toolchain_updates_checks index 221e7c3..50e8a92 100644 --- a/projects/fenix/list_toolchain_updates_checks +++ b/projects/fenix/list_toolchain_updates_checks @@ -68,6 +68,6 @@ if (m/const\\s+val\\s+android_gradle_plugin\\s+=\\s+"([^"]+)"/) { } EOF needed=$(cat buildSrc/src/main/java/Dependencies.kt | perl -ne "$p") -current='4.0.1' +current='7.0.0' check_update_needed android-gradle-plugin "$needed" "$current"

1 0

[tor-browser-build/master] Bug 40378: Make the list of android components updates for switch to mozilla94-based Fenix
by sysrqb＠torproject.org 17 Dec '21

17 Dec '21

commit 2e4ae144537cbed27007b55dbb1d46a6824a819f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 28 18:28:19 2021 +0200 Bug 40378: Make the list of android components updates for switch to mozilla94-based Fenix --- projects/android-components/config | 2 +- projects/application-services/config | 2 +- projects/fenix/config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 0a3acd5..8d5042c 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -58,7 +58,7 @@ input_files: steps: list_toolchain_updates: git_url: https://github.com/mozilla-mobile/android-components.git - git_hash: releases/93.0 + git_hash: releases/94.0 #tag_gpg_id: 0 var: container: diff --git a/projects/application-services/config b/projects/application-services/config index 5e02071..55c6700 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -100,7 +100,7 @@ input_files: steps: list_toolchain_updates: - git_hash: 'v82.1.0' + git_hash: 'v85.4.0' input_files: [] var: container: diff --git a/projects/fenix/config b/projects/fenix/config index 5e74ba0..d90ac07 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -59,7 +59,7 @@ input_files: steps: list_toolchain_updates: git_url: https://github.com/mozilla-mobile/fenix.git - git_hash: releases_v93.0.0 + git_hash: releases_v94.0.0 #tag_gpg_id: 0 input_files: [] var:

1 0

[tor-browser-build/master] Bug 40379: Update components for mozilla94: geckoview part
by sysrqb＠torproject.org 17 Dec '21

17 Dec '21

commit 1cc73c011cb4cc3f0e92ea6e233ea6f76a0dcf70 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 28 20:09:40 2021 +0200 Bug 40379: Update components for mozilla94: geckoview part --- projects/geckoview/config | 10 +++++----- projects/geckoview/gradle-dependencies-list.txt | 4 ++-- projects/rust/config | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index ce3ed80..4911f81 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,15 +1,15 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 93.0 - torbrowser_branch: 11.0 + geckoview_version: 94.0 + torbrowser_branch: 11.5 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential @@ -23,7 +23,7 @@ var: container: use_container: 1 # this should be updated when the list of gradle dependencies is changed - gradle_dependencies_version: 7 + gradle_dependencies_version: 8 gradle_version: 6.9.1 steps: @@ -144,7 +144,7 @@ steps: targets: nightly: - git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 input_files: diff --git a/projects/geckoview/gradle-dependencies-list.txt b/projects/geckoview/gradle-dependencies-list.txt index 22d2a69..1a0990b 100644 --- a/projects/geckoview/gradle-dependencies-list.txt +++ b/projects/geckoview/gradle-dependencies-list.txt @@ -243,8 +243,8 @@ fdd93302c2eb94bbe6007caa28d072246d2875cda5cb774bb6299416b94d74a6 | https://maven c9fff541d51c11195de305c50bbfe4d1dfc97841983d95f6d7101112603515ab | https://maven.google.com/com/google/android/material/material/1.0.0/materia… 2deaa8c40f27c8af158ae2c2132927cd9be345deb1450da49aca29cb168289cd | https://maven.google.com/com/google/testing/platform/core-proto/0.0.8-alpha… 501e7a6b743cf4e81643ce31e2850f37477494a689513e756e059c688773867f | https://maven.google.com/com/google/testing/platform/core-proto/0.0.8-alpha… -f715b19c918900ad34be8f2e2372d97b1c5fff579a383f0b2dad9581df443ea4 | https://plugins.gradle.org/m2/com/koushikdutta/async/androidasync/2.2.1/and… -522714e46eb74d494c94e37e17114030e618a7560141720998d82f363d1fcd47 | https://plugins.gradle.org/m2/com/koushikdutta/async/androidasync/2.2.1/and… +440a25cd719ed1c40ee48d1ec1fb8a32193e25ddd9b7fa5bbd4e252f9cf8083d | https://plugins.gradle.org/m2/com/koushikdutta/async/androidasync/3.1.0/and… +5d5c55f1ed2ab04d538223d23a39d78c66df4c96f87f634ad7078417b79d3372 | https://plugins.gradle.org/m2/com/koushikdutta/async/androidasync/3.1.0/and… f38510e048be4795658064b8735fdfa4954e54d05af875de7edc738bba326fe4 | https://plugins.gradle.org/m2/com/koushikdutta/async/androidasync/maven-met… b4fe5dab42c4d69f50fbe67507ff58f84897670b6f54d5249c23072c881813cb | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.4/apilint-0.4… a367da6e019475666500af411ffa3f3acee7036b1adee039dc2be21ab9ffbe5e | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.4/apilint-0.4… diff --git a/projects/rust/config b/projects/rust/config index cc27c73..301eef5 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -11,8 +11,8 @@ var: targets: android: var: - current_version: 1.54.0 - previous_version: 1.53.0 + current_version: 1.55.0 + previous_version: 1.54.0 arch_deps: - libssl-dev - pkg-config

1 0

[tor-browser-build/master] Bug 40379: Update components for mozilla94: application-services part
by sysrqb＠torproject.org 17 Dec '21

17 Dec '21

commit 1cd0aadc67c365c84c8971964da75eb260eebe9e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 28 19:45:34 2021 +0200 Bug 40379: Update components for mozilla94: application-services part --- projects/application-services/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/application-services/config b/projects/application-services/config index a7d21c3..2f90643 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: 82.1.0 -git_hash: b0e7775ab12eeb4251f09cdfaab9ddaea22b4438 +version: 85.4.0 +git_hash: b9601a76c7d47aa54c60b81c783571630d4962bf git_url: https://github.com/mozilla/application-services git_submodule: 1 @@ -91,7 +91,7 @@ input_files: enable: '[% !c("var/fetch_gradle_dependencies") %]' # Use `make cargo_vendor-application-services` to re-generate the vendor tarball - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-v… c('version') %].tar.bz2 - sha256sum: e75d17a6cf9481c3f1d18c9b1fff8b38a7a8266dd40e559d2ecac5d58f709e7a + sha256sum: 54f9c8185789ab45cd46e9845a71181c5e7938e26b1b33b3f2f891f0b5cf73b6 - filename: no-git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]'

1 0

[tor-browser-build/master] Bug 40379: Update components for mozilla94: glean part
by sysrqb＠torproject.org 17 Dec '21

17 Dec '21

commit 51cd9dbb3b137e432a7abf8ece15021c2f958a49 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 29 16:22:14 2021 +0200 Bug 40379: Update components for mozilla94: glean part --- projects/android-components/config | 4 ++-- projects/application-services/config | 4 ++-- projects/fenix/config | 4 ++-- projects/glean/config | 10 ++++++++-- rbm.conf | 2 -- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 8d5042c..17fd8c3 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -48,9 +48,9 @@ input_files: - filename: git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' - - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %]-build2.tar.xz + - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' name: glean - sha256sum: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1 + sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: gen_gradle_deps_file.sh enable: '[% c("var/fetch_gradle_dependencies") %]' diff --git a/projects/application-services/config b/projects/application-services/config index 55c6700..a7d21c3 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -85,9 +85,9 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' enable: '[% !c("var/fetch_gradle_dependencies") %]' - - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %]-build2.tar.xz + - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' name: glean-wheels - sha256sum: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1 + sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' enable: '[% !c("var/fetch_gradle_dependencies") %]' # Use `make cargo_vendor-application-services` to re-generate the vendor tarball - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-v… c('version') %].tar.bz2 diff --git a/projects/fenix/config b/projects/fenix/config index d90ac07..a104d44 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -47,9 +47,9 @@ input_files: - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %]-build2.tar.xz + - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' name: glean - sha256sum: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1 + sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' - filename: mavenLocal.patch - project: tor-android-service name: tor-android-service diff --git a/projects/glean/config b/projects/glean/config index 66eb272..cbd55e0 100644 --- a/projects/glean/config +++ b/projects/glean/config @@ -18,12 +18,18 @@ var: - python3-pip - torsocks - xz-utils + glean_wheels_sha256sum: + 3.4.0: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1 + 4.0.0: c974113bd8671364c592fea9b64bac660b59d4f03a7dcecd4dd4e0c355431db8 + glean_wheels_url: + 3.4.0: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-3.4.0-bui… + 4.0.0: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-4.0.0.tar… steps: create_glean_deps_tarball: git_url: '' - version: 3.4.0 - filename: 'glean-wheels-[% c("version") %]-build2.tar.xz' + version: 4.0.0 + filename: 'glean-wheels-[% c("version") %].tar.xz' build_log: '-' var: container: diff --git a/rbm.conf b/rbm.conf index 19d41ce..e09ee13 100644 --- a/rbm.conf +++ b/rbm.conf @@ -305,8 +305,6 @@ targets: # API 21 is the minimum we currently support for 64 bit on Android android_min_api_x86_64: 21 android_min_api_aarch64: 21 - # This is needed to get the offline build part for Glean right. - glean_parser: 1.29.0 container: suite: bullseye arch: amd64

1 0

[tor-browser-build/master] Bug 40379: Update components for mozilla94: android-components part
by sysrqb＠torproject.org 17 Dec '21

17 Dec '21

commit a90b8656c449c97872bba60c55947438b803602a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 29 17:00:51 2021 +0200 Bug 40379: Update components for mozilla94: android-components part --- projects/android-components/config | 8 +-- .../gradle-dependencies-list.txt | 70 +++++++++++----------- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 17fd8c3..11b7413 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -8,14 +8,14 @@ gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]' var: - android_components_version: 93.0.12 - torbrowser_branch: 11.0 + android_components_version: 94.0.12 + torbrowser_branch: 11.5 container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 32 + gradle_dependencies_version: 33 gradle_version: 7.0.2 - glean_parser: 3.4.0 + glean_parser: 4.0.0 git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' arch_deps: - python3-venv diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index 6921a12..88e9a94 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -482,40 +482,42 @@ d7a2ff3a2fdbd0801f832df3de81dab06d9db7e4a57dfa6d768e7c6e5fa22280 | https://dl.go 79b705ecf5140d3a2601b44ef058b4588878432eb6fb2f9d65da0551cb0a8e20 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messag… d2bc7a461351e748444ec816c8350dd908046fa346af60399694a98327d60245 | https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-pr… edac09fc7040687eb455c536d7c85cf0a18dc1c7d5671db49bb60eaa0658810f | https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-pr… -aa4423efe4a6630299615ba4aa13c720ebdb85c8590cdfeda5e354e2fcac4216 | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/82.1.0/au… -481d168336af07ce4072bd162ad55c41386a4e64253d96dbb0d5f5b3491515aa | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/82.1.0/au… -a6e904e2bcbc8e16032b56e6c26835ee6ae083ea6fc1a66c3ae90d82711efe00 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… -d114426ba7cd6e470195fef1157483ce607af51a181f69f30a00986638e0edd2 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… -ff1cbf4f4df7fbac427e86bdfc00ee2b3e6133ec565df11ea6c91ec2363ebbf4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/82.1… -bc59b6bd6afb76b358f82bd9c77c561d519d108703220fedae57a839084401cb | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/82.1… -eef1f7e94bc3114132306b0fd49880f8bbb81da4c96d8a97eb97cb380a8382ad | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/82.1.0/f… -c970f050b84eb7b338cb46fdf3fc70c2a3c917d1758cb8f371bfac8593fc4339 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/82.1.0/f… -d05217947c9cdaf70f3f7c64c5e3767bbd4ab64d738e8f9d4977757063a08940 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/82.1.0/… -40597a8d189b03c0c56462c64a418e246fc8a33d5f69ceedb384c399cd1db4d6 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/82.1.0/… -1a1c925caeabf097f9af9e6d8944cdb30c3dc2e697617543a8122f4ce191c971 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/82.1.0/logi… -98d14b5dd1f174802d390f255489643fd4919fe3bd55e9a3f5f70f2112a8497e | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/82.1.0/logi… -fbf37ead46fcabe4682c42e0f16d54d4a83af465fdcf1d3807f1cec80fa149ff | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/82.… -1c64f065f01baccd3065b0c8d2dacd84a846afbd69a062e4599d75165f8692e7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/82.… -9f3b753cb6d9d18fa2522e3ef772209a3cbb1b515d5d989176466dcd2c670164 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/82.1.0/nimb… -23efddfea472958f9e8cd761cc2f1e53850089bf65ed4101e954e772809c0fd7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/82.1.0/nimb… -c106820aabe480c72e31ae39189ddedd8109a8fb3eda23ac88d85753b5eb7e31 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/82.1.0/plac… -20fe9211e71377eda7a93167bff94e255700769a80c8ca413c0645c40ae4ddbd | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/82.1.0/plac… -2c0f517dc954fe69976160301a8536f254cfe48a51c419f0b60a995ddb47b283 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/82.1.0/push-8… -851b291e89f7b23b2a06909ac733d5773ad418699e2b84e317e05a3f7cf22d54 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/82.1.0/push-8… -7e343240f59e9739571a1e0821dca1574a7c22ab5bd580417e6e309fff12d2aa | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/82.1.0/rus… -021688920222bac92014a2e1d3c92ece76d2986f8fa1506bd7fdabdb9caabba6 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/82.1.0/rus… -dd6bf70921b0fa506bf2ba04fc157441d9ac7d3029ae6d8165199466bed233f8 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/82.1.0/sync… -21f4aa317dec87baac504a63349c5081251cc4e683bdec2833c0bcf51f79cace | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/82.1.0/sync… -d70d1e56adb6df4743f1bb5ce48bc7982f1bac034968263f7e00998571e889b3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/82.1.0… -9d8c08822f42b9efb80300fa3a8da0872d99577a9aeeafae643a1a9fd18191eb | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/82.1.0… -aa7cab56da6f95dd39c19f7f93f68c765d043a03c579f9d89b0df7ffd5d0b2f2 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/82.1.0/tabs-8… -9ccf500928f614ea2fe60a99875c53160b4d7fd07224cb347e9036540c0c0673 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/82.1.0/tabs-8… -2d3b78328f4d8023f417535d93a60a998e861c17e2e233df86241ea7a6bd5405 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/93.0.20210… -db92f1a49bf77c09bc3d52f1e23f24b1fd046cc0b3507da803c7e04f85d6bbdb | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/93.0.20210… -4998a4e21f13260447b2279deba3173da1ee7c0088e04f123242c235d0f7afed | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -ad6954c7e38b6620b5aab0fe71dfd460083764a0ba2757fd3aa21b533ccd1fe2 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -4e8ae96d825c12dfe92eb6351eac1b657e100a46414912a970fa60285a572e57 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/39.0.3/glean-3… -f4a9121f6c0e020b28132479c5b02d46133a17d12f6c01fd483cc735843b473b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/39.0.3/glean-3… +8277d98a89e3518e16b28a135237c4e0ccda4237221adf3fc751a965295e428e | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/85.4.0/au… +fede22566218c6b2756a780af3c30f0cae287e875949a8d65475895457e1e4f4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/85.4.0/au… +fe5a52bc48bd8264ceaa51403e64fbe69812b8def5a4e93a5d1f517b7a44ff8d | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… +afbbd53c9b2ccaa05f28dcc71b16a2774922ba17d42814ac1d112a4ffff46b5b | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… +5b33f935ece0399c835c54be38739078bec8dbbe2386d73785be41bdfdeca804 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/85.4… +fbb5ae44e055e6c8a9fe98f3c1c4ea9a2fd2817f3236b8cd97853a08df8bf64a | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/85.4… +aa3795fdc3ba11a940228ae72276974baea0aa3e43805d9d5c3731a0e300678e | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/85.4.0/f… +b4352c45f4503f23dc3c080f39bbfe54c9723ae8c52360f540e1985ea0363d95 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/85.4.0/f… +76e3c870082f72b3bf9fb00bf500bf6eeb7cbb92009276bd3e4a67bb11bdbdf2 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/85.4.0/… +0b6e4ad5e8f0a0852b7c158565e68d6fca13856481324557e6c09639e0d94ca0 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/85.4.0/… +e5d183fdcfddc24ecf0801fd745438fd09c634410bf4d9f89f6c88dc83c6994a | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/85.4.0/logi… +56de071049890a4ed5b1c8a3d297fa5613a9b66435664a6c3ebae08d516f3dae | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/85.4.0/logi… +1ff87d85607d6b6e9fce039b9de72adfdcb60192a89ff64b8c416313f2750652 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/85.… +b875a063b4895c350d1ac9c08dc553d05a4133c5f47c44723591641e891f1add | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/85.… +ea9e702ec0e748f05304ffec5b447630e7de41aade1c5b27c0e69af588847086 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/85.4.0/nimb… +bde98a30342486b7e329fee11ac966699e238a7243dbad5f41c031d3d76cfec2 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/85.4.0/nimb… +406f482ef35f9b98a173a913cec7659a7ede57965dde64fe0c1ec9ff395a6ead | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/85.4.0/plac… +cc8d6940b4ea6dc4c8921b7ec394a8b6fa53392f703300854e79c38c62033bdf | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/85.4.0/plac… +9c4e34c78cc2cff94d94a26cdddbe67300f98ce2a2527f60d279dedee049d858 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/85.4.0/push-8… +50d8685f6bacb24833f8ee248a2336c8c6441032696bbbb964c870b4bb24d7ee | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/85.4.0/push-8… +bf15b4bf629763dc5aa4dd1881261d3dd609e38e4767dd65f1b02c5fee225eb2 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/85.4.0/rus… +5673fdf4fc2e891e8f640b93ae656ce045880f71c56c73774a026fb5a591b2ef | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/85.4.0/rus… +43bc326d973e2dbfba5b0179bf936430ad35286ccc3d909b0087187afaca7255 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/85.4.0/sync… +fb1f7f9f45903cd755f0a409b6b6c5b8c8922c0d9456b3f74af5a4ac5ed1a10c | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/85.4.0/sync… +7fceb955009112bd3ba88df4fb50327b6dc814a6194656c55f5e0e95a454032c | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/85.4.0… +56b45a49f3925546e2ad206919e8cf1e9c1ee44898ce953881d0cd2c208450b7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/85.4.0… +4eec04b606be370accec33a7eb490a914ad8c5830405d3ed0716f3450acb3acf | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/85.4.0/tabs-8… +b09902fd7bb4ee699babe825f052190a1dcfcd2d2b32662c1cb53a85b6d5e113 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/85.4.0/tabs-8… +4ce089ba7734ca5236e3e15bd368af07019e961aec180ce3e6e0cacfb499d800 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-omni/94.0.… +33bf1ef44daca5d57fd8439b9f8ccff909de4e0b5a394fa73ff3053afb929d4a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-omni/94.0.… +70c1b35166239cd833af00db859d67ae53645462bab25f8a5146bfde199b21c8 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… +6671a1894400dad2af4e2122cbe75ba91278cd770124516e2363459e2bfa4603 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… +96c8591f8d719bd77a9a89f6033976ddbab242077bbdee898f35998bbf8b1f5e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/42.0.1/… +6e0173fd6897f647ac3359fc3bd9306a3dd21713c6ca982a837fc13c227ed0ac | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-native/42.0.1/… +6f54126fc5510a060d2af2a9cacd2ab3758e69350288552123dbb7dc53680e18 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/42.0.1/glean-4… +e9d477b5bac151355830814cff665715e01c400a9ee26e1ea414a8726a582baf | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/42.0.1/glean-4… def9b4225fa37219e18f81d01f0e52d73dca1257a38f5475be9dd58f87736510 | https://plugins.gradle.org/m2/com/github/gundy/semver4j/0.16.4/semver4j-0.1… 32001db2443b339dd21f5b79ff29d1ade722d1ba080c214bde819f0f72d1604d | https://plugins.gradle.org/m2/com/github/gundy/semver4j/0.16.4/semver4j-0.1… 3736463859ec19267295e894940ae82a8f684413031122fe35ce7cff7e30a774 | https://plugins.gradle.org/m2/com/google/code/gson/gson-parent/2.8.6/gson-p…

1 0

[tor-browser-build/master] Bug 40398: Jetify tor-android-service packages
by sysrqb＠torproject.org 17 Dec '21

17 Dec '21

commit 25e1b03fc978eb58dc74a1b32c45eb943970fb5b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Dec 10 17:17:21 2021 +0000 Bug 40398: Jetify tor-android-service packages --- projects/tor-android-service/build | 8 ++++++-- projects/tor-android-service/config | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 797d5c2..cee92c2 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -12,6 +12,7 @@ mkdir -p /var/tmp/build $output_dir [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +unzip -d $rootdir $rootdir/[% c('input_files_by_name/jetifier') %] cd /var/tmp/build/[% project %]-[% c('version') %] # Replace pre-packaged tor library with the latest build @@ -27,5 +28,8 @@ cp $rootdir/[% c('input_files_by_name/topl') %]/*{.aar,.jar} service/libs/ # Build Android Libraries and Apps gradle --offline --no-daemon -P androidplugin=3.6.0 -P appcompatVersion=28.0.0 -P compileVersion=29 -P targetVersion=29 -P minVersion=16 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint -# Package -cp jsocksAndroid/build/outputs/aar/* service/build/outputs/aar/* $output_dir +# Bug 40398: Manually jetify each archive and save it in $output_dir +for aar in jsocksAndroid/build/outputs/aar/* service/build/outputs/aar/*; do + fn=`basename $aar` + $rootdir/jetifier-standalone/bin/jetifier-standalone -l info -i $aar -o $output_dir/$fn +done diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index c1ccb7d..fd92cc7 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -8,6 +8,7 @@ git_submodule: 1 var: deps: - build-essential + - unzip container: use_container: 1 # this should be updated when the list of gradle dependencies is changed @@ -41,3 +42,6 @@ input_files: name: tor-x86_64 target_prepend: - android-x86_64 + - URL: 'https://dl.google.com/dl/android/studio/jetifier-zips/1.0.0-beta10/jetifier…' + name: jetifier + sha256sum: 38186db9c9d1b745890b3d35c0667da1cac146ceb3c26aae5bf0802119472c1b

1 0

[tor-browser-build/maint-11.0] Bug 40403: Update Go to 1.16.12
by gk＠torproject.org 16 Dec '21

16 Dec '21

commit 6f202d0461f50dfa72371a7480e3bc257a364a57 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 16 12:16:11 2021 +0000 Bug 40403: Update Go to 1.16.12 --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 0616723..342ba3d 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.16.9 +version: 1.16.12 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 0a1cc7fd7bd20448f71ebed64d846138850d5099b18cf5cc10a4fc45160d8c3d + sha256sum: 2afd839dcb76d2bb082c502c01a0a5cdbfc09fd630757835363c4fde8e2fbfe8 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0