[tor-commits] [tor-browser-build/maint-10.0a8] Bump gradle dependency versions, changelog fixups, and build3

sysrqb at torproject.org sysrqb at torproject.org
Wed Oct 7 19:39:22 UTC 2020


commit f3968ad15416d7859ea83651d17a220154923eab
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Wed Oct 7 19:32:45 2020 +0000

    Bump gradle dependency versions, changelog fixups, and build3
---
 projects/android-components/config                  | 2 +-
 projects/fenix/config                               | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++----
 rbm.conf                                            | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/projects/android-components/config b/projects/android-components/config
index 2cbc4d9..e42c0c9 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -12,7 +12,7 @@ var:
   container:
     use_container: 1
   # This should be updated when the list of gradle dependencies is changed.
-  gradle_dependencies_version: 4
+  gradle_dependencies_version: 5
   # Switch to make it easier to grab all dependencies during a dry-run.
   fetch_gradle_dependencies: 0
   # Overwrite `glean_parser` for now to fix #40085.
diff --git a/projects/fenix/config b/projects/fenix/config
index 01b5225..79a1ccf 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -14,7 +14,7 @@ var:
   container:
     use_container: 1
   # This should be updated when the list of gradle dependencies is changed.
-  gradle_dependencies_version: 6
+  gradle_dependencies_version: 7
   # Switch to make it easier to grab all dependencies during a dry-run.
   fetch_gradle_dependencies: 0
   # Overwrite `glean_parser` for now to fix #40085.
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 0e54d03..f36b366 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -3,7 +3,6 @@ Tor Browser 10.0a8 -- October 8 2020
    * Update Fenix to 81.1.2
    * Update Tor to 0.4.4.5
    * Update NoScript to 11.0.46
-   * Update HTTPS Everywhere to 2020.08.13
    * Bug 10394: Let Tor Browser update HTTPS Everywhere
    * Bug 11154: Disable TLS 1.0 (and 1.1) by default
    * Bug 16931: Sanitize the add-on blocklist update URL
@@ -123,9 +122,9 @@ Tor Browser 10.0a8 -- October 8 2020
      * Bug 34187: Update zlib to use Android NDK 20
      * Bug 40010: Add nss project for application-services [tor-browser-build]
      * Bug 40011: Add sqlcipher for application-services [tor-browser-build]
-     * Bug 40029: Clean-up all projects to remove fennec bits we don't need for fenix
+     * Bug 40029: Clean-up all projects to remove fennec bits we don't need for fenix [tor-browser-build]
      * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build]
-     * Bug 40039: Remove version_path in nss project
+     * Bug 40039: Remove version_path in nss project [tor-browser-build]
      * Bug 40040: Wire geckoview, application-services, android-components, and fenix together [tor-browser-build]
      * Bug 40054: Adapt build.android script in tor-browser project for fenix [tor-browser-build]
      * Bug 40055: Integrate building Glean in offline mode [tor-browser-build]
@@ -142,7 +141,7 @@ Tor Browser 10.0a8 -- October 8 2020
      * Bug 40085+40086: classes.dex files are not reproducible in Fenix [tor-browser-build]
      * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build]
      * Bug 40088+40117: Use MOZ_BUILD_DATE for extension manifest timestamps [tor-browser-build]
-     * Bug 40093: Ensure application-services libs do not include libc networking symbols
+     * Bug 40093: Ensure application-services libs do not include libc networking symbols [tor-browser-build]
      * Bug 40094: Aarch64 fenix rust cross-compilation fails [tor-browser-build]
      * Bug 40095: The pattern for the apk variable in build.android is matching too much [tor-browser-build]
      * Bug 40101: Pick up Fenix 81.1.1 [tor-browser-build]
diff --git a/rbm.conf b/rbm.conf
index 5d287af..e3649c9 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '10.0a8'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
     - 10.0a7
   project_name: tor-browser



More information about the tor-commits mailing list