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

[tor-browser-build/master] Bug 40172: Remove gradle 6.5.1 from android-toolchain
by sysrqb＠torproject.org 16 Mar '21

16 Mar '21

commit 13a415f6b59d637e80315147c579f4f8ea8fa547 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 4 19:41:58 2021 +0100 Bug 40172: Remove gradle 6.5.1 from android-toolchain --- projects/android-toolchain/build | 2 -- projects/android-toolchain/config | 4 ---- projects/fenix/build | 6 ++++-- projects/fenix/config | 3 +++ projects/gradle/config | 1 + 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index a0d5ee8..ff132be 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -20,8 +20,6 @@ unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME unzip -qq [% c("input_files_by_name/gradle511") %] -d $GRADLE_HOME # application-services is using a comparatively new Gradle, bundle it, too. unzip -qq [% c("input_files_by_name/gradle63") %] -d $GRADLE_HOME -# Fenix switched to a fairly recent Gradle, add it as well. -unzip -qq [% c("input_files_by_name/gradle651") %] -d $GRADLE_HOME # NDK Archive for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index f3214ab..648b1d9 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -32,7 +32,6 @@ var: android_ndk_version: 21 android_ndk_version_old: 20 android_ndk_revision: d - gradle651: 6.5.1 gradle63: 6.3 gradle564: 5.6.4 gradle511: 5.1.1 @@ -62,9 +61,6 @@ input_files: - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' name: android_ndk_compiler_old sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle651") %]-bin.zip - name: gradle651 - sha256sum: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle63") %]-bin.zip name: gradle63 sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768 diff --git a/projects/fenix/build b/projects/fenix/build index c91dce3..c2f6f32 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -6,6 +6,8 @@ builddir=/var/tmp/build/[% project %] mkdir -p $distdir/[% project %] mkdir -p /var/tmp/build +tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] + cat > get-moz-build-date << "EOF" [% INCLUDE "get-moz-build-date" %] EOF @@ -40,7 +42,7 @@ 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-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} + $GRADLE_HOME/gradle/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} [% ELSE %] # Add our localized strings [% FOREACH lang = c('var/locales_mobile'); @@ -65,7 +67,7 @@ v=[% c("variant") %] fi version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version") %]-[% c("variant") %])' - $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} + $GRADLE_HOME/gradle/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,} cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %] cp app/build/outputs/apk/androidTest/${v,}/app-${v,}-androidTest.apk $distdir/[% project %] diff --git a/projects/fenix/config b/projects/fenix/config index ae81e3f..79c9cd1 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -18,6 +18,7 @@ var: # 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 targets: nightly: @@ -29,6 +30,8 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - project: gradle + name: gradle - name: android-components project: android-components enable: '[% !c("var/fetch_gradle_dependencies") %]' diff --git a/projects/gradle/config b/projects/gradle/config index 4ad4a16..3f0f412 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -9,6 +9,7 @@ var: - unzip gradle_sha256sum: 6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f + 6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a 6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac input_files:

1 0

[tor-browser-build/master] Bug 40172: Remove gradle 5.6.4 from android-toolchain
by sysrqb＠torproject.org 16 Mar '21

16 Mar '21

commit 80b987aebabd8b3a77edf2447ad525f1b2cc81f7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 5 15:35:25 2021 +0100 Bug 40172: Remove gradle 5.6.4 from android-toolchain --- projects/android-toolchain/build | 4 +--- projects/android-toolchain/config | 13 ++----------- projects/gradle/config | 1 + projects/tor-android-service/build | 1 + projects/tor-android-service/config | 3 +++ projects/tor-onion-proxy-library/build | 1 + projects/tor-onion-proxy-library/config | 3 +++ 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index c906776..fa90f64 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -3,19 +3,17 @@ export PROJECT_PATH=/var/tmp/dist/[% project %] export SDK_HOME=$PROJECT_PATH/android-sdk-linux export NDK_HOME=$PROJECT_PATH/android-ndk -export GRADLE_HOME=$PROJECT_PATH/gradle android_release_dir=android-10 android_release_dir_old=android-9 # Make directories -mkdir -p $NDK_HOME $SDK_HOME $GRADLE_HOME +mkdir -p $NDK_HOME $SDK_HOME # Compiler Archives unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME # GeckoView is still using an older Android NDK, bundle it, too. unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME -unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME # NDK Archive for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 5d6190b..8ee72a1 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -19,20 +19,14 @@ var: export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle export ANDROID_HOME=$ANDROID_SDK_HOME export GRADLE_USER_HOME=$GRADLE_HOME - # In the PATH we set $GRADLE_HOME/gradle/bin (not included in - # android-toolchain) before $GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin - # (which is included in android-toolchain)). - # - # Project which need a specific gradle version can use the gradle - # project and extract it in $GRADLE_HOME/gradle/bin - export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin + export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin + mkdir -p "$GRADLE_HOME" google_repo: https://dl.google.com/android/repository android_api_level: 29 android_platform_revision: 04 android_ndk_version: 21 android_ndk_version_old: 20 android_ndk_revision: d - gradle564: 5.6.4 input_files: - project: container-image - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' @@ -59,6 +53,3 @@ input_files: - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' name: android_ndk_compiler_old sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle564") %]-bin.zip - name: gradle564 - sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d diff --git a/projects/gradle/config b/projects/gradle/config index 6e2dea1..8e732f5 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -9,6 +9,7 @@ var: - unzip gradle_sha256sum: 5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 + 5.6.4: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d 6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f 6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a 6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 7efd708..68d63cd 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -10,6 +10,7 @@ cp -r $gradle_repo/maven2/* $gradle_repo 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 cd /var/tmp/build/[% project %]-[% c('version') %] diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index faeaeb3..171f4a9 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -12,11 +12,14 @@ var: use_container: 1 # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 + gradle_version: 5.6.4 input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - project: gradle + name: gradle - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index c9b1e7a..d4950f6 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -12,6 +12,7 @@ cp -r $gradle_repo/maven2/* $gradle_repo 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 # Patch projects diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index d07c37b..f4a5c24 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -14,11 +14,14 @@ var: use_container: 1 # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 + gradle_version: 5.6.4 input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - project: gradle + name: gradle - project: obfs4 name: obfs4-armv7 target_prepend:

1 0

[tor-browser-build/master] Bug 40172: Remove gradle 5.1.1 from android-toolchain
by sysrqb＠torproject.org 16 Mar '21

16 Mar '21

commit be1f8b458e47fbc4299b8282b4f328e3fa6af49a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 4 20:02:15 2021 +0100 Bug 40172: Remove gradle 5.1.1 from android-toolchain --- projects/android-toolchain/build | 2 -- projects/android-toolchain/config | 4 ---- projects/geckoview/build | 2 ++ projects/geckoview/config | 8 ++++++++ projects/geckoview/mozconfig-android-aarch64 | 2 +- projects/geckoview/mozconfig-android-all | 2 +- projects/geckoview/mozconfig-android-armv7 | 2 +- projects/geckoview/mozconfig-android-x86 | 2 +- projects/geckoview/mozconfig-android-x86_64 | 2 +- projects/gradle/config | 1 + 10 files changed, 16 insertions(+), 11 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index aafc584..c906776 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -16,8 +16,6 @@ unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME # GeckoView is still using an older Android NDK, bundle it, too. unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME -# GeckoView is still using an older Gradle, bundle it, too. -unzip -qq [% c("input_files_by_name/gradle511") %] -d $GRADLE_HOME # NDK Archive for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 24a41c2..5d6190b 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -33,7 +33,6 @@ var: android_ndk_version_old: 20 android_ndk_revision: d gradle564: 5.6.4 - gradle511: 5.1.1 input_files: - project: container-image - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' @@ -63,6 +62,3 @@ input_files: - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle564") %]-bin.zip name: gradle564 sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle511") %]-bin.zip - name: gradle511 - sha256sum: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 diff --git a/projects/geckoview/build b/projects/geckoview/build index 1c6582c..ab80b81 100644 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -5,6 +5,8 @@ distdir=/var/tmp/dist mkdir -p /var/tmp/build mkdir -p $distdir/[% project %] +tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] + # We need to have the get-moz-build-date script available in the container # but we can't include it via input_files as it is a script shared between # projects. diff --git a/projects/geckoview/config b/projects/geckoview/config index 4958f6e..0b0416a 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -26,6 +26,7 @@ var: use_container: 1 # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 6 + gradle_version: 5.1.1 steps: merge_aars: @@ -40,6 +41,8 @@ steps: mkdir -p /var/tmp/build mkdir -p $distdir/[% project %] + tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] + cat > get-moz-build-date << "EOF" [% INCLUDE "get-moz-build-date" %] EOF @@ -99,6 +102,9 @@ steps: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' pkg_type: build + - project: gradle + name: gradle + pkg_type: build - project: node name: node pkg_type: build @@ -141,6 +147,8 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - project: gradle + name: gradle - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - project: binutils diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index 4084714..696359f 100644 --- a/projects/geckoview/mozconfig-android-aarch64 +++ b/projects/geckoview/mozconfig-android-aarch64 @@ -14,7 +14,7 @@ ac_add_options --enable-application=mobile/android ac_add_options --target=aarch64-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle # We do not use Tor Launcher on Android: ac_add_options --disable-tor-launcher diff --git a/projects/geckoview/mozconfig-android-all b/projects/geckoview/mozconfig-android-all index 691b1ab..1b41181 100644 --- a/projects/geckoview/mozconfig-android-all +++ b/projects/geckoview/mozconfig-android-all @@ -7,4 +7,4 @@ ac_add_options --disable-compile-environment ac_add_options --enable-update-channel=beta ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 index 1ac85f7..344d6a1 100644 --- a/projects/geckoview/mozconfig-android-armv7 +++ b/projects/geckoview/mozconfig-android-armv7 @@ -14,7 +14,7 @@ ac_add_options --enable-application=mobile/android ac_add_options --target=arm-linux-androideabi ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle # We do not use Tor Launcher on Android: ac_add_options --disable-tor-launcher diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 index 03de28b..e8899a3 100644 --- a/projects/geckoview/mozconfig-android-x86 +++ b/projects/geckoview/mozconfig-android-x86 @@ -14,7 +14,7 @@ ac_add_options --enable-application=mobile/android ac_add_options --target=i686-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle # We do not use Tor Launcher on Android: ac_add_options --disable-tor-launcher diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 index 5ba86cf..cc9e7d1 100644 --- a/projects/geckoview/mozconfig-android-x86_64 +++ b/projects/geckoview/mozconfig-android-x86_64 @@ -14,7 +14,7 @@ ac_add_options --enable-application=mobile/android ac_add_options --target=x86_64-linux-android ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-5.1.1/bin/gradle +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle # We do not use Tor Launcher on Android: ac_add_options --disable-tor-launcher diff --git a/projects/gradle/config b/projects/gradle/config index 3f0f412..6e2dea1 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -8,6 +8,7 @@ var: deps: - unzip gradle_sha256sum: + 5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f 6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a 6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac

1 0

[tor-browser-build/master] Bug 40172: Simplify gradle's project support for mutliple versions
by sysrqb＠torproject.org 16 Mar '21

16 Mar '21

commit df9fb9628f45f8ed418d7141d57d7ec00a6bed08 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 4 19:12:05 2021 +0100 Bug 40172: Simplify gradle's project support for mutliple versions --- projects/android-components/build | 3 --- projects/android-components/config | 1 + projects/android-toolchain/config | 8 +++++++- projects/application-services/build | 3 --- projects/application-services/config | 6 +----- projects/gradle/build | 2 +- projects/gradle/config | 14 +++++++------- 7 files changed, 17 insertions(+), 20 deletions(-) diff --git a/projects/android-components/build b/projects/android-components/build index 6c62a6c..279525c 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -7,9 +7,6 @@ mkdir $distdir/[% project %] mkdir /var/tmp/build tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] -# XXX: Not needed once we are done with moving Gradle out of our toolchain -# project. -export PATH=$GRADLE_HOME/gradle/bin:$PATH cat > get-moz-build-date << "EOF" [% INCLUDE "get-moz-build-date" %] diff --git a/projects/android-components/config b/projects/android-components/config index fbba9bc..b941e12 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -17,6 +17,7 @@ var: # 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 targets: nightly: diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 5268319..f3214ab 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -19,7 +19,13 @@ var: 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-[% c("var/gradle564") %]/bin + # In the PATH we set $GRADLE_HOME/gradle/bin (not included in + # android-toolchain) before $GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin + # (which is included in android-toolchain)). + # + # Project which need a specific gradle version can use the gradle + # project and extract it in $GRADLE_HOME/gradle/bin + export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin google_repo: https://dl.google.com/android/repository android_api_level: 29 android_platform_revision: 04 diff --git a/projects/application-services/build b/projects/application-services/build index 8cf98a8..24a66f8 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -7,9 +7,6 @@ mkdir $distdir mkdir /var/tmp/build tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] -# XXX: Not needed once we are done with moving Gradle out of our toolchain -# project. -export PATH=$GRADLE_HOME/gradle/bin:$PATH cd /var/tmp/dist [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] tar -xf $rootdir/[% c('input_files_by_name/nss-' _ arch) %] diff --git a/projects/application-services/config b/projects/application-services/config index 4c0d184..11fc5d7 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -12,15 +12,11 @@ var: gradle_dependencies_version: 4 # This should be updated when the list of rust dependencies is changed. rust_vendor_version: 3 - # For armv7 we need a different target than the default one we use for - # GeckoView. We set this variable so the Rust project in the `input_files` - # below can set the correct target when built for use in this project, - # querying `origin_project`. - application_services: 1 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 # application-services is still stuck on an older glean_parser version. glean_parser: 1.28.6 + gradle_version: 6.5 input_files: - project: container-image diff --git a/projects/gradle/build b/projects/gradle/build index 06ea3c6..adb5233 100644 --- a/projects/gradle/build +++ b/projects/gradle/build @@ -1,7 +1,7 @@ #!/bin/bash [% c("var/set_default_env") -%] unzip -qq [% c("input_files_by_name/gradle") %] -mv [% project %]-[% c("var/gradle_version") %] [% project %] +mv [% project %]-[% c("version") %] [% project %] [% c('tar', { tar_src => [ project ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), diff --git a/projects/gradle/config b/projects/gradle/config index 4414436..4ad4a16 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -1,18 +1,18 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("var/gradle_version") %].tar.gz' +filename: '[% project %]-[% c("version") %].tar.gz' +version: '[% pc(c("origin_project"), "var/gradle_version", { error_if_undef => 1 }) %]' var: container: use_container: 1 deps: - unzip - # XXX: Think about ways to make this more legible, in particular once more - # Gradle versions get added. - gradle_version: '[% IF pc(c("origin_project"), "var/application_services") %]6.5[% ELSE %]6.6.1[% END %]' - gradle_sha256sum: '[% IF pc(c("origin_project"), "var/application_services") %]23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f[% ELSE %]7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac[% END %]' + gradle_sha256sum: + 6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f + 6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac input_files: - project: container-image - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip + - URL: https://services.gradle.org/distributions/gradle-[% c("version") %]-bin.zip name: gradle - sha256sum: '[% c("var/gradle_sha256sum") %]' + sha256sum: '[% c("var/gradle_sha256sum/" _ c("version"), { error_if_undef => 1 }) %]'

1 0

[tor-browser-build/master] Bug 40241: Update components for mozilla87-based Fenix (android-components part)
by sysrqb＠torproject.org 16 Mar '21

16 Mar '21

commit 3d1ea7cded3f539f76832cdee99b79d7494e2b15 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 9 19:21:43 2021 +0100 Bug 40241: Update components for mozilla87-based Fenix (android-components part) --- projects/android-components/config | 4 +- projects/android-components/git.patch | 29 +-- .../gradle-dependencies-list.txt | 223 +++++++++++---------- projects/android-toolchain/build | 11 +- projects/android-toolchain/config | 8 + 5 files changed, 151 insertions(+), 124 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index b941e12..e05af21 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -8,12 +8,12 @@ gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]' var: - android_components_version: 72.0.15 + android_components_version: 73.0.3 torbrowser_branch: 10.5 container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 19 + gradle_dependencies_version: 20 # 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 diff --git a/projects/android-components/git.patch b/projects/android-components/git.patch index 0f510f7..23cf1c5 100644 --- a/projects/android-components/git.patch +++ b/projects/android-components/git.patch @@ -1,11 +1,15 @@ -From 96fc057633a96188e00a55a0abc28a19d9b1dcf9 Mon Sep 17 00:00:00 2001 +From ad3f56a9e977b8c83643cfcf6f90b03176392c1f Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Sun, 19 Apr 2020 17:59:16 +0000 -Subject: [PATCH] git patch +Subject: [PATCH 1/2] git patch +--- + components/support/base/build.gradle | 2 +- + publish.gradle | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/support/base/build.gradle b/components/support/base/build.gradle -index 094c85e44..1b46c1b84 100644 +index 3a0ae5002..cffb310d5 100644 --- a/components/support/base/build.gradle +++ b/components/support/base/build.gradle @@ -38,7 +38,7 @@ android { @@ -18,18 +22,15 @@ index 094c85e44..1b46c1b84 100644 } diff --git a/publish.gradle b/publish.gradle -index 09280f51f..14da5a6c0 100644 +index 6bbd206d8..e27c00f67 100644 --- a/publish.gradle +++ b/publish.gradle -@@ -61,7 +61,7 @@ ext.configurePublish = { groupIdArg, artifactIdArg, descriptionArg -> - connection = libVcsUrl - developerConnection = libVcsUrl - url = libUrl -- tag = getGitHash() -+ tag = "release build" +@@ -66,7 +66,7 @@ ext.configurePublish = { groupIdArg, artifactIdArg, descriptionArg -> + connection = libVcsUrl + developerConnection = libVcsUrl + url = libUrl +- tag = getGitHash() ++ tag = "release build" + } } } - } --- -2.28.0 - diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index b62555a..34cc330 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -27,6 +27,8 @@ dd77615bd3dd275afb11b62df25bae46b10b4a117cd37943af45bdcbf8755852 | https://dl.go c0c4ed0160cd2ca18390015de8b392b697c173327c6b2c0947d4e62f6958c05d | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1… f7eab60c57addd94bb06275832fe7600611beaaae1a1ec597c231956faf96c8b | https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asyncl… 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… 1193c04c22a3d6b5946dae9f4e8c59d6adde6a71b6bd5d87fb99d82dda1afec7 | https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/ca… @@ -69,6 +71,8 @@ da6733425a83f5ce850878fa7201082345fed7c668dd58550fdd19c0396c6fa4 | https://dl.go e329d673361e94d2e8f4d4d14e1f0586368bd43fb19efd5766ce7498bcccd162 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.0.0/fr… a14c8b8f2153f128e800fbd266a6beab1c283982a29ec570d2cc05d307d81496 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fr… ef78eb27ac02ddf3545d5f8a3857c73a2837a01853f8d5fcf77251011db52544 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fr… +fdd0eac80c6b26c79093a63fc699303f928cc1fa73ca7196d5590a77eb6d6873 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.0/fr… +295417fbc0edbd706c9415655c111426fba5b20718b4fde601b95ac4f00df9b8 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.0/fr… d19e82d142def6c4e136da70bf92f194c0ecc61d14ab4e84567b2ced0920fa93 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.5/fr… df0aca46b62bb47cc662cbcee63372db6d2a2859478ee38b594fba3433fe30a5 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.5/fr… 33193135a64fe21fa2c35eec6688f1a76e512606c0fc83dc1b689e37add7732a | https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/… @@ -89,8 +93,8 @@ ed88fb124cfb70f2bb928ede1357874374aa45881bcb6d9744c1dc6680fa7c58 | https://dl.go cc30a8a2a97d3767bd169b747c078727308096dd3ab7917d80b2f1f42d118bd6 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common… 8d4072201b6231d67e4192d608d46b1f5c920845106c9831632c2e3ffe706117 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… e18c4bd463eab9432e5a08484d63307aff5205896766802f0978acdb9a37e9c1 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… -bd53c64b038585215b4959c1a388437a3ad525608a31c58e4283c3e371727d4d | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… -510e33b8b6ca33d2fcb3b7615a4528e338b438de398f3ee8de119c26508a5fdd | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… +648c8de1d10b025d524a2e46ac994fc3f6bf186826c09ec1a62d250bf1b877ae | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… +f9b3998f71fc46719f7305d054752d01a9dac0becbee530fd06b70a9cf7ee222 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extens… 5951f882e95b7e05ceb9adfca0fa2ebd511d63ea5a00da4eae6c6d0c1903da18 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… 85695cce0045ebb9cbba3e2fbe7d7953489bdeb517a1b2e834313ce54556ba22 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… fde334ec7e22744c0f5bfe7caf1a84c9d717327044400577bdf9bd921ec4f7bc | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… @@ -109,8 +113,6 @@ d83af94860aa9f64cbdc51f40796a7cf55b116f0e6efd752e845c0104c8b16f6 | https://dl.go 0d1ce392cc13707fc6b7c1aca584c8c2dbc46790abc0542ba228a731e5d63f8d | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… d8ff6fd844559743050c9ae010a6df230f2a3dbdf3e14498316f30bd8df836b5 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… efd48ae233a32d6f93d155bd1b6dc7ea5c6bc34b145d7730636f32f4e9ddf552 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… -8cddd0c7f4927bbf71fb71fca000786df82cc597c99463d6916ccbe4a205a9ac | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… -8bd43b3a4c017cc9f255f0a33cb216a7b5040d6ee1a8838a95b787987601a4e4 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… 3a977e7778fc8418742d388409daaba7ea8fea8823d21ffb96e4c4236f715070 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… e71869a858f4d933da2f59c273ae1a5c426cfe0b017609bb1f6ab57c02aa4bcd | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-proces… c29fc87694e6ce116b61207221e53ed285862a6628055790b0bcf9ce45d8cc68 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtim… @@ -124,6 +126,10 @@ cb2b15bb0cf14134e953ed8ead96f94265018643f519367d51fd837f7311e9f8 | https://dl.go db21f5e6f286231197131ef184ec7f6ad212e27c1c1bad231bc2625030708029 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-servic… 23516745f34f16ff7850bb1eadd55cf193dd789cba428de4bca120433e3bfd69 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-servic… 6b9e4fe350ed993d0c00b5ac0ff22f28bfc3bfbd9ad7eb7afc9b82f8339e673e | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-servic… +ca2801ffc069555afed8eddd2292130f436956452bc8bbad30fb56f8e4e382a0 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-servic… +f238f90a3d9d1f42779367309127dad8ff1a595dfa0754bbae05d77bfd0b5f33 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-servic… +f4cceafbf86acfc7f3ba6a61d6dc6842a6738c1274610767d3ab8f8a114cba97 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… +37a46395fb334f5d54843d5823f37513c80485dcae6cf16188babc49ebe65e17 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… 3ce866fb822b20fe2f188f974992869a0a6233fe40acbefcff090d6def5e7f33 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… 9f31254e547b214257067611f18fc8a3c08f8df9eba634f6e21badc848596db1 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… 60b758fd1c664089f82d1c018ed4ff7955c14a2b1620af7aa106591f733e0827 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmo… @@ -339,7 +345,7 @@ efe2431a01a188d3037d02a08e60900ec7406de626e4bd5b4995f28d409c0ebd | https://dl.go 24bd1b4a8f81aea76ae30054df6343b5c0abc27024a5f6fb9c6ee7d4ffb86533 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-measur… 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… -ae54afed3e3f65a2e3170b203679e86c78979c0c53dd0d7d7a38cf4fa8d46ca7 | https://download.jetbrains.com/kotlin/native/builds/releases/1.4.21/linux/k… +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.… @@ -348,10 +354,6 @@ f80ce42d2ffac47ad4c47e1d6f980d604d247ceb1a886705cf4581ab0c9fe2b8 | https://jcent 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… -77d7638a32bcae42c929eea307c9a3b48ae1a5abd00cd29f7abf6d51079d83a9 | https://jcenter.bintray.com/org/jetbrains/dokka/dokka-android-gradle-plugin… -b76b0106b4624c5677b758f35a3c0c5d7ffb4ebf1cbf88239d269e8ec16fb961 | https://jcenter.bintray.com/org/jetbrains/dokka/dokka-android-gradle-plugin… -e9215460b1bb674b616cb9c8f1a1b172cdd7b3f4749662d864ebd3f319f0d73d | https://jcenter.bintray.com/org/jetbrains/dokka/dokka-gradle-plugin/0.9.17/… -cef786fa30b52f7c22e2e3255510a4ca52849c7a7b27a2568370a7bc6b9e4cfb | https://jcenter.bintray.com/org/jetbrains/dokka/dokka-gradle-plugin/0.9.17/… 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… @@ -395,57 +397,59 @@ a6d50f0321bdb52838c99136930c8dcc78c3074a592d526862ec01be91fa622b | https://jcent 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 -9ac94a78d28f097fe4717b008f339b5582b42f09bfee4874db84f9f44d04178b | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… -ec93cd90a8719f70ac91e837bb387f58209125e089d62e23b9fbadf8c9797a40 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… -c851df79b81bff60b33f42b8f3ad3497f94963eecffdd360d588e06b2f5e1902 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/67.2… -24dea3626ba33a81790713097ecdbb0e40acec1f778f3247d687c2def6e7562a | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/67.2… -3de5412e997e57b938c5d820f2b612aa54f9d4e451ded2cd9daa46830b1140a7 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/67.2.0/f… -1cba0a74d265432f36ee2643b843f2a1aa1f160f7f95b1d0a674b5f84b61bdda | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/67.2.0/f… -c7506f720eb8f9170ccb0f8ab3bc60a19b4d14585a910e6cb8c70b28b5c45b51 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/67.2.0/… -a11bbacf60c9adb449e9aff67af0f0e7725079f496735c762bc627bac1ba6bd5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/67.2.0/… -7ea4e2f86eb19f108a75ad7a6eab3f04aaabc17fe97721e7af6eaf6016e9ac5e | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/67.2.0/logi… -abc9a481d9a8d0cff2aa2bd64ba3659e7e2a79a4fbdbeda0cdf5f2c3f4f3b20f | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/67.2.0/logi… -fa8d2f9ab6a387a164e0c0b78fd72012db661b3d43848f778fb9288f17de0e52 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/67.… -a9986d9325879d5daa274b0cf140917207134975ca30363c49c7f53008bb0e8d | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/67.… -f1280ce4007d3d6f114c35d747c50ef4b8e972ac20812dc1ad5646c58c874446 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/67.2.0/nimb… -c1bb50d0b6c922aafcb8beb4a0115e4f148f18f15237694fcbc9215806b784ee | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/67.2.0/nimb… -84b1f7298bac034edafc3daef1a8b1fc89543a8ebe5b762c5c3c18abe8a01f7d | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/67.2.0/plac… -20b128955bc1dc0a648cb179337d181c5b8f2c01d17a4eaf778a542007a5ddd3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/67.2.0/plac… -e0876d0f2a8672b608d3d702bc42c8b833a1a146e359c18e0fed2b61d00d3975 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/67.2.0/push-6… -6b6fda096740b2b0293adef4254aec90b43c8061bfa57c95afa6c44998fb4d2e | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/67.2.0/push-6… -8a91c6b51965a76397500c8e3660ec85a4dafe591322c966ce382759baed23d8 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/67.2.0/rus… -2df4bf435be1494030b7e095d3006a88f42ba278d834a46720d2746bac20fb05 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/67.2.0/rus… -57c4acea81f73043ab62dd4dc341a524d38682d6bc2e69bb48822f9e0ac7f48b | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/67.2.0/sync… -2884728eefb23a3e9c91c2d4fd4c91fd95d6b155be7b317ecf70203e68a14428 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/67.2.0/sync… -fd98ace3131929977df6caa61b419956cd704fe7fb46dc20e1d348e710755690 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/67.2.0… -0b41c8ffaa03c0f84bc4ffebcd765c6373162191fa14e480fd1de19e1d9ed2b2 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/67.2.0… -9ff49670a110fd56586229d42673902049a92650257fad81146a25daa5a4e58f | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/67.2.0/tabs-6… -8729ddf632ec417808e0e0b49868cb46bc968fb44c97f5e0b7397ccd4728c8e3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/67.2.0/tabs-6… -e00994073f2c041891e511707ce991a7671b335f8863099719eb749897c231b9 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/63.0.0… -f16249682aa48169d0508bd5310778241f856df91b57201a99ad78d0b4741f34 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/63.0.0… -be10c6c12568bfb4ce987756c6bfcf60ce01085a2dab185e0aef8092cd5c779c | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/63.0.… -ea6cb3d94121d03fefd5329072c7b01d891b8bb25c2c303b28dfd6728eeaa72f | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/63.0.… -377092988061736b0a6e8ddfd243fb9766598724abe0153767310ad2b0be86f5 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.… -45ea21040eadcdce28620267916dc6fd7c252ec54bed1bbefb8f5b6b456e6a5c | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.… -6215b79ff57a56a1ec3f1937ce9870614f96b5afc3e54837d48239b74a28c185 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/63.0.0… -6a80782f831863c5c592cf2851cbec06f0661a868bca960512b0cc920711bddb | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/63.0.0… -9eadd1526848b5669c6e00bfc4283eb63c2d2c1179db5c1329cca2a2e227003a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/… -ca3c96c281e314f07170bbfa766693ef0d2e4d865433a9622254088ee7e68363 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/… -93fd44998bfeeab9d7137cb34a50d510876ec8362e988b8a4ddf4e1629a69e71 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.… -b3836516ae7c9f1ca38ce636e24e3d10b2b421d94e344f14033daa5f20df3168 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.… -816dfaeadb34860eb09f7366163ede45422adfc9e152143a1cda568b815bdba9 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/86.0.… -74dd3e50b176a493a58bc3328b929824126f415f1b5ceb88c1d82ee4d2548bfb | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/86.0.… -5fe022d90f552aae72e0f7f908ade55798ea5a44bdb6c9458dd7706ba60d4eb6 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/87… -a530ccd2c9adfc3b98e3246c33997831ccbe0d66752e968fb90cfa933006cc99 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/87… -230963637e297d1a3edb5b3748731d1243165d3d7dda8ff979d65f8c23a02de5 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/86.0.20210… -0bd06553f02d1cf52e81e83097c37f5bf6790884d9306f08eec8035c14397aa2 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/86.0.20210… -97a9d151ad636acc68eeda046866f0ac24e6f7bf2a81a6b938a3386cc73be529 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… -817736c79269dc217946522fdb8f6ed57547bdd8fbf187687b53ffbe5d813bc3 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… -ccd3a75eb0e0f8ce5882d9d3a3154e3d3c40ce9c44f6c506ad4e28df84bab751 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -a09eccf8b4fbb071e1acf3ea3ce1d30017250ee9c35424a0f98659526ff19597 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -477ee8ea2f4bbcf2860553987f3e5fddaac7cfd6bcae7c1bef7a7b29cdc5d9d8 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.0.4/glean-3… -a1db8db94979392030d8a5eb1c5d7eccc8383adbf031575d746c68a92e9b0d20 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.1.2/glean-3… +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… +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.… +c65c694e7579c0531eb09f569c97121793c11895e66fe8b206d1e9941b5ea9c8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/71.0.… +d5b2a0cf4022b8287b0e515909262c3969fde476d3df71fcc165b4b76de0fdf1 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/71.0.… +b7e1a47fc0a4819023b0356c11b929e22caf101c62318981882a04ecea22d859 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/71.0.… +fe504319fc0bc08ca00d8b951bf5d5f6fa4a5fc467e28b609cd34e8c59c20ad9 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/71.0.0… +d1741144ed2ea215a84f5d94d779cafcfaf778cce8cc7224437a2884cb1101bc | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/71.0.0… +755cd9e2c9d550b7d13e32b2d0fc3838021967405cf6b7bf30c58577fec5827a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/… +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.… +f53d800a8e1a38932fb6d2ce07dea3c0c413e5480a4bda6aadfce9947e7258c5 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/87.0.… +f7d2e354e61287384cd20065f9198153fdaa4da385bb3fb83ae425924b76c278 | 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… +079b282dab3efbdd44aa8f93b73fa3afafefe95b35c8b6a173a07a095a1c2979 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/86.0.20210… +708b41da358580a47e8eeb0512ea4039ec4bd662fd8d72ae1e448f17698bf237 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/86.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/… 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… 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 @@ -458,6 +462,10 @@ 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… +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… 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… @@ -817,64 +825,65 @@ fde386a7905173a1b103de6ab820727584b50d0e32282e2797787c20a64ffa93 | https://repo. 303c422700f79d5d13d528b978c6abd9cd136d78d9f7f6f2556e85a81892f9f1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… 648025c01c56b234a7458cb6048ae8fcfa941f9ea8ebf059090733237b9df9b6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… f120750af0c9e0c6024c3c76469fd4638ef898fc5bc2d4c49f2fe17568f47b9e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -baec7911227eec34845439c38876a2dd18eda7c15ac523655411e20e8f053138 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -ec86adcccbb839d099b8649c5277a6fbe41d2c04b61b4b296584e7af52ae4ad1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -185520116f93f72b033b9c17280f5282c0df424240ad1aee3a5206505f5d6c28 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -c152d433cb80e15b9666f030fc851250024d6dd82916f1d1686b7e503562f4c7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -a7d247044201f11671c8d3132b5435c0317e9966cc499062b70e969db427a545 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… -99983931bacd18d392d2d7396d972539ed79954becdc3fe0fa4924b3fad14d26 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… -7b42e023a61436990cfa36f53cc2fd6685db5e76bb46e241428fb8da48b9d23b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… -f5f0e2a2f424149de99c2dbd3d3feb81eb26663c8fc9b566dd63383e3507ac2f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… -62b1dc3b2860c65d0231bc73f79299306a8a043bf3810ce98811271aa6780d02 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… -d4a5e8b55dc46a02e525b8c62072877c12f1b4bc743234f0e8d796236b8bf504 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… -86ec85db286befd86dcb7694de77bd36b42e4adc6d842ae74e4396a28afc576a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… -33c2aef1ffd80d944fd9efedeedb3d8b16bfbf78cc6db5c033f631b2ff56cfca | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… -3522e62a91296368df4a00a0db658e81538f892961ce4056adf4c382068610f7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… -895a4b9f993b5d5c5273196289270c8ceb842476bd3619cf31db4d6afdc4ab29 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… -5084253d5a2f6b6b04ea0fdbba27f6b19598b30b60a96362e6f8db89a8e70e68 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… -337d899037380f0403c6d3118d03db6f94ac5b81b2dfc092d9296eb04da2765f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… -d0db9f51efa7ccb5eda0599f53eb04cbdd4084554ba5bf80f7ef34c6bd16f7e1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -79e4e0f22ed1330cb9af97ba697139093fd99f74fc4b4e182f7d0a50db7ce487 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -0e9263f227494e68572d312e10753a9986e1d841de19c4846e0d20603cefced8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -83fda4a1de6e0e164b87fc6eac7ab24b5427bcf43d311f1dabb8a6f557c5ea12 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -c0592d785b285ea1677066913bd7014044379a4694cd4f86faa537bf211d45d0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -d72cb95f92dcc36cf15261ef5d5647f08fdf974839f6b75c0502f5424150a4c5 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -7e1ae4f15a7aef746c5b89433f1c5e76b301a635854ef3c6b134b0ca31a36624 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… -58b1dc4a27c380f2a8008fd24d52e5597ec2668d8519d2685abcfae5ad234a70 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… -77e2c30368145180c79e44934bb5901940ee40b6f5f793199b7780ff09fe0ce8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… -f98caea7f4e70b0040a1618aee9a18e4eb92b578419169ead64a8dab11392538 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… -5f400aaea65781039330a5e9755edd55017f36d201c6e5d28aefd6318548afab | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -5f5a780f7369e6a8301062e809e6719a3a694dd61c8ae3e54256e311007fe51f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -96fbbb2d5931d69af3e0d2f2185b0c66b9519acc2e53204cf63fc865977ec698 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -aad1e02bb96a96a5212c43603a06fe941fb66c883b9481b5ac6a5876ef462627 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -fe2df1608a545654a24c04d994bbfde9b6f5433d4a7b56046d336789630ba388 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -9a71c4afcea9b64cf532ca157c9b52618433e035036cc8941e526456908e1e4c | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -68ff14ea2619ba50e425cc34845154f30f5774b18d88bf610de36367aee07da6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -38eab8e158766968d32851e5000623b54d975610c24bbb625eb64f7086772b77 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +f210c702efaea345adf6a14211b8d39231a2679a1f960da2e0692949b9df3ec6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +c9843ec810658da356c5ac2ae9bb2efa912e88b54262a0dc32d52ab40000c2e9 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +41eb96531c250a13b9d6023dfcf9bf9d84db0419c4c94d5823104104598399cd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +dd556ad254f4ead2fb38fb88254dfedc8530c76041b20a93ff5744a82de50d9a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +745860fb134d8555a646c863b2e19cff3763f04d193f47d5414f49110bec6bc6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… +8e4c7d39c4a4412a45c752213003bfc138659a529e8f50ac622aae898bce1faa | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… +a061a543aa052e328b22e0a8682b78d336c781110eceadac66d8ad0d265b04f8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… +121d16ce077dc9140c8b4296488c516fd5af464f54beceebc6ed9348dbc25ecd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… +8b997ae2b74b65e0e003e9fb7ffdbbad8f8dcceaae7f1d19d7067200c5a7e315 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… +a88a373df8a2c2ed0c0c72f9575ad7db4433641bfcbb745e13b0e00255fd7261 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… +8738e290afd74dcf64fd29ce4ebe6e82e833ea7802f3083480875aa5cab62f02 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… +3a39769fbf062cb5edc34120c4007ce739f9132f2a1837b377cb3f98ead36586 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… +9ceee49e2fda694fc429ad919b82774df2d414c9116ab3dc3650b92c8150deef | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… +6488337732f4a96c966ae036f3f75e375e48c3a1ae929ca1f90712d3137f52a7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… +81cdfde0c8eb536eecf0e38f4c1a89b4df0ea294369d092877de541cbe3740bb | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… +6bf2a9dcc54eb1a74729160840f43e02d9f0cd0438477375b824a06499a08b5f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… +0ea3333a97e3e4d4ba3aa3d7fe09e02d4fef6c2587bb54470ba602a5b0486d47 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +e48488a1e029d6b585dd797cfd27ec9c889534f01b1702aa05d3e3ea46ed62f3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +e4f96cd6c1ff57be26890ca82a243670f2e82f0afb401774f8fe59fcb44200d0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +4e7bc009cb848b4a4bfdce7fe2f35dea842ec68176b730c802a4379798360375 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +e0050c158cfee4dbc2532e82eab7aebea1d7cd7e34752c9aa27b809c252def2b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +f27cd652e9e1fd4abbf24c074f1ca7a1d8a09518f48e067eb0e941b8cc9ccae2 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +b2b9bc9029d446e2c8cecf709f92196106d11ff7974092880fefdd67ba1b9a49 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… +1efcac305ddab304c2206bb1e511095c11d7e23c0df5374373b1526610188ff3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… +76c0cac89d5e25bfa789cd988810da3ec6fa832bd839d772618766fdedacbf57 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… +d833b01e8539e580dadb806397bdd20062c3046eea1436d9ae153ae60f00575c | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… +3c6308bd5926e57890d299afc748f22fd77c555b67ac5c692d205ff3c2092112 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +1c716dda4f3e72d42bfe820318b1b71fec6a8b577fee46556a72fe30f5d76d43 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +8d72840984b1b67b4fd766c0f65007a5afff05fc9d236e1458c8e0daeb47266d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +9905fa198f34978ca200651ea954020075e888d7b8ae33ead6fafb829b37f1cb | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +c2b66d368147e75efb42f52326ef1729c26a83637fdf858a6283cdff6f6936f4 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +6b8382834df62e29bf612b2c7b799c64782bf4e65b62346b2e9e6343f3540804 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +8ac3e9907fdaba99a59429fdcd7571e8d31691409671baa2a50dd46e219eeb4c | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +88fb3f422066fb4bdf9b4e88a8369e22816ce8c93dd7409775160414700ee1c2 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… 6c91dea17d7dce5f0b550c3de3305767e5fb46247b6d1eb7eca0ca1fe18458de | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… d2e537cd1f7705276242d8cc903a0286b6dc86b41b6e728e967ef719022f2e15 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… -812cf197d9c4c67e1f47f95e2d72a9b600f0d1124560617bfe9850773eccbcff | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… -cd840ab880f838af0eb76e25930392c6bf0aa2a2adb5e2d4b0bb9f717a295ebd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… -50de5f7dad6235064ac6c0ff577f095a91b3306c2547d8bc372291587495024a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… -3b54ad496e7a7f7ad8ad6e846e5c061911242ef474e030ff602beef7565943d6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… -8ec3db1516948b2d3524e3afbe75cb5ac59e02d98cb6ef586ef57ba63ca8d11f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… -5bd2b4922398bd94d1d94e2dca0401089092b453e724a9e746daacacead735b7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +32010683330a6f31b8d309f10433acaa109b61f2df3d252dae7dade9730074c2 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… +2594a44d33068bab2949750cae0c0ea052fc56faf29f06f35bd57cfa68c6736b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… +751cf4a51089dc4c60caec5f30125983cd1d3998a4138ae8e66db0d496f73646 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +7e2a57538390cd609e3a9c6f7e085af5a948c663fda4eddc78907125a960ba20 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +c1ca432b7b4e0533deef6fe372387464f47f49260f706728854a508e413b4e66 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +4a633aa686acf4557f64156ae07889708ac59fb6210f970ace10b2a1425a62eb | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… 6ea3d0921b26919b286f05cbdb906266666a36f9a7c096197114f7495708ffbc | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3… 785b5b66f1146317d5ed5b18c8e0c10f83cd5c909434c799a4da9823f028cd63 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3… +704fd78960ae046428f69bcd5b951c122e4c180c9400238a866e12cb18494a61 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3… ff03e9989faa2d40fa4a9098aaad71e247f27ea4d24b0754da642eb0924bd8c5 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3… 3db67dafc422b9015e33cfdb3a4df9e8a6912de63c4b733197c8c189cdbc6d4a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… -f78c5d8c09db985912ab83a1de3c3b53ddf208d7b151f06a72358ea3e137d01b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… -076c5a29b7a79ba2050b52e12307783d6b18d7701ce5245a3f48d005c51ae2be | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… -baa182386e8dc9716665812dd87d23bc9e094be9b171616b67c74a78c9b02432 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… -1f22fd66716e91f06ed1c8ef9c8a884d12a578645a3a0e3b11ed0745d301541d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… -06ad4eb7eda10efa9b0dd38ed1d0464c50b21678c9cb37fb6619793a1c5b10ec | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… -0eafc36acad248e5d62475c38d65b1193d680ea2206a4c6a68de6fea81e972a0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… +a7810cf68dd2c8fa79e61a463478880d1df8a5ab9597d151595a9c743b48b90f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… +cc44bf2403bc5d9cbc7515979f5ce15bcff6c01f655f7e4d1db222d26cb575cf | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… +4a6939ca9a54604298b67054668bb7a4fc62178a77b87130de667bb1bdfea2d8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… +16976b913d32635398a3f52233c7cae03249a2015e1d12179fd3348a72b0faae | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… +d8195162f4479312832be7289cc83bd44b3a79c8ff8702a1c6ca7e5bad782747 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… +287998fb67f2b36b49556c7ba9c65203f904f06a2d2553ddc529d17d2bf5b3ff | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… 58b3ce8be4521230361fe6679b5930e75730164be1c7b900ddca4218072fee85 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 5cfd02a5e7dd9be15835522035d32eca33be0e63085d27f7c918fa495e34f81f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 4cd24a06b2a253110d8afd250e9eec6c6faafea6463d740824743d637e761f12 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 3286bd65e41eae735600c0e9a441cb4a0988d0d76647923b9c978c90b0cb7311 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -ad426ec76f52b1dcdf200f55495aea9a2d2796811884e8c4b514645061cf59f3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -9e82078f4dafe1cc2e28f308a317912a45c6a88fc83c51db6ba8cb0ea0829ef1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +f8c8b7485d4a575e38e5e94945539d1d4eccd3228a199e1a9aa094e8c26174ee | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +24ffa65bdfb7d893349cb2e78fb3714a490dd0a9c07375744bb136e9804807fd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 4cd24a06b2a253110d8afd250e9eec6c6faafea6463d740824743d637e761f12 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 99319ebdd562d9519dfd15f78fe79bc09c3a28875083eea4577d9584359a2f61 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 29038be2ba5cf1acac17fc0d9746e553cf90315b8042366169ff6d800dadf239 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index bf93bdb..cd6caec 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -5,6 +5,7 @@ export SDK_HOME=$PROJECT_PATH/android-sdk-linux export NDK_HOME=$PROJECT_PATH/android-ndk android_release_dir=android-10 android_release_dir_old=android-9 +android_release_dir_new=android-11 # Make directories mkdir -p $NDK_HOME $SDK_HOME @@ -39,6 +40,14 @@ unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME mkdir -p platforms/android-[% c("var/android_api_level") %] mv $android_release_dir/* platforms/android-[% c("var/android_api_level") %] +unzip -qq $HOME/[% c("input_files_by_name/build_tools_new") %] -d $SDK_HOME +mkdir -p build-tools/[% c("var/android_api_level_new") %] +mv $android_release_dir_new/* build-tools/[% c("var/android_api_level_new") %] + +unzip -qq $HOME/[% c("input_files_by_name/platform_new") %] -d $SDK_HOME +mkdir -p platforms/android-[% c("var/android_api_level_new") %] +mv $android_release_dir_new/* platforms/android-[% c("var/android_api_level_new") %] + unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME # That's a quirk required by GeckoView but let's have it here instead of in the @@ -47,7 +56,7 @@ mkdir emulator cp tools/emulator emulator/ # Cleanup -rm -fR $android_release_dir $android_release_dir_old +rm -fR $android_release_dir $android_release_dir_old $android_release_dir_new # Archive dist directory cd /var/tmp/dist diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index dc6c3ac..dc30b4d 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -27,6 +27,8 @@ var: google_repo: https://dl.google.com/android/repository android_api_level: 29 android_platform_revision: 04 + android_api_level_new: 30 + android_platform_revision_new: 03 android_ndk_version: 21 android_ndk_revision: d input_files: @@ -40,6 +42,12 @@ input_files: - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level") %]_r[% c("var/android_platform_revision") %].zip' name: platform sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69 + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/android_api_level_new") %]-linux.zip' + name: build_tools_new + sha256sum: ed3b7f9b2d15e90a12c2e739adb749d7d834e2f953e677380206bd14db135c6c + - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level_new") %]_r[% c("var/android_platform_revision_new") %].zip' + name: platform_new + sha256sum: f3f5b75744dbf6ee6ed3e8174a71e513bfee502d0bc3463ea97e517bff68d84e # ./mach bootstrap is fetching the latest version, so it does not seem to # matter which particular version we are using. Pin to the one fitting best to # SDK version/build-tools version.

1 0

[tor-browser-build/master] Bug 40241: Update components for mozilla87-based Fenix (GeckoView part)
by sysrqb＠torproject.org 16 Mar '21

16 Mar '21

commit 6ecfe9c5ce9ea4d116d27d76fe5d6545e1d9f294 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 3 17:00:27 2021 +0100 Bug 40241: Update components for mozilla87-based Fenix (GeckoView part) --- projects/android-toolchain/build | 14 +++++--------- projects/android-toolchain/config | 9 ++++----- projects/application-services/build | 6 ------ projects/geckoview/config | 6 +++--- projects/geckoview/mozconfig-android-aarch64 | 2 +- projects/geckoview/mozconfig-android-armv7 | 2 +- projects/geckoview/mozconfig-android-x86 | 2 +- projects/geckoview/mozconfig-android-x86_64 | 2 +- projects/nss/build | 8 -------- projects/rust/config | 4 ++-- projects/sqlcipher/build | 8 -------- 11 files changed, 18 insertions(+), 45 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index fa90f64..bf93bdb 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -12,18 +12,14 @@ mkdir -p $NDK_HOME $SDK_HOME # Compiler Archives unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME -# GeckoView is still using an older Android NDK, bundle it, too. -unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME # NDK Archive -for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do - # Adjust cross compilation prefix for armv7a. Unfortunately, the compiler cross - # compilation prefix and the one for all the other tools differ. Let's fix that - # so we only have to take care of one. See: #33557 (comment 2674649). - cd $NDK_HOME/android-ndk-r$version/toolchains/llvm/prebuilt/linux-x86_64/bin - for f in `ls arm-linux-androideabi-*`; do +# Adjust cross compilation prefix for armv7a. Unfortunately, the compiler cross +# compilation prefix and the one for all the other tools differ. Let's fix that +# 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} - done done # Tool Archives diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 8ee72a1..dc6c3ac 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -15,7 +15,10 @@ var: # 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=/var/tmp/dist/[% project %]/android-ndk/android-ndk-r[% c("var/android_ndk_version_old") %] + export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-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 @@ -25,7 +28,6 @@ var: android_api_level: 29 android_platform_revision: 04 android_ndk_version: 21 - android_ndk_version_old: 20 android_ndk_revision: d input_files: - project: container-image @@ -50,6 +52,3 @@ input_files: - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]-linux-x86_64.zip' name: android_ndk_compiler sha256sum: dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd - - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' - name: android_ndk_compiler_old - sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 diff --git a/projects/application-services/build b/projects/application-services/build index 24a66f8..4d1ab07 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -19,12 +19,6 @@ tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs') %] export PATH=/var/tmp/dist/rust/bin:/var/tmp/dist/uniffi-rs:$PATH cd $rootdir -# application-services uses a newer NDK, 21, than everything else... -export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r[% pc('android-toolchain', 'var/android_ndk_version') %][% pc('android-toolchain', 'var/android_ndk_revision') %] -# We need to add the new path to our build tools to PATH. -export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH -export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME -export ANDROID_NDK_API_VERSION=[% pc("android-toolchain", "var/android_ndk_version") %][% pc('android-toolchain', 'var/android_ndk_revision') %] export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 [% IF !c('var/fetch_gradle_dependencies') %] diff --git a/projects/geckoview/config b/projects/geckoview/config index 0b0416a..f954ed6 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,14 +1,14 @@ # 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") %]-2-build1' +git_hash: 'tor-browser-[% 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: 86.0 + geckoview_version: 87.0b4 torbrowser_branch: 10.5 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -140,7 +140,7 @@ steps: targets: nightly: - git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 input_files: diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index 696359f..4762a10 100644 --- a/projects/geckoview/mozconfig-android-aarch64 +++ b/projects/geckoview/mozconfig-android-aarch64 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=aarch64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 index 344d6a1..5fdcffc 100644 --- a/projects/geckoview/mozconfig-android-armv7 +++ b/projects/geckoview/mozconfig-android-armv7 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=arm-linux-androideabi -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 index e8899a3..294484c 100644 --- a/projects/geckoview/mozconfig-android-x86 +++ b/projects/geckoview/mozconfig-android-x86 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=i686-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 index cc9e7d1..391b0a5 100644 --- a/projects/geckoview/mozconfig-android-x86_64 +++ b/projects/geckoview/mozconfig-android-x86_64 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=x86_64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r20 +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/nss/build b/projects/nss/build index c5cfd95..786eec4 100644 --- a/projects/nss/build +++ b/projects/nss/build @@ -7,14 +7,6 @@ mkdir /var/tmp/build tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] export PATH=/var/tmp/dist/ninja:$PATH -# application-services uses a newer NDK, 21d, than all the other projects... -export ANDROID_NDK_API_VERSION=[% pc("android-toolchain", "var/android_ndk_version") %][% pc('android-toolchain', 'var/android_ndk_revision') %] -export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION -# We need to add the new path to our build tools to PATH -export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH -export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME -export NDK_HOST_TAG=linux-x86_64 - nspr_64="" [% IF c("var/cross_prefix") == "armv7a-linux-androideabi" -%] gyp_arch="arm" diff --git a/projects/rust/config b/projects/rust/config index ba820b9..0095a8a 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -11,8 +11,8 @@ var: targets: android: var: - current_version: 1.49.0 - previous_version: 1.48.0 + current_version: 1.50.0 + previous_version: 1.49.0 arch_deps: - libssl-dev - pkg-config diff --git a/projects/sqlcipher/build b/projects/sqlcipher/build index 8942e57..a9609d6 100644 --- a/projects/sqlcipher/build +++ b/projects/sqlcipher/build @@ -6,14 +6,6 @@ builddir=/var/tmp/build/[% project %] mkdir /var/tmp/build tar -C /var/tmp/dist -xf [% c('input_files_by_name/nss') %] -# application-services uses a newer NDK, 21d, than all the other projects... -export ANDROID_NDK_API_VERSION=[% pc("android-toolchain", "var/android_ndk_version") %][% pc('android-toolchain', 'var/android_ndk_revision') %] -export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION -# We need to add the new path to our build tools to PATH -export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH -export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME -export NDK_HOST_TAG=linux-x86_64 - export AR="[% c('var/cross_prefix') %]-ar" # XXX: Mozilla really uses the NDK_API_VERSION here, which is weird. export CC="[% c('var/cross_prefix') %][% pc('android-toolchain', 'var/android_ndk_version') %]-clang"

1 0

[tor-browser/tor-browser-78.8.0esr-10.5-2] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 16 Mar '21

16 Mar '21

commit 8cc2f9275dc096246c0be8211a83f2da7882482f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 16 09:12:13 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index c05af387ef34..caffa836a4ec 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit c05af387ef3487f14a58b27214cf9ede57363c0e +Subproject commit caffa836a4ec7f1bc7bf61951d954961aa6a9eff

1 0

[torbutton/maint-10.0] Bug 40031: Remove survey banner on TB-stable
by gk＠torproject.org 16 Mar '21

16 Mar '21

commit f03b9cb7c2f36c9cbd1869e24a1662e7d2755b4e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 15 17:43:07 2021 +0000 Bug 40031: Remove survey banner on TB-stable Revert "fixup! Bug 40026: Add feedback survey banner" This reverts commit 1138ead65a4d3083c9d9d9d819a5c23dd3264603. Revert "Bug 40026: Add feedback survey banner" This reverts commit 90ecad19b0194b8378b770c4122800d39c4371ce. --- chrome/content/aboutTor/aboutTor.xhtml | 11 -------- chrome/skin/aboutTor.css | 47 ---------------------------------- chrome/skin/tor-survey-icon.svg | 1 - 3 files changed, 59 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index a5ef1f1c..6c712a67 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -65,17 +65,6 @@ </form> </div> - <div id="surveyBanner"> - <img id="surveyImg" src="resource://torbutton-assets/tor-survey-icon.svg" /> - <div id="surveyTextCol"> - <div id="surveyHeader">We’d love to get your feedback</div> - <br /> - <div id="surveyDescription">We put our users at the center of our development process. You can help us improve Tor Browser by completing this short survey about your experience:</div> - <br /> - <a id="surveyLink" target="_blank" href="http://bogdyardcfurxcle.onion/index.php/217469">Launch the Survey</a> - </div> - </div> - <div id="bottom"> <p id="donate" class="moreInfoLink">&aboutTor.donationBanner.freeToUse; <a href="https://donate.torproject.org/">&aboutTor.donationBanner.buttonA; »</a> diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index d53e4060..8d5c4a83 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -212,53 +212,6 @@ body:not([showmanual]) .showForManual { background-color: rgba(12, 12, 13, 0.1); /* same as Firefox's about:home */ } -#surveyBanner { - width: 690px; - padding: 20px 25px 25px; - background: rgba(0, 0, 0, 0.3); - border-radius: 6px; - margin: 35px auto 0px; - display: flex; - flex-direction: row; - align-items: flex-start; - position: static; -} - -@media only screen and (min-width: 900px) { - #surveyBanner { - margin: 35px 0px 0px 135px; - } -} - -#surveyTextCol { - padding: 8px 0px 0px 15px; - font-size: 15px; - line-height: normal; - color: #FFFFFF; - width: 633px; -} - -#surveyHeader { - font-weight: bold; -} - -#surveyImg { - width: 32px; - position: static; -} - -div.surveyDescription, div.surveyLink { - padding-top: 10px; -} - -a#surveyLink { - text-decoration: underline; -} - -a#surveyLink:hover { - text-decoration: none; -} - /* #search-text is the search input field */ #search-text { flex: 1; diff --git a/chrome/skin/tor-survey-icon.svg b/chrome/skin/tor-survey-icon.svg deleted file mode 100644 index 6e1eca1a..00000000 --- a/chrome/skin/tor-survey-icon.svg +++ /dev/null @@ -1 +0,0 @@ -<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><rect fill="#df58a9" height="32" rx="16" width="32"/><g fill="#240a3b"><path clip-rule="evenodd" d="m16.3397 25c-4.9708 0-8.99998-4.0295-8.99998-9.0002 0-4.9706 4.02918-8.9998 8.99998-8.9998 4.9706 0 9 4.0292 9 8.9998 0 4.9707-4.0294 9.0002-9 9.0002zm.0185-2.7279v1.091c4.0584-.01 7.3449-3.3024 7.3449-7.3633 0-4.0607-3.2865-7.35293-7.3449-7.36316v1.09101c3.4559.00997 6.2541 2.81395 6.2541 6.27215 0 3.4583-2.7982 6.2623-6.2541 6.2723zm3.527-6.2723c0 1.9519-1.5778 3.5344-3.527 3.5447v1.0907c2.552-.0099 4.618-2.0809 4.618-4.6354 0-2.5543-2.066-4.6253-4.618-4.6353v1.0908c1.9492.0102 3.527 1.5927 3.527 3.5445zm-3.527-1.9081c1.0456.01 1.8906.86 1.8906 1.908 0 1.0484-.845 1.8984-1.8906 1.9084z" fill-rule="evenodd"/><path d="m10.3461 4.99805c-.3237-.07201-.6639-.08099-1.00111-.02643s-.66484.17159-.96417.34441-.56449.39804-.78035.66279c-.21585.26475-.37816.56384-.47766.8802l-.2066.65635-.67173-.1492 5c-.65378-.14527-1.36067-.03082-1.96515.31818-.60449.349-1.05705.90396-1.25814 1.54278-.20108.63883-.13422 1.30922.18589 1.86362.32011.5545.86723.9476 1.52102 1.0928l.67172.1493 4.93018 1.0955 1.5164-4.81745.2066-.65635c.0997-.31632.1345-.64373.1027-.96352-.0319-.31979-.1299-.6257-.2884-.90025s-.3744-.51236-.6354-.69985c-.261-.18748-.562-.32097-.8858-.39283z" stroke="#df58a9" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2"/></g></svg> \ No newline at end of file

1 0

[torbutton/master] Bug 40032: Remove Snowflake survey banner from TB-alpha
by gk＠torproject.org 16 Mar '21

16 Mar '21

commit caffa836a4ec7f1bc7bf61951d954961aa6a9eff Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 15 23:12:49 2021 +0000 Bug 40032: Remove Snowflake survey banner from TB-alpha Revert "Bug 40029: Create survey banner on about:tor for snowflake" This reverts commit 10ce74fae8138696b52a7d27eaed5d43d8052b29. Revert "fixup! Bug 40026: Add feedback survey banner" This reverts commit ac4114cd6d036cc76b98a3b35fa98e7c8e96104a. Revert "Bug 40026: Add feedback survey banner" This reverts commit edad4c65724fecfcacec5afd7e8c394f850d9f1d. --- chrome/content/aboutTor/aboutTor.xhtml | 11 -------- chrome/skin/aboutTor.css | 47 ---------------------------------- chrome/skin/tor-survey-icon.svg | 1 - 3 files changed, 59 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 1f46d097..6c712a67 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -65,17 +65,6 @@ </form> </div> - <div id="surveyBanner"> - <img id="surveyImg" src="resource://torbutton-assets/tor-survey-icon.svg" /> - <div id="surveyTextCol"> - <div id="surveyHeader">Do you use Snowflake?</div> - <br /> - <div id="surveyDescription">Snowflake is a pluggable transport available in Tor Browser. Help us improve it by completing this short survey about your browsing experience:</div> - <br /> - <a id="surveyLink" target="_blank" href="http://bogdyardcfurxcle.onion/index.php/491436">Launch the Survey</a> - </div> - </div> - <div id="bottom"> <p id="donate" class="moreInfoLink">&aboutTor.donationBanner.freeToUse; <a href="https://donate.torproject.org/">&aboutTor.donationBanner.buttonA; »</a> diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index d53e4060..8d5c4a83 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -212,53 +212,6 @@ body:not([showmanual]) .showForManual { background-color: rgba(12, 12, 13, 0.1); /* same as Firefox's about:home */ } -#surveyBanner { - width: 690px; - padding: 20px 25px 25px; - background: rgba(0, 0, 0, 0.3); - border-radius: 6px; - margin: 35px auto 0px; - display: flex; - flex-direction: row; - align-items: flex-start; - position: static; -} - -@media only screen and (min-width: 900px) { - #surveyBanner { - margin: 35px 0px 0px 135px; - } -} - -#surveyTextCol { - padding: 8px 0px 0px 15px; - font-size: 15px; - line-height: normal; - color: #FFFFFF; - width: 633px; -} - -#surveyHeader { - font-weight: bold; -} - -#surveyImg { - width: 32px; - position: static; -} - -div.surveyDescription, div.surveyLink { - padding-top: 10px; -} - -a#surveyLink { - text-decoration: underline; -} - -a#surveyLink:hover { - text-decoration: none; -} - /* #search-text is the search input field */ #search-text { flex: 1; diff --git a/chrome/skin/tor-survey-icon.svg b/chrome/skin/tor-survey-icon.svg deleted file mode 100644 index 99debff8..00000000 --- a/chrome/skin/tor-survey-icon.svg +++ /dev/null @@ -1 +0,0 @@ -<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="a"><path d="m4 4h24v24h-24z"/></clipPath><rect fill="#49cbb7" height="32" rx="16" width="32"/><g clip-path="url(#a)"><path d="m27.6129 15.6129h-3.2711c.8234-.8148 2.1853-2.1644 2.9813-2.96.1512-.1512.1512-.3964.0001-.5476-.1512-.1511-.3961-.151-.5475-.0001-1.0271 1.0268-3.0015 2.9806-3.5345 3.5077h-6.3067l4.3139-4.3139c.2103.0025.4209.004.6315.004.5187 0 1.0364-.0065 1.5418-.0129.9684-.0122 1.97-.0246 2.9697.0084.2165.0052.3926-.1603.3998-.374.0071-.2137-.1604-.3926-.3742-.3997-1.0174-.0338-2.0277-.0212-3.0051-.0088-.4571.0057-.924.0098-1.3915.011l2.4649-2.46494c.1512-.15096.1512-.39625 0-.54735-.1511-.15123-.3964-.15123-.5474 0l-2.3345 2.33458c.0059-1.16606.0141-3.01535.0144-4.1111.0001-.2138-.1733-.38709-.387-.38722h-.0001c-.2137 0-.387.17329-.3871.38709-.0002 1.39923-.0138 4.02839-.0184 4.88944l-4.4381 4.438v-6.17802c.4649-.46993 2.492-2.51896 3.5449-3.57225.1512-.15123.1512-.39626 0-.54736-.1514-.15135-.3965-.1511-.5476 0-.8079.80826-2.1869 2.20013-2.9973 3.01884v-3.39961c0-.21381-.1733-.3871-.3871-.3871-.2137 0-.3871.17329-.3871.3871v3.38142c-.2955-.29807-.5888-.59678-.8752-.89058-.6825-.69988-1.3882-1.42349-2.1315-2.11897-.156-.14607-.4009-.1382-.5471.01806-.1461.15613-.1379.40103.0182.54723.7303.68348 1.4297 1.40051 2.1061 2.09406.464.47574.9433.96516 1.4295 1.44245v6.20473l-4.2085-4.2085c-.0021-.3765-.0198-3.54616-.0199-5.13326-.0001-.21368-.1733-.38709-.3872-.38697-.2137 0-.3871.17342-.387.3871.0002 1.17587.01 3.21884.0158 4.35473l-2.56404-2.56389c-.15096-.15123-.39625-.15123-.54735 0-.15123.1511-.15123.39639 0 .54735l2.45019 2.45024c-.38606-.0021-.77084-.0057-1.14864-.0105-.97742-.0124-1.98787-.0252-3.00516.0088-.21368.0071-.38116.1859-.37407.3997.0071.2137.18491.3813.39974.374.99949-.0331 2.00117-.0206 2.96981-.0084.50542.0063 1.02297.0127 1.54172.0127.1302 0 .2603-.0014.3907-.0023l4.3265 4.3266h-6.0 9595c-.53303-.5271-2.50749-2.4809-3.53458-3.5077-.15123-.1509-.39626-.151-.54736.0001-.15122.1512-.15122.3964 0 .5476.796.7956 2.15794 2.1452 2.98116 2.96h-3.48167c-.21368 0-.3871.1733-.3871.3871s.17342.3871.3871.3871h3.53845c-.31045.3084-.6222.6143-.92865.9132-.69948.6822-1.42296 1.3877-2.11819 2.1307-.14606.1561-.13806.401.01806.5471.07471.0698.16968.1045.26452.1045.10336 0 .20645-.0413.28258-.1227.68323-.7301 1.40026-1.4292 2.09355-2.1053.48813-.476.99097-.9681 1.48013-1.4675h6.04795l-4.524 4.524c-.66421-.0053-1.33144.0021-1.97905.0104-.96851.0119-1.97019.0244-2.96968-.0085-.2138-.005-.39264.1603-.39987.3741-.00709.2137.16039.3926.3742.3996 1.01716.0338 2.02761.021 3.00516.0089.3929-.0049.79355-.0086 1.19522-.0104l-2.25277 2.2527c-.15123.151-.15123.3963 0 .5474.07561.0756.17471.1134.27368.1134.09909 0 .19819-.0378.27367-.1134l2.31964-2.3196c-.0058 1.1442-.0152 3.1478-.0154 4.3077-.0001.2138.1733.3872.387.3872h.0001c.2137 0 .387-.1732.3871-.3869.0003-1.5338.0167-4.5457.0195-5.0863 l4.4529-4.4529v6.2047c-.4864.4777-.9661.9673-1.4303 1.4433-.6761.6932-1.3752 1.41-2.1053 2.0932-.1561.1461-.1643.3911-.0182.5473.0763.0813.1794.1225.2827.1225.0948 0 .1898-.0347.2644-.1045.7431-.6953 1.4485-1.4185 2.1307-2.118.2868-.2941.5804-.5932.876-.8914v3.3813c0 .2138.1734.3871.3871.3871.2138 0 .3871-.1733.3871-.3871v-3.3996c.8104.8188 2.1894 2.2104 2.9973 3.0188.1512.1511.3962.1513.5476.0002.1512-.1513.1512-.3963 0-.5475-1.0529-1.0532-3.08-3.1022-3.5449-3.5722v-6.1781l4.3601 4.3601c.0034.601.0193 3.5499.0195 5.0618.0001.2138.1734.3871.3872.3871s.3871-.1734.387-.3871c-.0001-1.1518-.0094-3.1351-.0152-4.2835l2.4122 2.4124c.0755.0756.1746.1134.2737.1134.099 0 .1982-.0378.2737-.1134.1512-.1511.1512-.3964 0-.5474l-2.3699-2.37c.4098.0019.8187.0055 1.2197.0106.9773.0123 1.9876.0251 3.0052-.0088.2136-.0071.3811-.186.374-.3998-.0072-.2136-.1832-.3785-.3998-.3739-.9997.0329-2.0012.0204-2.9697.0084-.6554-.0083-1.3309-.0159-2.0033-.0102l-4.407-4.4071h6.2587c.4891.4994.9921.9915 1.4801 1.46 75.6934.6761 1.4102 1.3752 2.0934 2.1053.0763.0814.1794.1227.2828.1227.0948 0 .1897-.0347.2644-.1045.1562-.1461.1643-.391.0181-.5471-.6952-.743-1.4186-1.4485-2.1182-2.1307-.3064-.2989-.6182-.6048-.9286-.9132h3.3277c.2138 0 .3871-.1733.3871-.3871s-.1733-.3871-.3871-.3871z" style="fill-rule:evenodd;clip-rule:evenodd;fill:#240a3b;stroke:#240a3b;stroke-width:.5;stroke-linecap:square;stroke-linejoin:bevel"/></g></svg> \ No newline at end of file

1 0

[Git][tpo/applications/fenix][tor-browser-87.0.0b2-10.5-1] 9 commits: Bug 40002: Add GitLab CI
by Matthew Finkel 16 Mar '21

16 Mar '21

Matthew Finkel pushed to branch tor-browser-87.0.0b2-10.5-1 at The Tor Project / Applications / fenix Commits: 1c526b73 by Matthew Finkel at 2021-03-01T21:34:20+00:00 Bug 40002: Add GitLab CI Pin CI builds to runners with 32GB of RAM to avoid OOM conditions. - - - - - 8ded804a by Matthew Finkel at 2021-03-01T21:39:54+00:00 Rename as Tor Browser Bug 40020: Change applicationId Bug 40020: Change app name Bug 40020: Change deeplink scheme Bug 40020: Change App icons Bug 40073: Use correct branding on About page Bug 40088: Use Tor Browser logo in migration screen - - - - - 6e767043 by Matthew Finkel at 2021-03-11T21:04:11+00:00 Disable features and functionality Bug 33594: Disable data collection by default (Glean) Bug 40019: Adjust is disabled on Release when data collection is disabled Bug 34338: Disable the crash reporter Bug 40014: Neuter Google Advertising ID Bug 40018: Disable Push service Bug 40034: Disable PWA onboading Bug 40072: Disable Tracking Protection Bug 40061: Do not show "Send to device" in sharing menu Bug 40109: Reduce requested permissions Exclude LOCATION and NETWORK_STATE - - - - - 02d4d3e4 by Georg Koppen at 2021-03-11T21:04:18+00:00 Modify build system Bug 40083: Make locale ordering in BuildConfig deterministic Bug 40042: Add option do overwrite timestamp in extension version Bug 40059: Use MOZ_BUILD_DATE for versionCode At the same time we adapt MOZ_BUILD_DATE to our needs where it is actually used and not in tor-browser-build. This gives us more flexibility. See: tor-browser-build#40084. Bug 40067: Fix reproducibility issue in classes2.dex We make sure our MOZ_BUILD_DATE gets used as a source for showing date related information on the Fenix about page. Bug 40071: Show only supported locales Bug 40064: Use Gecko Beta for Nightly and Debug variants Bug 40123: Allow building the instrumented tests apks for variants other than debug This allows to specify the variant of the instrumented tests via a `testBuildType` gradle argument. It also applies a workaround for a R8 issue from https://issuetracker.google.com/issues/140851070. Bug 40143: Use deterministic date in Test apk The build config was using Date() when generating the Test apk's versionName. - - - - - 4a98d04e by Matthew Finkel at 2021-03-11T21:04:25+00:00 Add Tor integration and UI Bug 40001: Start Tor as part of the Fenix initialization Bug 40028: Implement Tor Service controller Bug 40028: Integrate Tor Controller into HomeFragment Bug 40028: Implement Tor connect and logger screens Bug 40028: Implement Tor Onboarding Bug 40028: Implement new home screen Bug 40028: Define bootstrapping events and Quick Start Bug 40041: Implement Tor Network Settings Bug 40041: Integrate Tor Network Settings - - - - - 0acc66ad by Alex Catarineu at 2021-03-15T22:27:10+00:00 Modify UI/UX Bug 40015: Modify Home menu Bug 40016: Hide unwanted Settings Bug 40016: Modify Default toolbar menu Bug 40016: Add Donate settings button Bug 40016: Move Allow Screenshots under Advanced Bug 40016: Don't install WebCompat webext Bug 40016: Don't onboard Search Suggestions Bug 40094: Do not use MasterPasswordTipProvider in HomeFragment Bug 40095: Hide "Sign in to sync" in bookmarks Bug 40031: Hide Mozilla-specific items on About page Bug 40032: Set usesCleartextTraffic as false Bug 40063: Do not sort search engines alphabetically Bug 34378: Port external helper app prompting With the corresponding android-components patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. Bug 34403: Disable Normal mode by default Bug 40087: Implement a switch for english locale spoofing Bug 40144: Hide Download Manager Bug 40141: Hide EME site permission - - - - - 5f00f717 by Alex Catarineu at 2021-03-15T22:27:10+00:00 Modify Add-on support Bug 40030: Install HTTPS Everywhere and NoScript addons on startup HTTPS Everywhere is installed as a builtin extension and NoScript as a regular AMO addon. To avoid unnecessary I/O we only install NoScript the first time, and rely on the browser addon updating mechanism for keeping up with new versions. This is the same behaviour that was implemented in the Fennec-based Tor Browser, where it was installed as a "distribution addon", which also only occurred once. Bug 40062: HTTPS Everywhere is not shown as installed Also 40070: Consider storing the list of recommended addons This implements our own AddonsProvider, which loads the list of available addons from assets instead of fetching it from an endpoint. In this list, we replace https-everywhere by our https-everywhere-eff, so that the EFF one is shown as installed in the addons list and the AMO one is not displayed. Also, we hide the uninstall button for builtin addons. Bug 40058: Hide option for disallowing addon in private mode - - - - - 5604e2ec by Matthew Finkel at 2021-03-15T22:27:10+00:00 Add Security Level UI Bug 40026: Implement Security Level settings Bug 40026: Integrate Security Level settings - - - - - 70683890 by Matthew Finkel at 2021-03-15T22:27:32+00:00 Bug 40138: Add feedback survey card - - - - - 30 changed files: - + .gitlab-ci.yml - app/build.gradle - app/proguard-rules.pro - app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt - − app/src/beta/res/drawable/ic_launcher_foreground.xml - app/src/beta/res/mipmap-hdpi/ic_launcher.png - app/src/beta/res/mipmap-mdpi/ic_launcher.png - app/src/beta/res/mipmap-xhdpi/ic_launcher.png - app/src/beta/res/mipmap-xxhdpi/ic_launcher.png - app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png - app/src/beta/res/values/static_strings.xml - app/src/beta/res/xml/shortcuts.xml - − app/src/debug/res/drawable/ic_launcher_foreground.xml - app/src/debug/res/xml/shortcuts.xml - app/src/main/AndroidManifest.xml - + app/src/main/assets/allowed_addons.json - app/src/main/java/org/mozilla/fenix/FenixApplication.kt - app/src/main/java/org/mozilla/fenix/HomeActivity.kt - app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt - app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - app/src/main/java/org/mozilla/fenix/components/Analytics.kt - app/src/main/java/org/mozilla/fenix/components/Components.kt - app/src/main/java/org/mozilla/fenix/components/Core.kt - + app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt - + app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt - app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt - app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt - app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/c9fc1f253e11… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/c9fc1f253e11… You're receiving this email because of your account on gitlab.torproject.org.

1 0