[tor-browser-build/master] Bug 40156: Update application-services to v67.0.0 for Fenix 84 - tbb-commits

2 Dec 2020

commit e06e6c1fb637eb3bad86ced029af4184f3bd750d
Author: Georg Koppen gk@torproject.org
Date:   Fri Nov 20 08:14:28 2020 +0000
Bug 40156: Update application-services to v67.0.0 for Fenix 84
Our offline builds are busted with Nimbus SDK landing as submodule. See:
    https://github.com/mozilla/application-services/issues/3732. We work
    around that by pointing to the local viaduct* crates.
We need to add kotlinx-coroutines-android-1.3.9.jar manually, see:
    tor-browser-build#40056.
The jvnet-parent-*.pom files got slightly updated without the respective
    version numbers getting incremented.
The proguard-gradle and httpcomponents-parent-10 .pom files got mainly
    reformatted without a version number bump as well.
---
 projects/application-services/40085.patch          |  22 -
 projects/application-services/build                |  22 +-
 projects/application-services/config               |  19 +-
 .../gradle-dependencies-list.txt                   | 282 +++---
 .../application-services/update-cargo-lock.patch   | 976 +++++++++++++++++++++
 .../application-services/viaduct-workaround.patch  |  32 +
 .../application-services/viaduct-workaround2.patch | 660 ++++++++++++++
 projects/nss/config                                |   6 +-
 8 files changed, 1844 insertions(+), 175 deletions(-)

diff --git a/projects/application-services/40085.patch b/projects/application-services/40085.patch
deleted file mode 100644
index ccaa46e..0000000
--- a/projects/application-services/40085.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From bca7900361a57278293444fdf0855240987ebb49 Mon Sep 17 00:00:00 2001
-From: Georg Koppen gk@torproject.org
-Date: Fri, 9 Oct 2020 13:35:24 +0000
-Subject: [PATCH] Bug 40085: Bump glean_parser to 1.28.6
-
-
-diff --git a/build.gradle b/build.gradle
-index c6e0be82..2a13739c 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -4,7 +4,7 @@ buildscript {
-     ext.kotlin_version = '1.3.71'
-     ext.jna_version = '5.2.0'
-     ext.android_gradle_plugin_version = '3.6.0'
--    ext.android_components_version = '56.0.0'
-+    ext.android_components_version = '62.0.0'
- 
-     ext.build = [
-         ndkVersion: "21.3.6528147", // Keep it in sync in TC Dockerfile.
--- 
-2.28.0
-
diff --git a/projects/application-services/build b/projects/application-services/build
index 9fb0f50..77f6e2d 100644
--- a/projects/application-services/build
+++ b/projects/application-services/build
@@ -6,6 +6,10 @@ builddir=/var/tmp/build/[% project %]
 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'] -%]
   # The host (i.e. Linux) bits should be the same for all four targets. Thus,
@@ -17,7 +21,8 @@ cd /var/tmp/dist
   tar -xf $rootdir/[% c('input_files_by_name/sqlcipher-' _ arch) %]
   mv sqlcipher sqlcipher-[% arch %]
 [% END -%]
-export PATH=/var/tmp/dist/rust/bin:$PATH
+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...
@@ -56,6 +61,12 @@ directory = "/var/tmp/build/application-services/vendor"
 offline=true
 EOF
+patch -p1 < $rootdir/update-cargo-lock.patch
+cd components/external/nimbus-sdk
+patch -p1 < $rootdir/viaduct-workaround.patch
+patch -p1 < $rootdir/viaduct-workaround2.patch
+cd ../../../
+
 # Move NSS and SQLCipher to the right place
 # XXX: Maybe merge with the loop above.
 archs="armv7 aarch64 x86 x86_64"
@@ -82,13 +93,10 @@ patch -p1 < $rootdir/no-git.patch
 # XXX: We don't build the code for Linux for now as this involves additional
 # complexity. That's needed for running unit tests later on, though.
 patch -p1 < $rootdir/target.patch
-# We need to pick up a newer glean_parser until an updated glean is used by
-# application-services.
-patch -p1 < $rootdir/40085.patch
 [% IF c('var/fetch_gradle_dependencies') %]
   # XXX: `assemble` is still not enough to see all fetched dependencies via
   # Gradle's --debug. See: tor-browser-build#40056.
-  $GRADLE_HOME/gradle-6.3/bin/gradle --debug --no-daemon assemble
+  gradle --debug --no-daemon assemble
 [% ELSE %]
   # Prepare Glean dependencies for offline build
   tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2
@@ -98,8 +106,8 @@ patch -p1 < $rootdir/40085.patch
   export LANG=C.UTF-8
   patch -p1 < $rootdir/mavenLocal.patch
   gradle_flags="--offline --no-daemon -Dmaven.repo.local=$gradle_repo"
-  $GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags assembleRelease
-  $GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags publish
+  gradle $gradle_flags assembleRelease
+  gradle $gradle_flags publish
cd build
   find maven -regex '.*[0-9].(aar|pom)' -exec cp --parents {} $distdir ;
diff --git a/projects/application-services/config b/projects/application-services/config
index 68dc794..5eecbad 100644
--- a/projects/application-services/config
+++ b/projects/application-services/config
@@ -1,16 +1,17 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-version: 63.0.0
-git_hash: 8e63363359c3d20385ed55f5308d19e321816898
+version: 67.0.0
+git_hash: 6a234c2b1e1972f11e585551d4cf2e40e84bf16f
 git_url: https://github.com/mozilla/application-services
+git_submodule: 1
var:
   container:
     use_container: 1
   # This should be updated when the list of gradle dependencies is changed.
-  gradle_dependencies_version: 3
+  gradle_dependencies_version: 4
   # This should be updated when the list of rust dependencies is changed.
-  rust_vendor_version: 2
+  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,
@@ -23,6 +24,8 @@ input_files:
   - project: container-image
   - project: '[% c("var/compiler") %]'
     name: '[% c("var/compiler") %]'
+  - project: gradle
+    name: gradle
   # We need the torbrowser-* targets for Rust, see: #40094.
   - project: rust
     name: rust-armv7
@@ -72,6 +75,8 @@ input_files:
     name: sqlcipher-x86_64
     target_prepend:
       - android-x86_64
+  - name: uniffi-rs
+    project: uniffi-rs
   - name: python
     project: python
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
@@ -85,9 +90,11 @@ input_files:
   # `cargo vendor vendor` in the `application-services` directory has vendored
   # the sources.
   - URL: https://people.torproject.org/~gk/mirrors/sources/application-services-vendo... c('var/rust_vendor_version') %].tar.bz2
-    sha256sum: 70e02d587661e5d93dbe30ffa9265fb8b6b66ba8483f3268017ca919623688bc
+    sha256sum: f2d08275920c6e163617d5f102abc0665fd0f74550a400b1970b5b25bcabd3ef
   - filename: no-git.patch
   - filename: mavenLocal.patch
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
   - filename: target.patch
-  - filename: 40085.patch
+  - filename: viaduct-workaround.patch
+  - filename: viaduct-workaround2.patch
+  - filename: update-cargo-lock.patch
diff --git a/projects/application-services/gradle-dependencies-list.txt b/projects/application-services/gradle-dependencies-list.txt
index b444c76..dee28f3 100644
--- a/projects/application-services/gradle-dependencies-list.txt
+++ b/projects/application-services/gradle-dependencies-list.txt
@@ -24,10 +24,10 @@ a81c8fe78815fa47df5b749deb52727ad11f9397da58b16017f4eb2c11e28564 | https://dl.go
 62d95c89850af21030b19f14d5f7ecd6d8bcc9a3014c59002ec99624caac8100 | https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter...
 20e5b8f6526a34595a604f56718da81167c0b40a7a94a57daa355663f2594df2 | https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0...
 ce9e47b87184f5bd5e139e9becd5b26476d42d78c31bf2fdedc37acb41b9ad49 | https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0...
-e6d2aee708189bc3d9dff647b7671d03750007223639db16146bd7382bfb7934 | https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-com...
-8d22885c700e913c8d17a373b96bbb05bc6d6a1c2848b0c57928e2de325bf158 | https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-com...
-bf2b0ed68625a159254198aeca04f4fe6a5b99638500c88b2d59b7ecd42b6f67 | https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-com...
-b450ad9617683054753abf126d3ebf2b2d99a3a4975355cdfc2cf31cef7ace67 | https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-com...
+1cc969dc9754eace3c8255b87b57ca564fe0b037061f23e5b767d8a1f7538848 | https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-com...
+4bc5e2587f40db5ffb422c831fa1d34eac131b2574fc8a1c41e172fa3f5e9d97 | https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-com...
+d7346bc57ab5bf5cad74549796e2997cba2834ef1513537639e32e60674063cc | https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-com...
+ef3e51cbdcc7bd677a0611beb3183dc4f62e915736a4449517719e737764f7b5 | https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-com...
 9402442cdc5a43cf62fb14f8cf98c63342d4d9d9b805c8033c6cf7e802749ac1 | https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1...
 da6733425a83f5ce850878fa7201082345fed7c668dd58550fdd19c0396c6fa4 | https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1...
 e329d673361e94d2e8f4d4d14e1f0586368bd43fb19efd5766ce7498bcccd162 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.0.0/fra...
@@ -75,80 +75,84 @@ e93836f35d35e47ba501add90fa6559964fa7a70975bf4ffc4a04836189611e9 | https://dl.go
 7cbb32f2fe880d407d4c53268bcd554c11dc9316a1d6cd556a08fe45a4631f22 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime-ktx/2.2.0...
 de617480ce64e4e9055e2d0295c87ee20929b06c4f2a5efdaded27dcca8520e4 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.2.0/wor...
 960a24728eaedfc4ff7a2f366b9360e02a1d88f9eb0a9c7142ed94ed462797b0 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.2.0/wor...
-10e1f9691dc9485d4c122d16b8ebb2c062a7675c983055bb28cec2496026e658 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/...
-099461a4afeb91d9852e4f6a69959403c328286840d991a001a068afc243bac6 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/...
-a0c36940b7351c2673bf3c96b6774017db4f1e8342ee063cafc3533cecd22707 | https://dl.google.com/dl/android/maven2/com/android/signflinger/3.6.0/signfl...
-a8f9f10afa0b381b5e64eafafbd09015775d9934eea475ccaf3320431b4b2a50 | https://dl.google.com/dl/android/maven2/com/android/signflinger/3.6.0/signfl...
-f7a0143fa51920ea9289ebfc11349fcb4bc70cebd1f6b746de2998fa7fdf5f2d | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
-b98df4993e7f76236fd28b6b73f62b2349f0399e780d50c8743e708c08f9b073 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
-fe69b530190d1be5d375b4d27c1831f1921ee023bcc2a4779a692a11b883a5d1 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
-65965684318c80df0f40e90f9a50800d8c57e9b3eda48096f9990b769f93524b | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
-d897e7af0116944be7c4b917831527155fa3723f1fb77f45ba84537c9923cd99 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
-ade7c62a6a19e93635ad78bb8f4bac080e32a1ecc7423c146522e013472f672f | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
-29720b801195d7809a8e91da9dbaee2305320f28777c7e9649da6b2392dc48a7 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
-9835e19c8b5ba3660f1778d27a82f03c4ac944cb3d22f14881b372ae251246e2 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
-fb242380c243cd2069fd992b2803cca4a9e4366157cd327984eab75eb9e9a9e7 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.6.0...
-827af30b20f5c227cba52f365d685e92ff08c45e2d4f37fca57eb5f951006dd2 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.6.0...
+d2ff1905ff7e7cbed7ecce20408a76b69a52d52fdf655b696ba49007c61a0e11 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/...
+ec6fe50839c05802cc262ec5611e160d17dff69c5a634bb322b27341f9176e9d | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/...
+9a29bf34909bca58b85cacda7d1f09cebe8079e56722911395f1ad6a0b377b94 | https://dl.google.com/dl/android/maven2/com/android/signflinger/4.0.1/signfl...
+e02d4311cfb31fe609fbd6961272c27cf049e2da65cf1f4b726a5253e6e8a631 | https://dl.google.com/dl/android/maven2/com/android/signflinger/4.0.1/signfl...
+e83aef89309f663b54ab5ac4db87e84373ac0a0d8f5054692645269f5748abf3 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
+97e5e2fe310993dff1160e2e47a194fd09d6cc0b6bbd4ccf07b64c12204b2c3b | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
+76e46c6be20d765f57a825eda2d1a438b0de537333614525798a30b5e0891329 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
+e61678b0d86b687df54a82ba419b00c243a47f50be1ea7541b09f8d60149e394 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
+a55260f65424bffadf4a5288d63bd564eedd248373f24b747312b4b74f6749e0 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
+39cb4737b1851830ec2760932fac05b65ca8b8fd5259c3edd0632d2ef4272ab5 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
+cb9c60fa882c814c447d52f3d4ca255426b490cfd594fc61e4c79ac90348ec13 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
+19df839f8cffcdaa31ab6fd433a88096654f6db9594d2a452386624912d767c7 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/...
+b3e58b463925b0ed0dd873bc924791aa6cd8dc3248ef692403106c5fc62a7b2c | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.0.1...
+1d144c563acc1118111db5890e451e6fad71412971d25a60c852c7ea4c1e0be1 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.0.1...
 fac0435e08898f89eeeb9ca236bea707155ff816c12205ced285ad53604133ca | https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/...
 a24bdd4e8e374fdcd8cef8d77ea723f147ccd0f25dc6de4fbe290039be904339 | https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/...
-f74465e394c73d71f0f9053f3ebc90999d06bea3ad7c1fa3576b6a3a088d0db3 | https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/3.6.0-...
-c616e4a81a19bf74fb98f072383b316da8be882c3e9efce7fee82b802da5ccd5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/3.6.0-...
-1fc041276d0e090b6ac99f26e8ab59d1c2257293bc88ee49ff074e69345bc665 | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.6.0...
-2cf2d4a8fbe06e60026b6f2f90a7d6c73b7d3f66abbb984e6a1740b85776a028 | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.6.0...
-8126c2fef74b0ebd1d6e647c3a84ef4f3e9a60231952abc74e4a097a6449374a | https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.6....
-055661a9e3089fb7154e0f358281a7406b1da4bc6d61dea1a0e19231239f36cf | https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.6....
-e18b976ea7620026259eeae4dc0378bd2ff5388dd91b8201113b2089b281ae3f | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mode...
-369428537e6613f4e229cbd70360aeff18a628c41566a7dd5b3d143808eef41a | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mode...
-ac90b88ce12f9d0ae0f9845ff2ad9bdf65aa07d3e7b4b0515794cffe4b603fe8 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test...
-af0c92edfbc6549bebb636e82eb8a851c85e12bc4bcdfa2b81161bbb9e994050 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test...
-74cc34c112d8586cedb0f94a9728b0402492436e10c6493ee6da60308be0b262 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.6....
-f4485a00d7a5c792cb5f2a8c5c8446bada583570f25182dbf84d700e30441386 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.6....
-20f2e347e9b4ccd9cdcdc2f6e1956ba3cc1641991fbbadc1f86ca60dd6ca64e1 | https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0...
-ad9c1614680f29b5c39018c32e2b44d3adfc52d667e7bf29ca64eb2feb697034 | https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0...
-841cfc9f6224c2d12e761ac3a305b268e0ee735b0ddd7e70cfebbf5a2df9cfa6 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3...
-69d6a67a8f84d03ba331dc9e228bd477c903f3643bde330c8c3a1cc72e8e1b7a | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3...
-bdd59f532634d4fde2b3a6864bdc61058d94a62a5310f431f75b6f571d00d196 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.6.0...
-ee16c99fea79a677092828264e01961816cef6ef4fa1f5702db6a58093dc0157 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.6.0...
-0930bb58d94e09c61161576ca38853b3dba4ac9320fcf323f9b31bc58a18afda | https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jet...
-c39f0d195566b2ca9e1c954a665a553dc60320d4022acad82fd56a31a6d395d5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jet...
-689e5637b0b61b460f447064ff62ed4267203a26a70cf071fa34d7c3faba5366 | https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jet...
-be08f1215cd2bb5cbd22b1146ea92e0f14558fafc1603cbef7553b3a6677984c | https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jet...
-9b2709e8f64978960a701675fa8d6e7dc5109ec6ddf1bb301c9ebf88545c9bc6 | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-mer...
-fc1c1056089f4418ac0de5aef2c797a38a39ce8cd70cacb95269b834625fcde8 | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-mer...
+60dc539f2835a4730864feab9d8f02b6f817f2be99eefd2e6bb6c7def8d98713 | https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/...
+61b958baf830e81b69ebe1b54e0b0b649b54d99b6b59d42786a1c1f89a02f9bd | https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/...
+90d19f92f03b0bfbe565ff2c841baba20845ef904527e45afb3aeae1f5c0b01f | https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/4.0.1-...
+dbe3fc8ec6323c86d7184124665627fd5e56096df0753140a4c907eadc2914ef | https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/4.0.1-...
+c02f9fc6764649d1c203ccc5ef2b52dd481647c63ae0e4b32ca6e12a58f8f81a | https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler...
+ff0f8b1b58c681a6b919a3f7e0fb893445d429a4f9613cf324eee6b4f01ca649 | https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler...
+a41dc0674a27c39cf1c32aa405e7e52245afa5da9edbcd63db6f209a98202645 | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.0.1...
+980990434e96bf73e3b7f443edffb71b3577ff4a06f5519b9f16eac8623af8a2 | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.0.1...
+fad2752409d5c64996d69bde7fd4869f9265da2266fba651a37ae54bd3fc0edf | https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.0....
+777b00b3fdf4ec23df055064f0cec47edc4a1bb4507e8925efcf68282aa6a219 | https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.0....
+319ec957af0e1499363f35357f649a6d0e6795b194fb72d1fdf3942bb06ff33a | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mode...
+0df48112c60f8327d78794082238ecc5cebb78a7e5c3231c2081cc0ab2263016 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mode...
+4c6cdcb86d93a9b6535da9f7edf502d1ccac3c955fb826280077462dbdcd31e6 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test...
+ef2762d952cd110536cd329297d6129b7022fd11f02185052bfe82abdf0be30e | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test...
+a62335a028a894e54f31d60c2014510a583c7676a5ee2e9f8b05d5172b4b2fee | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.0....
+309c4de4aa7d46d85874b812d58de5de340c547f4d5eb4377b66b67e78189026 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.0....
+9610a0e2691cae17d615c207b866b2aba2583e30ff4dad139d9da1ea1ab14355 | https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0...
+28084a3e5f68696440e6b0c3cda7649083468e27720bfe02bc89c5b04525af22 | https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0...
+b58bcead62bb3d7eb11bbb12bc4ed1d44887d041b27e6c9a1bdc751686611aa5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4...
+6698c4d15afa82d98ee3aea0482718b68dd34f433286a4dfbdfdca7c05678837 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4...
+aa8c109a1ce0678dabc8e622f4b83a5d7ad1d88a57e79ae2084bf797e159d0e3 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.0.1...
+5e252829277a43c693fedbf7b28fdffcf835381fac302a79c74b90f1304c77e8 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.0.1...
+9bb3a91e871e784446e4dd1e1d1dea5c322e271cba8278c1dec3669a66aee858 | https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jet...
+4688b442fb347820a85a8e0f019978f9eaa762fbbbadb774ab945119d7304da5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jet...
+1838f9ee70120e64f45612ca071972ac83ddc118185abffbce3932a4710325eb | https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jet...
+388408f994059031929d14723ec01411f85c6834608465763d4c79afe220a738 | https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jet...
+afc9ccac93c3655f4b8500170902d3277722eed772b9015c9f49f881d7c1d0bd | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-mer...
+07f502a131cbd79439b7fe61deac3760eae993338be88ef6ddee9714a48e6152 | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-mer...
 4de4a3d05e1c534c2db9e4588bf34082bb2bd232d8abb9727c430290ce225740 | https://dl.google.com/dl/android/maven2/com/android/tools/build/transform-ap...
 7c62f3856e8abca1d79257925f26c12668693f5d95904056bbac88605cfd8575 | https://dl.google.com/dl/android/maven2/com/android/tools/build/transform-ap...
-f83adfad2f11074d97e6b0706872a60ec54c6ff42d6554bec1c900d9077825d5 | https://dl.google.com/dl/android/maven2/com/android/tools/common/26.6.0/comm...
-4f9c30f02a6ee14fe175c1dd53274fd615d8e11dc22fb9912adcb58a69bb0bca | https://dl.google.com/dl/android/maven2/com/android/tools/common/26.6.0/comm...
-62eab1a996349a50e1e2a38f9277ebcebd2e10b1614b15f0ee8be1e1aedb8503 | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.6.0...
-764cf4d884e271972c3a1ea6fbc27fa6fcb7d4eb38787fbb40fa91f9f57a1add | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.6.0...
-837f7e464ab3bc491637869950ba56a7cc61977590d2d8ea85801cef3de253bb | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.6.0/dvlib...
-b19445e91383f59fb54c75e053d389a447eeac6c606b98420fcd74e044c0d95b | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.6.0/dvlib...
-452a2589b6ba40db238cff741fb0f01de83bb9e40b5a58a6f597473abb35900f | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intel...
-c84395f45a7d7e87f2f484e6e8180860cc92e464d2f344a90b8d2202520c99fe | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intel...
-2c13673bbd2f88c0cdd1df45a4ee63d0e0322c39796103c7abf175fcafe9ba35 | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intel...
-712c98251cf99c8d47ae32968fc3a46b0f1e376c744bc2409a28a0c122ba9c17 | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intel...
-09768c6b91a9cbd615074faf903b8010870f3b64a46a710718eecfce0edb21bf | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbr...
-3680ff0f4ee339b0e05865f4057a2d2321b3adaf4bcddeb732314fa7f3fb2bc7 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbr...
-951e8a3832d8f8cb7c10a41c6bd45c16a7a7ae7cc72958ac734f9db0650f61f9 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutli...
-476d3579571a4588f8187024f0043b043917a9b102c2c9f1f8fd6fc0085ab7df | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutli...
-b5e1235b181a5a68a14de7adc88997c66cda26036895fc771e87aca63267f2a4 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.6...
-54ab64c262cd2762fb2a2c4aead50a23c3ab500cb0f285864b4c7789a2898df5 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.6...
-941a2cd8c4b88b02abad9e7fc8219a65642ec4222f531bc0dbb69ae2b4f97147 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/2...
-12a8ff3487f7d014492354942d4e88b20925ae6b6679ddf4d426131936e51741 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/2...
-f661cca9e27b7029cc074b2b7167d1a6882abeb5a9f55efb8005a05e5ef6e11f | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-a...
-fe047cd786c3d1d32a92b2afe45d6c1ad8fefc214216136ffa0de491bb1cd51b | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-a...
-9298f4493601af4ba0ccd8f0623ec5cdb7c604c2fea59c3ddf1a82dab824b4c4 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/2...
-40d80c18a03c236c1ed50dbbb792266b7348b280fcebfce5bf3e41a7f929ecb9 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/2...
-1efa62b21a76ac2ec98c213937a846dab30f95082fcca806605b0215f9bba6d6 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.6.0/l...
-235bd153831ba5180c3487ffb9d20364cd402b72aa38429dd87bdb6cdb4a2227 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.6.0/l...
-da6c7429828e8149702d43b01bb32a57cf9687db6f407552585ba5f26bdf650b | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.6.0/...
-d583cc98e2215aa1d558b577435696c5d279674d48922e7095fc4f1dda0f5137 | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.6.0/...
-2bdd20936544902649d85d5db4a538cca888bc9b079ca49886476f7eea270dbc | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.6.0/...
-353c976f0c5d38f9dc64f571e1ca0a2c57ef0b3dbe76f5bbe062dc396fe7c8a3 | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.6.0/...
-8dae7e1f611f12c13e660e5245ade4311bb111976c191eacf6ae907a66a3e37d | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.6.0/sdkl...
-709acf0644fa2d6ea5ff226b902f49b5503dd76a13b2637b5e9216342987e50d | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.6.0/sdkl...
-3b9d663a8c1fc4fdc812d729961532fb943fd30e5c9e276121f59cdf6a68e665 | https://dl.google.com/dl/android/maven2/com/android/zipflinger/3.6.0/zipflin...
-3b46e78152954f6bde5a6d6c219508a8c1229f858e685c156314f1f82e76e1ce | https://dl.google.com/dl/android/maven2/com/android/zipflinger/3.6.0/zipflin...
+90f08d6fcbd0b2c7150522aa926f086ecbef53c9ae3f229178623343d0585f41 | https://dl.google.com/dl/android/maven2/com/android/tools/common/27.0.1/comm...
+2c91ea3d90a6c16436183cc332d6696151ffdb0e1a4675234cd61152394de943 | https://dl.google.com/dl/android/maven2/com/android/tools/common/27.0.1/comm...
+6a127ba207e5ab19193c60d70ef47af95da2a3ececa77de27f0732ab801ef9c1 | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.0.1...
+56e09be7a42217f839fac8e814be62f2c42e2f2a54294a3b5f8c8937ac827543 | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.0.1...
+db5ab7968e37e4f6c6a7d1f5607a16b53e63ca279eb847ec2ffbc385f84bf11b | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.0.1/dvlib...
+6232de47feacc346126def6e6255759080a0e71fa5a11862bcada6dd8e0d4bbe | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.0.1/dvlib...
+0183641d371c54449a222b1d0ae59c533651b109d05e002c900f01b6f8495aed | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intel...
+c34a4939cc92756cd009d5c7b4147bf50606c6c76334ae2e9165bd67f967ef5e | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intel...
+a3d9e8d2015562a2899f7f4ecdca4387659e68c8294c763dd1c32a92ce69cca4 | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intel...
+861c6d261d31fd3d5ab0ae7c9cb6576b2c4be6d5d012b4e0525975c79c3aafd4 | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intel...
+54c42dc71d061f3723ddf3a8805d81d0fa58aac7cf3d45038ef6d73e7d81f344 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbr...
+88eb944a29f95a87bb97fa5e9ee676f684ef078647bc6db02c29ccb036306877 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbr...
+09ce72f5b38c7e7455f5a66f1ad2a4d1b7f59f34db7257971313813eb03ad757 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutli...
+3d2486e5a0512211979564699f6d4d04f80118a799cc4e0ca6f1a160ab2acf4c | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutli...
+73a83166aa3a6c4f2d85f2c6255707e62718b8c5943a1beca831f0b900467f4b | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/27.0...
+ac934c8a63163f43809a55ffbc17b6145f8906f4f1305aed79cb8241e36eb9dd | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/27.0...
+a51bdb9c9c0c307ceb007f39625ff812d869dfd7cb2a5786c9c0daf8708c9a02 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/2...
+956d654f6091e1be38213ef0dd6ab9b49f9b61d9b0ebcd99cd5dfa7c108869d4 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/2...
+ce553ebebe7e87802b79c53c993288e52b3bc854cc65dfb16f7f165e2fc69e2f | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-a...
+ce9f53904823ce3720954378ce27af2370c90039fd57a8e6bd0a459c222fdebe | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-a...
+06029e806bb11999fcbdc0f59d5682feac25f50025c3d2d693a6ece22c2895ac | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/2...
+22c3ca3637f89f5e993ffcedb7fb4ec155ec6990e33d6c6bc67c627890cba147 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/2...
+6df1984c04793b4d8b4a8e5c6311335274d5d117435a83114b67e815f458d69c | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/27.0.1/l...
+e73ae15b1d39425510b155dc4373231314a38ac967734cb58a7c8b60ecc0463e | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/27.0.1/l...
+8a74bb5edcecb4d2fdc583727e0619d86505fee25feeffd3c3ed3d3b1b541e35 | https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.0.1/...
+b4acf81dc153b4b53b2f5c9e9b0c4c375d81a1c7b5a00fc4e3ad6c293ffc0e1e | https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.0.1/...
+89f307caddaee08c64111d064ebed6fd0304484afa154b2fdcbc6d3a71bf4899 | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.0.1/...
+becde65232980fb86c78a39543749317067f9bd1f55063a79b9c865fddeedd6f | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.0.1/...
+fdcf3a5e39c14f8880f69400e8c5700b6d1f9fb8c00e0e6afd44b02468a8b21d | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.0.1/sdkl...
+d18ffde8429d1ec8c4d18e6ac1159cf1dc9eaa070987564a096c53097bb4c6c5 | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.0.1/sdkl...
+d08a8f5a678b2e7e22ad25200880cb209cf96c1f1bd91b703a3139632a63c2c7 | https://dl.google.com/dl/android/maven2/com/android/zipflinger/4.0.1/zipflin...
+160a290f3ebbf2ebe64589cebd70a566ef985a629957e575697ac7285b5fcd38 | https://dl.google.com/dl/android/maven2/com/android/zipflinger/4.0.1/zipflin...
 05f740c6648165db00cf618dd56c200c4725e358e6d54f5853e0bec15734ea0a | https://jcenter.bintray.com/com/google/auto/auto-parent/6/auto-parent-6.pom
 b48b04ddba40e8ac33bf036f06fc43995fc5084bd94bdaace807ce27d3bea3fb | https://jcenter.bintray.com/com/google/auto/value/auto-value-annotations/1.6...
 1c76cd462fc96e7aa96dc70ce82f0d54063d6df16db35c9c7d9cc0d1a99d3fff | https://jcenter.bintray.com/com/google/auto/value/auto-value-annotations/1.6...
@@ -159,12 +163,13 @@ feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a | https://jcent
 8f1fec72b91a71ea39ec39f5f778c4d1124b6b097c6d55b3a50b554a52237b27 | https://jcenter.bintray.com/com/google/code/gson/gson-parent/2.8.5/gson-pare...
 233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81 | https://jcenter.bintray.com/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar
 b8308557a7fccc92d9fe7c8cd0599258b361285d2ecde7689eda98843255a092 | https://jcenter.bintray.com/com/google/code/gson/gson/2.8.5/gson-2.8.5.pom
-6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2....
-5e0258ea1ba4e51a133742680bc22448f7ab214be4073e8619f645ef1be42dd5 | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2....
-10a5949aa0f95c8de4fd47edfe20534d2acefd8c224f8afea1f607e112816120 | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2....
+3aa576b5671d0e26d83d7fdb7186810b5672f00bf8e72184260bcc7c2d7dc07a | https://jcenter.bintray.com/com/google/crypto/tink/tink/1.3.0-rc2/tink-1.3.0...
+5b9a11c11183d011de9a9a5490962d78a4d4bfe7579b0c5be4afb18a222e3f41 | https://jcenter.bintray.com/com/google/crypto/tink/tink/1.3.0-rc2/tink-1.3.0...
 3edce6b711ba368efe16b9b7aacb0214fbd648414cb9b965953a2e7ed89a819a | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2....
-c460902ddf5ece68832c6b271ce52a0928b05cf3a6ac81a8f548c73cbd541138 | https://jcenter.bintray.com/com/google/errorprone/error_prone_parent/2.2.0/e...
+357cd6cfb067c969226c442451502aee13800a24e950fdfde77bcdb4565a668d | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2....
+8d175561619289a527573cfbdcf872eb5c1216cf9ab692a0ef3dba6d793f63b4 | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2....
 767525d9a81129cd081968382980336327be4162b1e2251a182911daa733c123 | https://jcenter.bintray.com/com/google/errorprone/error_prone_parent/2.3.1/e...
+8d3b5b9fa211979e9c425e989825c07743d2eb4dc8c20ec61de0f5b3dc1a6333 | https://jcenter.bintray.com/com/google/errorprone/error_prone_parent/2.3.2/e...
 cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81 | https://jcenter.bintray.com/com/google/google/1/google-1.pom
 845c3efce63bd23d962f210b13beebab05c4d583898a1b1a7ffb8c7b3ed7d5d4 | https://jcenter.bintray.com/com/google/gradle/osdetector-gradle-plugin/1.6.2...
 5bf4f695ed1177e80524525b6e5a040a5d7ea4b16196b1110882c62e69a555e8 | https://jcenter.bintray.com/com/google/gradle/osdetector-gradle-plugin/1.6.2...
@@ -172,30 +177,31 @@ a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26 | https://jcent
 e96042ce78fecba0da2be964522947c87b40a291b5fd3cd672a434924103c4b9 | https://jcenter.bintray.com/com/google/guava/failureaccess/1.0.1/failureacce...
 f8698ab46ca996ce889c1afc8ca4f25eb8ac6b034dc898d4583742360016cc04 | https://jcenter.bintray.com/com/google/guava/guava-parent/26.0-android/guava...
 317e88291262e0cf2805e956c18850f1d4565c85c2e1112f5d9d08ab1732e696 | https://jcenter.bintray.com/com/google/guava/guava-parent/27.0.1-jre/guava-p...
-d3610165c6de2b4d8d6418487717b63c52b5a39c5e35a553e24873ecb60e0628 | https://jcenter.bintray.com/com/google/guava/guava-parent/27.1-jre/guava-par...
+f31a5846bd9e14a4c374da1b9b146a5715ecdca925e071e1d2bf4da2daaded90 | https://jcenter.bintray.com/com/google/guava/guava-parent/28.1-jre/guava-par...
 6a8dd041f23a6bb14a86e440fccb993537b62271357a0dac0a3cb0ff39158f36 | https://jcenter.bintray.com/com/google/guava/guava/27.0.1-jre/guava-27.0.1-j...
-4a5aa70cc968a4d137e599ad37553e5cfeed2265e8c193476d7119036c536fe7 | https://jcenter.bintray.com/com/google/guava/guava/27.1-jre/guava-27.1-jre.j...
-bd99d75006131ae25c9860a1d63e84e36371f112fdb0c2fe3d5d6ab38e9eb271 | https://jcenter.bintray.com/com/google/guava/guava/27.1-jre/guava-27.1-jre.p...
 e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069 | https://jcenter.bintray.com/com/google/guava/listenablefuture/1.0/listenable...
+30beb8b8527bd07c6e747e77f1a92122c2f29d57ce347461a4a55eb26e382da4 | https://jcenter.bintray.com/com/google/guava/guava/28.1-jre/guava-28.1-jre.j...
+74af0e8dd935894ce9bcb8e2842dd0001581b84cb6a7751c3ef9314011399ba4 | https://jcenter.bintray.com/com/google/guava/guava/28.1-jre/guava-28.1-jre.p...
 53873caf26bc1ed8a567ea6c939ab2aaa3f47a5e32d5cade95ddf5080d23238a | https://jcenter.bintray.com/com/google/guava/listenablefuture/1.0/listenable...
 b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99 | https://jcenter.bintray.com/com/google/guava/listenablefuture/9999.0-empty-t...
 18d4b1db26153d4e55079ce1f76bb1fe05cdb862ef9954a88cbcc4ff38b8679b | https://jcenter.bintray.com/com/google/guava/listenablefuture/9999.0-empty-t...
-2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6 | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc-...
-f0c98c571e93a7cb4dd18df0fa308f0963e7a0620ac2d4244e61e709d03ad6be | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc-...
+21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.3/j2objc-...
+5faca824ba115bee458730337dfdb2fcea46ba2fd774d4304edbf30fa6a3f055 | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.3/j2objc-...
 c71555751e57e0ef912870e8ac9625ae782502a6a5b9c19ccf83b2a97d8b26bd | https://jcenter.bintray.com/com/google/jimfs/jimfs-parent/1.1/jimfs-parent-1...
 c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar
 efa86e5cd922f17b472fdfcae57234d8d4ac3e148b6250737dfce454af7a7a44 | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom
+32ff2307dafc658d0b55b2ad841d625aea5606bb9b0316605165cd6980503243 | https://jcenter.bintray.com/com/google/protobuf/protobuf-bom/3.10.0/protobuf...
 74ee43b09e711b13d568811e12f33bd16e6087b15f1aeded22b0dfe89ae76856 | https://jcenter.bintray.com/com/google/protobuf/protobuf-bom/3.11.4/protobuf...
 433ae1f99ae3c330f1b54971b39c2672d49948e6acf661d9bb4f1e9a7743de8e | https://jcenter.bintray.com/com/google/protobuf/protobuf-gradle-plugin/0.8.1...
 d9fdbf20ea7e2b965a8870d17ebbd2900a64cef3c9a7c2bf0bd4d4857462680a | https://jcenter.bintray.com/com/google/protobuf/protobuf-gradle-plugin/0.8.1...
-4189e0be5ab15cf2330f70b24fbdc75ca37514f188388fce8580ce16a9a68052 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java-util/3.4.0/pro...
-89c43073e7eaa0eaba72a4a36ae1b6bfdfe5d81bb9d0e156aee05e4a72de3cb8 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java-util/3.4.0/pro...
-dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.4.0/protobuf...
-83f17ba86c5fa1a15a3a3c8030d4ce42ef21c1d39b65db6cc004a8eeb2c59406 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.4.0/protobuf...
+619b0b0dc344cb141e493cbedc5687c8fb7c985e609a1b035e621bfab2f89021 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java-util/3.10.0/pr...
+146660182d07798ced06fa8e8ae3b9faa90aa48cf3c6adfc67db9371188ba502 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java-util/3.10.0/pr...
+161d7d61a8cb3970891c299578702fd079646e032329d6c2cabf998d191437c9 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.10.0/protobu...
+b404c1b093ec9dea888e02c8dfe8662759586b94efa4f97061cdfc1bbfa15af0 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.10.0/protobu...
 8cacea2f7a042dabae295c509dcdbfe32a49aa3708eec6ddb8efd8593aa0b4a3 | https://jcenter.bintray.com/com/google/protobuf/protobuf-javalite/3.11.4/pro...
 1aa38c0b0891b910e84642c5116bb1b54d86a5959f37c9c38a34ede600bdd55d | https://jcenter.bintray.com/com/google/protobuf/protobuf-javalite/3.11.4/pro...
+6dd84a508125fffdefbd583fae12bf166aa902511b570ca54fa9efa45f6dfe80 | https://jcenter.bintray.com/com/google/protobuf/protobuf-parent/3.10.0/proto...
 c3e2aee04dd8698f8b21ce635c318f8964d52fc9ca490a01a64cdc7a6c44d362 | https://jcenter.bintray.com/com/google/protobuf/protobuf-parent/3.11.4/proto...
-24909c552842c0eb7a4c769d631a43cbef5a9a10c1640f2bdbd1ea149c573a47 | https://jcenter.bintray.com/com/google/protobuf/protobuf-parent/3.4.0/protob...
 5405b8939f23a32b70700386ff0edb9bc1a78b29b90396371d4c0fc973c60249 | https://jcenter.bintray.com/com/google/protobuf/protoc/3.11.4/protoc-3.11.4-...
 516b980cf41148c1d881e584634c81b0c4bc6c03a097a82e5181229f2a8b336d | https://jcenter.bintray.com/com/google/protobuf/protoc/3.11.4/protoc-3.11.4....
 2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json-...
@@ -213,7 +219,7 @@ f879b6e945854c6900b0dbee1c8384d7ab3de7e157fd7ac84937405c416d2a5e | https://jcent
 6d704e450a816a45bce806ba22c22fe83d8e8dcf7a71517603de630a1726809f | https://jcenter.bintray.com/com/sun/istack/istack-commons-runtime/3.0.7/ista...
 6f83d3c85fdca9ef24010cb2f652aab1a508bff6331c087b60d0301782b78c6f | https://jcenter.bintray.com/com/sun/istack/istack-commons/3.0.7/istack-commo...
 c2204f54b43593808c9af6502865ee71679823156dabdef341e71d35662c7aa0 | https://jcenter.bintray.com/com/sun/xml/bind/jaxb-bom-ext/2.3.1/jaxb-bom-ext...
-f699ef37ec7966e284742dfca83075221179041a9a49aef7991280192604462d | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.3.1/jaxb-pare...
+8b7d9154594e5b0e2bf1d9de6d2ac8dc7ae84179dfeb571299ce343292e9ed12 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.3.1/jaxb-pare...
 b56383eb4d43498b145d379e2a93d5fcdcd8ff9291f89b58b82cb91658dbf14c | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.3.1/j...
 7a8473e935504841c606686d84e9c017a739ac2c144fde687aa003a7dd44de7f | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-txw-parent/2.3.1/jaxb-...
 785861db11ca1bd0d1956682b974ad73eb19cd3e01a4b3fa82d62eca97210aec | https://jcenter.bintray.com/com/sun/xml/fastinfoset/FastInfoset/1.2.15/FastI...
@@ -245,11 +251,11 @@ cd1beaa4560dc4dfdb826b9d809e464db22526dfb54264bae78a6ff7efb08e1f | https://jcent
 12b20cf922773445c3445c2883cbf671fa982111e9bf9f875020f9313b3814b1 | https://jcenter.bintray.com/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.pom
 3a0c495de1cebc83f67beaa1776a7936f02f11f2addd3879596a78b2a86bcaa3 | https://jcenter.bintray.com/kr/motd/maven/os-maven-plugin/1.6.2/os-maven-plu...
 6d70d1f2f2727730d779d32a1fd2fbb1ea08e75a67a50a2d8e7d0fdb3a2a4af3 | https://jcenter.bintray.com/kr/motd/maven/os-maven-plugin/1.6.2/os-maven-plu...
-c83a9c71358d781539c34b38d76a88e3ec8e2d587c7f04b611acc9041919b310 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.aar
-0271ae7fc162a5e69c337f36d86fdb94a8a232c5c42a80d8a7424071addd1fdc | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.jar
-aafe6935d6bedb89a6aa32563d441fbe305da1de193d6f71a45a0212acf9b756 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.pom
-281440811268e65d9e266b3cc898297e214e04f09740d0386ceeb4a8923d63bf | https://jcenter.bintray.com/net/java/jvnet-parent/1/jvnet-parent-1.pom
-1af699f8d9ddab67f9a0d202fbd7915eb0362a5a6dfd5ffc54cafa3465c9cb0a | https://jcenter.bintray.com/net/java/jvnet-parent/5/jvnet-parent-5.pom
+2b9f3497218b32c399d1ecbea0b00d4f4553edcf669919ed1e1a87daa77acf87 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.6.0/jna-5.6.0.aar
+5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf | https://jcenter.bintray.com/net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar
+5fe81b0255978f24616d37b10608b79498a5f3073e1d9b2038d8736a831f2608 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
+5b936f6757872c1b901cb821001652eda746e3b6cffef9c434443534a96bfc9a | https://jcenter.bintray.com/net/java/jvnet-parent/1/jvnet-parent-1.pom
+3bc67852756cc2d3e04d8636f3af7d142464ff5bb43c2eda9c32b085be56ac19 | https://jcenter.bintray.com/net/java/jvnet-parent/5/jvnet-parent-5.pom
 26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4...
 7af7e2d8b24b4798f04c2b7da24c9fbd1b7557b4e017c2054481565916079092 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4...
 f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar
@@ -257,7 +263,7 @@ f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://jcent
 75bc89695fa66e75374ecda439b802406f0ab1d826dd386eed0a23b1f0a9d264 | https://jcenter.bintray.com/net/sf/proguard/proguard-base/6.0.3/proguard-bas...
 2a823d79f2675582a988d539466d1b175e939782efbe0f6e61f06cb165ed4907 | https://jcenter.bintray.com/net/sf/proguard/proguard-base/6.0.3/proguard-bas...
 cc12b1168e521491dd0e687cfebec11a4af874b22af70e10cf2a05b47ca00c8f | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/6.0.3/proguard-g...
-5a5c7317d68ce80d1d40c9d8bd4e38814d42d1b16c265146e333634833a35a57 | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/6.0.3/proguard-g...
+dab8d3d71fecb6edb4cc62fcfdd969744975a773b18e09581c63e9a9929dbb3f | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/6.0.3/proguard-g...
 d87266bfd2312c3b036c4ac709310afa35c448ceb18027c3b87a33d03c6de0a0 | https://jcenter.bintray.com/net/sf/proguard/proguard-parent/6.0.3/proguard-p...
 401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://jcenter.bintray.com/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5....
 a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar
@@ -279,7 +285,7 @@ c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7 | https://jcent
 7efc1241e73e7fbb268bfd33242d11ebd3ca07061d7d85f2962dc32a0f0b8855 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.5.6/httpc...
 b042b41f2391edb00d35f7f4e509aed2123648c1d246ce58d0f7b905c9fe1f73 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client/...
 61e9427d4be326c307a7f16ba828d1cb3b14713c9b04fc8ba992a58f376c3136 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-core/4....
-caaf967d94afb21753f36082c6086206bd1f48825ff596932cceba72b65d39fa | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-parent/...
+3b9ff4e8f7788fbbb3e0011b8a9098e8acf6815709c913aa3d027dfa3a799b3f | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-parent/...
 78ba1096561957db1b55200a159b648876430342d15d461277e62360da19f6fd | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.4.10/httpco...
 c5c12066df2b3b88a89a2c8602b81ea9a61627e976e5129eea1899ebbaea392b | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.4.10/httpco...
 0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.5.6/httpmim...
@@ -288,14 +294,14 @@ dfbfd6ffe2a784ca9817c46365aa7f8a578320b805bde39d6f55a0b09d8aa8ca | https://jcent
 321668fc474a73140eb9cc73c779f1ebb9f60948aade3beddee082ecefcf0259 | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk1...
 963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk1...
 8fdc3336e7b01873193ba9c48b87de7d788dc0954d1eb45c322492627a4b5c6e | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk1...
-64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a | https://jcenter.bintray.com/org/checkerframework/checker-qual/2.5.2/checker-...
-dc4cd438a36462d013c2338c8e206d102a322a00f33729e8955ee219859c9ede | https://jcenter.bintray.com/org/checkerframework/checker-qual/2.5.2/checker-...
+9103499008bcecd4e948da29b17864abb64304e15706444ae209d17ebe0575df | https://jcenter.bintray.com/org/checkerframework/checker-qual/2.8.1/checker-...
+f23376b58ed795f2ff47426ac76b996d49e3918442e5d8713e3925f889a77799 | https://jcenter.bintray.com/org/checkerframework/checker-qual/2.8.1/checker-...
 51d6c4e71782e85674239189499854359d380fb75e1a703756e3aaa5b98a5af0 | https://jcenter.bintray.com/org/codehaus/groovy/groovy-all/2.4.15/groovy-all...
 fc0d535d7bdb7ca90562321c2e8e2a35c377f113c6dd0b2062282e1f4676367a | https://jcenter.bintray.com/org/codehaus/groovy/groovy-all/2.4.15/groovy-all...
-92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53 | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.1...
-e956ab5d2eb48fabae12300d0cd2d3294d4a2a41abc2068c23cb4d60ad76cbe5 | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.1...
-18a03df16e2a184c582db7b125633c15fb7714027a84c1b532d72933dc08b81f | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-parent/1.17/ani...
-fc648dcdc404f8bf66e0583914ecf980176618201227bea114fae85043cb755e | https://jcenter.bintray.com/org/codehaus/mojo/mojo-parent/40/mojo-parent-40....
+47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.1...
+adf522f4839c35f5329ea97c407aebebfa8807b644852dc4d5cd7c97b7a6d2e0 | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.1...
+4e9df546a47cf6304a1317c46870100a8726fbea11b0dd18322f957e4070973c | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-parent/1.18/ani...
+f819cad1b15b6a7791c8b601e96bde33765e4681395807db4537d2f0dedd493b | https://jcenter.bintray.com/org/codehaus/mojo/mojo-parent/50/mojo-parent-50....
 6cc1266cf306557b4f2d09cbd8cd6e75b5ef0c5773ca4ef763d4f730df947b64 | https://jcenter.bintray.com/org/glassfish/jaxb/jaxb-bom/2.3.1/jaxb-bom-2.3.1...
 45fecfa5c8217ce1f3652ab95179790ec8cc0dec0384bca51cbeb94a293d9f2f | https://jcenter.bintray.com/org/glassfish/jaxb/jaxb-runtime/2.3.1/jaxb-runti...
 f8101b86157fbfc01949ffdc7c59ea71ca23b7ece25f6a79061fe01cb750ff00 | https://jcenter.bintray.com/org/glassfish/jaxb/jaxb-runtime/2.3.1/jaxb-runti...
@@ -309,8 +315,8 @@ affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601 | https://jcent
 310a6aa2d90534c32b8f46f1fc98cd0edae95dcdfca23e2847e5efa9ae0c019a | https://jcenter.bintray.com/org/jetbrains/intellij/deps/trove4j/1.0.20181211...
 303c422700f79d5d13d528b978c6abd9cd136d78d9f7f6f2556e85a81892f9f1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r...
 648025c01c56b234a7458cb6048ae8fcfa941f9ea8ebf059090733237b9df9b6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r...
-975dab97d8aa780bc8d1af8efd66ba121c35c709537308d5742e812c46b126c0 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r...
-d89b4ef057d10f9057d85685b711048c104ae76cfc60777cfae275848649a839 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r...
+4c801ff4f5151778762ce2d57080f0cb10a4a94cb76ad24593cca35bff36da48 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r...
+f120750af0c9e0c6024c3c76469fd4638ef898fc5bc2d4c49f2fe17568f47b9e | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r...
 ffd156464b8129365423e27b9e53ecbfd32d56b91af977dab2222ca2d271a65f | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/1...
 eb68121782d951a1db37e9a00c8fd9252eafa91388e90987239d75224490d6bb | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/1...
 2e508e8d23e9ab171f53ae3f71e8218e7242cd138af040d62651ecd9d3417bcd | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processin...
@@ -333,10 +339,10 @@ f54f0a4620e6253573cb4ba6a130d9829c93b8cf165eaf05da8fe0e552500f3f | https://jcent
 18e52973ed9aff902570d6ba9e633037593564b9acc193890026a08aa8907b48 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin/1.3.71...
 6123981a9d8998fe7229f813352ccb11944685527c2612a3fe44437bce45e394 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-native-utils/1.3.71/...
 dabbcda1f808e1d318e62548d35c2bc55ac45429d5bc33126c9066c3becf732b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-native-utils/1.3.71/...
-143e715c10ff6d65eb5a7695be7b696c6e013702dff103d23ba54760bf93867b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.61/kotli...
-b2b8add63c5ce9b67571ed469f7c37fd043ee2420206255e96a146018d8e2fa0 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.61/kotli...
 59c57ab609494d2a30d6ea3737428a56918ff0b8031081ea73b8472fdec06e44 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.71/kotli...
 4df94aaeee8d900be431386e31ef44e82a66e57c3ae30866aec2875aff01fe70 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.71/kotli...
+a188d9367de1c4ee9479db630985c0597b20709c83161b1430d24edb27e38c40 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotli...
+61653ccfae8caa4203e267b479821bd90faab3fef744a7ab0fdd9f61150f970c | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotli...
 ec403b5a429113adc0fa96e6c9367ceeaa6294b3e6e8b8a3d65eef7224d1ccea | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-script-runtime/1.3.7...
 04deba2875d68ac3f88d06dee97ab5c084698812a47415a1b0b88b6fde6b6c66 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-script-runtime/1.3.7...
 2c716ce300e573e51d351c68334b3cc5476cd500ad5e46cfdd716ee1e46cab31 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-common/1.3...
@@ -347,45 +353,47 @@ b53a20c3b3cbd6c46754dcec681f0613c8e32ecda30308c27a3c0f13a6cc45ee | https://jcent
 8491bd3f536685032bb7bfb8e40bac13b3286b57648582d65c348e8977764165 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-i...
 e67e0eaf0d532e4d312947ac4cf02135ea44aee646b32273707dc0c4646a3662 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.71...
 781be9412e564dfbc31345b21959989012e3dbea2686795725b875e43eac5ce0 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.71...
-a2e7f341cf3047b5f00a1917ef777d323cdab2a57377468b8ed62aa31469cf7f | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.61...
-e22db009bb1a61636d9425635989736db5e3fca494809abf244468dc474cfc04 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.61...
-76162bfcaa756897fd3f631019353e13b128df2318cdad5baecb7e7d428a28e3 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.70...
 974f8a9b7bfce3d730a86efe0eab219a72621e8530f91e30c89f400ba98092ec | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.71...
 93f5cb50148dee7da746ed487e6278ee8d94da9a99b670f9f5248456c2f66341 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.71...
 5e7d1552863e480c1628b1cc39ce230ef829f5b7230106215a05acda5172203a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72...
 24781edf5b0934804930dcafc8911b9e710d146239a82699889132e7b37be9dc | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72...
-11f4a57e3e7d81f3f152d5dcefe39bd77614b5a94125ff3b11526b0a19ac3989 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.61/k...
-c416080aeabdb9118a08ee78c28e2856038cd85858422a71f7c46bf276f667a7 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.61/k...
+4681f2d436a68c7523595d84ed5758e1382f9da0f67c91e6a848690d711274fe | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.10...
+63480e72a7d4de742b49a6ff90e45f544ca37f3fe11af8b4839f9cd747515d00 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.10...
 b046a5ef54c7006db852e48e547aaff525a9e7a0a5909ffe5fe2c966c1a3a72e | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.71/k...
 7163f88887d050f76f86ad2304f84a9d79c39a96178bf02e4524bdeacc5bb149 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.71/k...
 40566c0c08d414b9413ba556ff7f8a0b04b98b9f0f424d122dd2088510efccc4 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/k...
 9d5a13d9abc33445e1366d258af0a77e42f01945acef7c0917b9d539854e2fce | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/k...
-3839ba7deb798375da1807bc469d1cf315db7a6275599f733184374772ec3b21 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.61/k...
-e30187e5720ca640b8e68686f20dd0250dcef0193d56e5569c3c4a61277312b6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.61/k...
+f9566380c08722c780ce33ceee23e98ddf765ca98fabd3e2fabae7975c8d232b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.10/k...
+78f2fe1d48e99c64958930ccdc43fce5939460ecdfc65f302823a021d63c520d | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.10/k...
 133da70cfc07b56094282eac5c59bccd59f167ee2ead22e5282876d8bc10bf95 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/k...
 a6d50f0321bdb52838c99136930c8dcc78c3074a592d526862ec01be91fa622b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/k...
+39b7a9442d7a3865e0f4a732c56c1d5da0e11ffb3bb82a461d32deb0c0ca7673 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/k...
+c2f4d70082dbbfcea68fdfa74289cef32df9e4b5ddf359f006036dff1c5b06d6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/k...
 ab355888358a25478591aafe2cab2dd0b2e44af323a0acc3fd03581b24712430 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.41/k...
 a5e970ffd412599c8159068e670356509193e3238dddf20273ed6a8fb7b09de2 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.41/k...
 1b8355ce90079352de296f3f0b175473e7cbbde34d7338b92e4a80c633baab96 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.41/k...
 f6837401cbd13a8a31f126a9e22430ab9861602d91a4c310a47805453690f76d | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.41/k...
-e51e512619a7e7650a30eb4eb3e9c03e6909c7b5e3c026404e076254c098b932 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.61/kotlin...
-dbe5babcd8d43e9b08c2845680b53fc1bb3e051c4805802ddd0ed3e8e2c50a84 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.61/kotlin...
 5ace22b102a96425e4ac44e0558b927f3857b56a33cbc289cf1b70aee645e6a7 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.71/kotlin...
 ff03e9989faa2d40fa4a9098aaad71e247f27ea4d24b0754da642eb0924bd8c5 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.71/kotlin...
 3856a7349ebacd6d1be6802b2fed9c4dc2c5a564ea92b6b945ac988243d4b16b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin...
 4f0d574a969ea93c45628a163e1ed3ffabb4584278d72c647ec124f8c8109481 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin...
+01ecb09782c042b931c1839acf21a188340b295d05400afd6e3415d4475b8daa | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.10/kotlin...
+a4b9cfbb4bbda523af1e24d52c775fb9c0f7cb568e48b065d45aeb56e63c2762 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.10/kotlin...
 71cdc094af3463af5773122941819ce11951e8550c499938bb79a04b3d5ee842 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-io/1.3.71/kotli...
 ab2b2bd3304dcd40562a2930c53002b1e2d80fb21d0d9cc7d6448a83b9ae6b0b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-io/1.3.71/kotli...
 51f7f966cd071ff412df49849bdd0a6a651f800c8816defaa29fcd106eedcdac | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-klib/1.3.71/kot...
 fae43f08052e63bf49cbcda0ade70c05381c4093521e20f31dd564947c1b7105 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-klib/1.3.71/kot...
-cedeb99d252f51190e4cbf84e788fbe6d64e42216c42786aac029bfc4f1e2d65 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-android...
-fa64623d47d5f03553b4b9dc7902d30943c65c334487029681a03045fb13172c | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-android...
+3b6529d1872a2c689b2231cf3e75476badd5c5a430206c2c1967e4deb171e50d | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-android...
+504b6599eb3a3b4d8b4db267d1628e79f3e58f17fc4f6d44c24cda530b0edf39 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-android...
+64c6d2b53e52eb65e26c6b828d848d8ceab30473c3511bbd1c116cf9799bc127 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core-jv...
 7177ed4629704537e0252537629886f5409526ecd041d8d8e308e20624b14394 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1....
 6f7523ea8a56d7f12d11a004cfe5a4577bfba3ed6c84cc5ac48b72d54975552c | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1....
-6d3ddc759cd2094b1495198a8501e22a51c4c3d011ec801f5fc45a2cd25b8f11 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1....
-f4a306487c17b8cdca8d3e5da50369a2e5ac7c665200516d427726dff5a56f92 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1....
+6538f458473a42b6e2a92676f00d70d4fa0f6ae824d13c1e31c8051c196d2335 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1....
+51be6791ac5aed9718a58b297c8c9081c9b704dfd72a849c4754a40da55ee236 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1....
 1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-2...
 5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-2...
+518080049ba83181914419d11a25d9bc9833a2d729b6a6e7469fa52851356da8 | https://jcenter.bintray.com/org/json/json/20180813/json-20180813.jar
+c7e660c50bf4ecda0fc81ab62b489db9171e207fa784ddcb48c6c85bb40b49f5 | https://jcenter.bintray.com/org/json/json/20180813/json-20180813.pom
 95b05d9590af4154c6513b9c5dc1fb2e55b539972ba0a9ef28e9a0c01d83ad77 | https://jcenter.bintray.com/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.jar
 0a84c20cf71f6a3d21fe226b0d588332fc7ae3e90cb583c60a483317eb9f3644 | https://jcenter.bintray.com/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
 e981f8f650c4d900bb033650b18e122fa6b161eadd5f88978d08751f72ee8474 | https://jcenter.bintray.com/org/ow2/asm/asm-analysis/7.0/asm-analysis-7.0.ja...
@@ -403,24 +411,24 @@ b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcent
 fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.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
-a67ba1d46f43c23c521e12cbaf14226232af78d14b1f649d4d69681f80b86a54 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/62.0.0/...
-6b605eafe20d5ac0e3752e389bcd2fb30ff1654897513499b707351ac6b5cd81 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/62.0.0/...
-fbe40935ac8dca66278ad2f23a5a08928515e6abf68bc10d341095226cabf1ce | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/62.0.0...
-923190b601323312b57c7fb81de2646b57a9bf6de33fc35706a3da1daf971495 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/62.0.0...
-e79f67b5180f06a4680ffea310ceb2c5b0af205a88b3fb1cc76ce96e5b4a7ea7 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/62.0.0...
-d58717440828ed838a2bdfc14c3fc8a99eea380154d84800703afa3488b5a450 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/62.0.0...
-ba5699f396773de6bf5fda67a06cf72368e31dcfa10976c26d008be3cc7dd9c0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/62.0.0/...
-2e638c3b1781ca1f4a5d3acdccbe1d753eb3402c8ac1d8566c67cf2e08eaba23 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/62.0.0/...
-95fda0ed2e76860d92ead80fa3641f39fa1512b233d2d22e6f0f209aabf898f7 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/62.0.0/s...
-64604c28410376786e8288a8f39e9d38357e9dc246dff15972ebd4b8ff3c2de1 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/62.0.0/s...
-4aa879034861b9187adea6676b91391379fae1a78337f6d763960d486e7e0b76 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/62.0.0...
-c8d8f618668ccf620c7c4a87b8ebb77b6ae6d46410d072ea95acf2ff65d0f045 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/62.0.0...
-5278d5b22cb4ccc5e0d540c661a54b177018f1bb3d19e6a5f08c8de7a0d057eb | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle...
-67528b70924c76c53a59f0c93dda3a4c504844ed852eaf488dc8c9a599be30ac | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle...
-93b2f27c919b07b927d764726eb64350cb7d480bac9485b9192881a9d5d10f30 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3...
-a84340369fdbb4c38ea0ce2e17ceac1c6a596cebb9818885276eec8b611e4d4b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3...
-d0e02f22fbd35b15e50e043ca0462fac6b2b78ac4968b324bd1431c8f85878df | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.4.1/glean-32...
-79d0b2e02aa86ef38577edb2befa25280ce58fcbae23a1ffd1db80147510aa86 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.4.1/glean-32...
+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.0...
+ea6cb3d94121d03fefd5329072c7b01d891b8bb25c2c303b28dfd6728eeaa72f | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/63.0.0...
+377092988061736b0a6e8ddfd243fb9766598724abe0153767310ad2b0be86f5 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.0...
+45ea21040eadcdce28620267916dc6fd7c252ec54bed1bbefb8f5b6b456e6a5c | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.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/s...
+ca3c96c281e314f07170bbfa766693ef0d2e4d865433a9622254088ee7e68363 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/s...
+93fd44998bfeeab9d7137cb34a50d510876ec8362e988b8a4ddf4e1629a69e71 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.0...
+b3836516ae7c9f1ca38ce636e24e3d10b2b421d94e344f14033daa5f20df3168 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.0...
+c844c630c520e7ca53db9282380242248fe5c11d9ab6b941ddded5bb51296721 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle...
+a8cc4657e66af457b8f8ef675ff59b0a1dbfe71466fc93271b6867bc270a7712 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle...
+5eb5d86577ecf64ba66df368c07dde772d1e82da63f25d73e63118d261ca7a7c | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3...
+d1a407ad60d86df547ca4521ed5355e609bbe09f22ef658c89cade0780468994 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3...
+a1925b30aed9675e339205797eebd0598885cc987fc61890e81f4a2c12dcf6b6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.0.4/glean-33...
+477ee8ea2f4bbcf2860553987f3e5fddaac7cfd6bcae7c1bef7a7b29cdc5d9d8 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.0.4/glean-33...
 470564ff0a452da1c96be4ca3a9cdeceaa2912537ee2a8def486f3b383d43f15 | https://plugins.gradle.org/m2/com/jetbrains/python/envs/com.jetbrains.python...
 6438812f927b505a4c4ef2703b45433a1b99e45334526bfed25e71e1a79abb14 | https://plugins.gradle.org/m2/gradle/plugin/com/jetbrains/python/gradle-pyth...
 317aa4c467a37d5fcab6657c326a4069ea8e8c6dda951ec2091ffb95c596a2a3 | https://plugins.gradle.org/m2/gradle/plugin/com/jetbrains/python/gradle-pyth...
diff --git a/projects/application-services/update-cargo-lock.patch b/projects/application-services/update-cargo-lock.patch
new file mode 100644
index 0000000..283a3a2
--- /dev/null
+++ b/projects/application-services/update-cargo-lock.patch
@@ -0,0 +1,976 @@
+From 214a01a43691302b52c2fd8c39c26ef66d4c00b8 Mon Sep 17 00:00:00 2001
+From: Georg Koppen gk@torproject.org
+Date: Fri, 27 Nov 2020 09:55:49 +0000
+Subject: [PATCH] update cargo.lock
+
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 21244f27..a28c22d7 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -86,9 +86,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+ 
+ [[package]]
+ name = "askama"
+-version = "0.10.3"
++version = "0.10.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12"
++checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134"
+ dependencies = [
+  "askama_derive",
+  "askama_escape",
+@@ -97,13 +97,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "askama_derive"
+-version = "0.10.3"
++version = "0.10.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881"
++checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522"
+ dependencies = [
+  "askama_shared",
+  "proc-macro2",
+- "quote",
+  "syn",
+ ]
+ 
+@@ -115,12 +114,12 @@ checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb"
+ 
+ [[package]]
+ name = "askama_shared"
+-version = "0.10.4"
++version = "0.11.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5"
++checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc"
+ dependencies = [
+  "askama_escape",
+- "nom",
++ "nom 6.0.1",
+  "proc-macro2",
+  "quote",
+  "serde",
+@@ -186,9 +185,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "backtrace"
+-version = "0.3.54"
++version = "0.3.55"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28"
++checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598"
+ dependencies = [
+  "addr2line",
+  "cfg-if 1.0.0",
+@@ -210,6 +209,12 @@ version = "0.12.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
+ 
++[[package]]
++name = "base64"
++version = "0.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
++
+ [[package]]
+ name = "bincode"
+ version = "1.3.1"
+@@ -232,6 +237,18 @@ version = "1.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+ 
++[[package]]
++name = "bitvec"
++version = "0.19.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
++dependencies = [
++ "funty",
++ "radium",
++ "tap",
++ "wyz",
++]
++
+ [[package]]
+ name = "blake2b_simd"
+ version = "0.5.11"
+@@ -320,9 +337,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "cc"
+-version = "1.0.61"
++version = "1.0.65"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
++checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15"
+ 
+ [[package]]
+ name = "cfg-if"
+@@ -437,11 +454,21 @@ dependencies = [
+  "winapi-util",
+ ]
+ 
++[[package]]
++name = "console_error_panic_hook"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
++dependencies = [
++ "cfg-if 0.1.10",
++ "wasm-bindgen",
++]
++
+ [[package]]
+ name = "const-random"
+-version = "0.1.11"
++version = "0.1.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "02dc82c12dc2ee6e1ded861cf7d582b46f66f796d1b6c93fa28b911ead95da02"
++checksum = "486d435a7351580347279f374cb8a3c16937485441db80181357b7c4d70f17ed"
+ dependencies = [
+  "const-random-macro",
+  "proc-macro-hack",
+@@ -449,12 +476,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "const-random-macro"
+-version = "0.1.11"
++version = "0.1.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fc757bbb9544aa296c2ae00c679e81f886b37e28e59097defe0cf524306f6685"
++checksum = "49a84d8ff70e3ec52311109b019c27672b4c1929e4cf7c18bcf0cd9fb5e230be"
+ dependencies = [
+  "getrandom 0.2.0",
++ "lazy_static",
+  "proc-macro-hack",
++ "tiny-keccak",
+ ]
+ 
+ [[package]]
+@@ -471,9 +500,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+ 
+ [[package]]
+ name = "core-foundation"
+-version = "0.7.0"
++version = "0.9.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
++checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
+ dependencies = [
+  "core-foundation-sys",
+  "libc",
+@@ -481,9 +510,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "core-foundation-sys"
+-version = "0.7.0"
++version = "0.8.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
++checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+ 
+ [[package]]
+ name = "cpuid-bool"
+@@ -543,7 +572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+ dependencies = [
+  "cfg-if 1.0.0",
+- "crossbeam-utils 0.8.0",
++ "crossbeam-utils",
+ ]
+ 
+ [[package]]
+@@ -554,18 +583,18 @@ checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+ dependencies = [
+  "cfg-if 1.0.0",
+  "crossbeam-epoch",
+- "crossbeam-utils 0.8.0",
++ "crossbeam-utils",
+ ]
+ 
+ [[package]]
+ name = "crossbeam-epoch"
+-version = "0.9.0"
++version = "0.9.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
++checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
+ dependencies = [
+  "cfg-if 1.0.0",
+  "const_fn",
+- "crossbeam-utils 0.8.0",
++ "crossbeam-utils",
+  "lazy_static",
+  "memoffset",
+  "scopeguard",
+@@ -573,26 +602,20 @@ dependencies = [
+ 
+ [[package]]
+ name = "crossbeam-utils"
+-version = "0.7.2"
++version = "0.8.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
++checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
+ dependencies = [
+  "autocfg 1.0.1",
+- "cfg-if 0.1.10",
++ "cfg-if 1.0.0",
+  "lazy_static",
+ ]
+ 
+ [[package]]
+-name = "crossbeam-utils"
+-version = "0.8.0"
++name = "crunchy"
++version = "0.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+-dependencies = [
+- "autocfg 1.0.1",
+- "cfg-if 1.0.0",
+- "const_fn",
+- "lazy_static",
+-]
++checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+ 
+ [[package]]
+ name = "csv"
+@@ -738,7 +761,7 @@ version = "1.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "53d97f19730c1eb3332d0657d0f3ca72795d77c61d8eb26bdd7f15edc0c61eb2"
+ dependencies = [
+- "base64",
++ "base64 0.12.3",
+  "byteorder",
+  "once_cell",
+  "serde",
+@@ -1034,6 +1057,16 @@ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+ 
++[[package]]
++name = "form_urlencoded"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
++dependencies = [
++ "matches",
++ "percent-encoding",
++]
++
+ [[package]]
+ name = "fuchsia-cprng"
+ version = "0.1.1"
+@@ -1056,53 +1089,59 @@ version = "0.3.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+ 
++[[package]]
++name = "funty"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8"
++
+ [[package]]
+ name = "futures-channel"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151"
++checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
+ dependencies = [
+  "futures-core",
+ ]
+ 
+ [[package]]
+ name = "futures-core"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46"
++checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
+ 
+ [[package]]
+ name = "futures-io"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b"
++checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
+ 
+ [[package]]
+ name = "futures-sink"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11"
++checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
+ 
+ [[package]]
+ name = "futures-task"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c"
++checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
+ dependencies = [
+  "once_cell",
+ ]
+ 
+ [[package]]
+ name = "futures-util"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34"
++checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
+ dependencies = [
+  "futures-core",
+  "futures-io",
+  "futures-task",
+  "memchr",
+- "pin-project 1.0.1",
++ "pin-project 1.0.2",
+  "pin-utils",
+  "slab",
+ ]
+@@ -1112,7 +1151,7 @@ name = "fxa-client"
+ version = "0.1.0"
+ dependencies = [
+  "anyhow",
+- "base64",
++ "base64 0.12.3",
+  "error-support",
+  "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "hex",
+@@ -1272,7 +1311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "7539c8d8699bae53238aacd3f93cfb0bcaef77b85dc963902b9367c5d7a84c48"
+ dependencies = [
+  "anyhow",
+- "base64",
++ "base64 0.12.3",
+  "log 0.4.11",
+  "once_cell",
+  "thiserror",
+@@ -1361,7 +1400,7 @@ dependencies = [
+  "httparse",
+  "httpdate",
+  "itoa",
+- "pin-project 1.0.1",
++ "pin-project 1.0.2",
+  "socket2",
+  "tokio",
+  "tower-service",
+@@ -1488,7 +1527,7 @@ dependencies = [
+ name = "jwcrypto"
+ version = "0.1.0"
+ dependencies = [
+- "base64",
++ "base64 0.12.3",
+  "rc_crypto",
+  "serde",
+  "serde_derive",
+@@ -1521,6 +1560,19 @@ version = "1.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+ 
++[[package]]
++name = "lexical-core"
++version = "0.7.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
++dependencies = [
++ "arrayvec",
++ "bitflags 1.2.1",
++ "cfg-if 0.1.10",
++ "ryu",
++ "static_assertions",
++]
++
+ [[package]]
+ name = "libc"
+ version = "0.2.80"
+@@ -1673,9 +1725,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+ 
+ [[package]]
+ name = "memoffset"
+-version = "0.5.6"
++version = "0.6.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
++checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
+ dependencies = [
+  "autocfg 1.0.1",
+ ]
+@@ -1777,7 +1829,7 @@ dependencies = [
+  "rand 0.7.3",
+  "regex",
+  "serde_json",
+- "serde_urlencoded",
++ "serde_urlencoded 0.6.1",
+ ]
+ 
+ [[package]]
+@@ -1800,9 +1852,9 @@ checksum = "ba896fb4d7fe86433ebaf18c532bd9202e54c450a1bf7723855220e0e76d71d1"
+ 
+ [[package]]
+ name = "native-tls"
+-version = "0.2.4"
++version = "0.2.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
++checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f"
+ dependencies = [
+  "lazy_static",
+  "libc",
+@@ -1877,11 +1929,23 @@ dependencies = [
+  "version_check",
+ ]
+ 
++[[package]]
++name = "nom"
++version = "6.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
++dependencies = [
++ "bitvec",
++ "lexical-core",
++ "memchr",
++ "version_check",
++]
++
+ [[package]]
+ name = "nss"
+ version = "0.1.0"
+ dependencies = [
+- "base64",
++ "base64 0.12.3",
+  "error-support",
+  "nss_sys",
+  "serde",
+@@ -1973,15 +2037,15 @@ checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
+ 
+ [[package]]
+ name = "once_cell"
+-version = "1.4.1"
++version = "1.5.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
++checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+ 
+ [[package]]
+ name = "oorandom"
+-version = "11.1.2"
++version = "11.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a170cebd8021a008ea92e4db85a72f80b35df514ec664b296fdcbb654eac0b2c"
++checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+ 
+ [[package]]
+ name = "opaque-debug"
+@@ -2073,9 +2137,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "paste"
+-version = "1.0.2"
++version = "1.0.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ba7ae1a2180ed02ddfdb5ab70c70d596a26dd642e097bb6fe78b1bde8588ed97"
++checksum = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9"
+ 
+ [[package]]
+ name = "paste-impl"
+@@ -2113,11 +2177,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "pin-project"
+-version = "1.0.1"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841"
++checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
+ dependencies = [
+- "pin-project-internal 1.0.1",
++ "pin-project-internal 1.0.2",
+ ]
+ 
+ [[package]]
+@@ -2133,9 +2197,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "pin-project-internal"
+-version = "1.0.1"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86"
++checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -2148,6 +2212,12 @@ version = "0.1.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
+ 
++[[package]]
++name = "pin-project-lite"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
++
+ [[package]]
+ name = "pin-utils"
+ version = "0.1.0"
+@@ -2391,7 +2461,7 @@ dependencies = [
+ name = "push"
+ version = "0.1.0"
+ dependencies = [
+- "base64",
++ "base64 0.12.3",
+  "bincode",
+  "error-support",
+  "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -2417,7 +2487,7 @@ dependencies = [
+ name = "push-ffi"
+ version = "0.1.0"
+ dependencies = [
+- "base64",
++ "base64 0.12.3",
+  "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static",
+  "log 0.4.11",
+@@ -2443,6 +2513,12 @@ dependencies = [
+  "proc-macro2",
+ ]
+ 
++[[package]]
++name = "radium"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
++
+ [[package]]
+ name = "rand"
+ version = "0.4.6"
+@@ -2636,7 +2712,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+ dependencies = [
+  "crossbeam-channel",
+  "crossbeam-deque",
+- "crossbeam-utils 0.8.0",
++ "crossbeam-utils",
+  "lazy_static",
+  "num_cpus",
+ ]
+@@ -2645,7 +2721,7 @@ dependencies = [
+ name = "rc_crypto"
+ version = "0.1.0"
+ dependencies = [
+- "base64",
++ "base64 0.12.3",
+  "ece",
+  "error-support",
+  "hawk",
+@@ -2737,11 +2813,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "reqwest"
+-version = "0.10.8"
++version = "0.10.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e"
++checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce"
+ dependencies = [
+- "base64",
++ "base64 0.13.0",
+  "bytes",
+  "encoding_rs",
+  "futures-core",
+@@ -2758,14 +2834,15 @@ dependencies = [
+  "mime_guess",
+  "native-tls",
+  "percent-encoding",
+- "pin-project-lite",
++ "pin-project-lite 0.2.0",
+  "serde",
+- "serde_urlencoded",
++ "serde_urlencoded 0.7.0",
+  "tokio",
+  "tokio-tls",
+  "url",
+  "wasm-bindgen",
+  "wasm-bindgen-futures",
++ "wasm-bindgen-test",
+  "web-sys",
+  "winreg",
+ ]
+@@ -2822,14 +2899,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "rust-argon2"
+-version = "0.8.2"
++version = "0.8.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19"
++checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
+ dependencies = [
+- "base64",
++ "base64 0.13.0",
+  "blake2b_simd",
+  "constant_time_eq",
+- "crossbeam-utils 0.7.2",
++ "crossbeam-utils",
+ ]
+ 
+ [[package]]
+@@ -2872,6 +2949,12 @@ dependencies = [
+  "winapi 0.3.9",
+ ]
+ 
++[[package]]
++name = "scoped-tls"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
++
+ [[package]]
+ name = "scopeguard"
+ version = "1.1.0"
+@@ -2880,9 +2963,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+ 
+ [[package]]
+ name = "security-framework"
+-version = "0.4.4"
++version = "2.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535"
++checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"
+ dependencies = [
+  "bitflags 1.2.1",
+  "core-foundation",
+@@ -2893,9 +2976,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "security-framework-sys"
+-version = "0.4.3"
++version = "2.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
++checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
+ dependencies = [
+  "core-foundation-sys",
+  "libc",
+@@ -2988,6 +3071,18 @@ dependencies = [
+  "url",
+ ]
+ 
++[[package]]
++name = "serde_urlencoded"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
++dependencies = [
++ "form_urlencoded",
++ "itoa",
++ "ryu",
++ "serde",
++]
++
+ [[package]]
+ name = "sha2"
+ version = "0.9.2"
+@@ -3015,17 +3110,17 @@ checksum = "797a4eaffb90d896f29698d45676f9f940a71936d7574996a7df54593ba209fa"
+ 
+ [[package]]
+ name = "smallvec"
+-version = "1.4.2"
++version = "1.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
++checksum = "7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85"
+ 
+ [[package]]
+ name = "socket2"
+-version = "0.3.15"
++version = "0.3.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44"
++checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
+ dependencies = [
+- "cfg-if 0.1.10",
++ "cfg-if 1.0.0",
+  "libc",
+  "redox_syscall",
+  "winapi 0.3.9",
+@@ -3042,6 +3137,12 @@ dependencies = [
+  "rusqlite",
+ ]
+ 
++[[package]]
++name = "static_assertions"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
++
+ [[package]]
+ name = "strsim"
+ version = "0.8.0"
+@@ -3074,9 +3175,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "syn"
+-version = "1.0.48"
++version = "1.0.51"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
++checksum = "3b4f34193997d92804d359ed09953e25d5138df6bcc055a71bf68ee89fdf9223"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -3087,7 +3188,7 @@ dependencies = [
+ name = "sync-guid"
+ version = "0.1.0"
+ dependencies = [
+- "base64",
++ "base64 0.12.3",
+  "rand 0.7.3",
+  "rusqlite",
+  "serde",
+@@ -3099,7 +3200,7 @@ name = "sync-test"
+ version = "0.1.0"
+ dependencies = [
+  "anyhow",
+- "base64",
++ "base64 0.12.3",
+  "env_logger",
+  "fxa-client",
+  "interrupt-support",
+@@ -3127,7 +3228,7 @@ version = "0.1.0"
+ dependencies = [
+  "anyhow",
+  "base16",
+- "base64",
++ "base64 0.12.3",
+  "env_logger",
+  "error-support",
+  "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -3294,6 +3395,12 @@ dependencies = [
+  "viaduct",
+ ]
+ 
++[[package]]
++name = "tap"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
++
+ [[package]]
+ name = "tempdir"
+ version = "0.3.7"
+@@ -3341,18 +3448,18 @@ dependencies = [
+ 
+ [[package]]
+ name = "termcolor"
+-version = "1.1.0"
++version = "1.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
++checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+ dependencies = [
+  "winapi-util",
+ ]
+ 
+ [[package]]
+ name = "terminal_size"
+-version = "0.1.13"
++version = "0.1.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9a14cd9f8c72704232f0bfc8455c0e861f0ad4eb60cc9ec8a170e231414c1e13"
++checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1"
+ dependencies = [
+  "libc",
+  "winapi 0.3.9",
+@@ -3428,6 +3535,15 @@ dependencies = [
+  "winapi 0.3.9",
+ ]
+ 
++[[package]]
++name = "tiny-keccak"
++version = "2.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
++dependencies = [
++ "crunchy",
++]
++
+ [[package]]
+ name = "tinytemplate"
+ version = "1.1.0"
+@@ -3440,15 +3556,24 @@ dependencies = [
+ 
+ [[package]]
+ name = "tinyvec"
+-version = "0.3.4"
++version = "1.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117"
++checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
++dependencies = [
++ "tinyvec_macros",
++]
++
++[[package]]
++name = "tinyvec_macros"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+ 
+ [[package]]
+ name = "tokio"
+-version = "0.2.22"
++version = "0.2.23"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
++checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff"
+ dependencies = [
+  "bytes",
+  "fnv",
+@@ -3458,7 +3583,7 @@ dependencies = [
+  "memchr",
+  "mio",
+  "num_cpus",
+- "pin-project-lite",
++ "pin-project-lite 0.1.11",
+  "slab",
+ ]
+ 
+@@ -3482,7 +3607,7 @@ dependencies = [
+  "futures-core",
+  "futures-sink",
+  "log 0.4.11",
+- "pin-project-lite",
++ "pin-project-lite 0.1.11",
+  "tokio",
+ ]
+ 
+@@ -3503,13 +3628,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+ 
+ [[package]]
+ name = "tracing"
+-version = "0.1.21"
++version = "0.1.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27"
++checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
+ dependencies = [
+- "cfg-if 0.1.10",
++ "cfg-if 1.0.0",
+  "log 0.4.11",
+- "pin-project-lite",
++ "pin-project-lite 0.2.0",
+  "tracing-core",
+ ]
+ 
+@@ -3574,18 +3699,18 @@ dependencies = [
+ 
+ [[package]]
+ name = "unicode-normalization"
+-version = "0.1.13"
++version = "0.1.16"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
++checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
+ dependencies = [
+  "tinyvec",
+ ]
+ 
+ [[package]]
+ name = "unicode-segmentation"
+-version = "1.6.0"
++version = "1.7.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
++checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
+ 
+ [[package]]
+ name = "unicode-width"
+@@ -3617,7 +3742,7 @@ dependencies = [
+  "ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static",
+  "log 0.4.11",
+- "paste 1.0.2",
++ "paste 1.0.3",
+ ]
+ 
+ [[package]]
+@@ -3648,10 +3773,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "url"
+-version = "2.1.1"
++version = "2.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
++checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
+ dependencies = [
++ "form_urlencoded",
+  "idna",
+  "matches",
+  "percent-encoding",
+@@ -3813,6 +3939,30 @@ version = "0.2.68"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
+ 
++[[package]]
++name = "wasm-bindgen-test"
++version = "0.3.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "34d1cdc8b98a557f24733d50a1199c4b0635e465eecba9c45b214544da197f64"
++dependencies = [
++ "console_error_panic_hook",
++ "js-sys",
++ "scoped-tls",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "wasm-bindgen-test-macro",
++]
++
++[[package]]
++name = "wasm-bindgen-test-macro"
++version = "0.3.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e8fb9c67be7439ee8ab1b7db502a49c05e51e2835b66796c705134d9b8e1a585"
++dependencies = [
++ "proc-macro2",
++ "quote",
++]
++
+ [[package]]
+ name = "web-sys"
+ version = "0.3.45"
+@@ -3876,7 +4026,7 @@ version = "0.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37"
+ dependencies = [
+- "nom",
++ "nom 5.1.2",
+ ]
+ 
+ [[package]]
+@@ -3956,6 +4106,12 @@ dependencies = [
+  "winapi-build",
+ ]
+ 
++[[package]]
++name = "wyz"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
++
+ [[package]]
+ name = "x11-clipboard"
+ version = "0.3.3"
+-- 
+2.29.2
+
diff --git a/projects/application-services/viaduct-workaround.patch b/projects/application-services/viaduct-workaround.patch
new file mode 100644
index 0000000..0c74aa7
--- /dev/null
+++ b/projects/application-services/viaduct-workaround.patch
@@ -0,0 +1,32 @@
+From 2b79903b41133799bcbe72aed2e9e8d54b278d30 Mon Sep 17 00:00:00 2001
+From: Georg Koppen gk@torproject.org
+Date: Wed, 2 Dec 2020 09:26:24 +0000
+Subject: [PATCH 1/2] Bug 40156: viaduct*-workaround
+
+See: https://github.com/mozilla/application-services/issues/3732.
+
+diff --git a/nimbus/Cargo.toml b/nimbus/Cargo.toml
+index 3f118b7..0d0fa9b 100644
+--- a/nimbus/Cargo.toml
++++ b/nimbus/Cargo.toml
+@@ -25,7 +25,7 @@ serde_derive = "1"
+ serde_json = "1"
+ log = "0.4"
+ # Viaduct locked to version same version of app-services as mozilla-central
+-viaduct = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"}
++viaduct = { path = "../../../viaduct" }
+ thiserror = "1"
+ url = "2.1"
+ rkv = "0.15"
+@@ -40,7 +40,7 @@ uniffi = "0.5"
+ uniffi_build = { version = "0.5", features = [ "builtin-bindgen" ] }
+ 
+ [dev-dependencies]
+-viaduct-reqwest = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"}
++viaduct-reqwest = { path = "../../../support/viaduct-reqwest" }
+ mockito = "0.27"
+ env_logger = "0.7"
+ clap = "2.33.3"
+-- 
+2.29.2
+
diff --git a/projects/application-services/viaduct-workaround2.patch b/projects/application-services/viaduct-workaround2.patch
new file mode 100644
index 0000000..df84602
--- /dev/null
+++ b/projects/application-services/viaduct-workaround2.patch
@@ -0,0 +1,660 @@
+From 5d34bb6b8aa779cbb9d9bdb465aa38ff99ecc2d1 Mon Sep 17 00:00:00 2001
+From: Georg Koppen gk@torproject.org
+Date: Wed, 2 Dec 2020 09:26:43 +0000
+Subject: [PATCH 2/2] Bug 40156: Cargo.lock update after viaduct*-workaround
+
+
+diff --git a/nimbus/Cargo.lock b/nimbus/Cargo.lock
+index 2339236..dfe0f6f 100644
+--- a/nimbus/Cargo.lock
++++ b/nimbus/Cargo.lock
+@@ -30,11 +30,17 @@ version = "0.3.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+ 
++[[package]]
++name = "arrayvec"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
++
+ [[package]]
+ name = "askama"
+-version = "0.10.3"
++version = "0.10.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12"
++checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134"
+ dependencies = [
+  "askama_derive",
+  "askama_escape",
+@@ -43,13 +49,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "askama_derive"
+-version = "0.10.3"
++version = "0.10.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881"
++checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522"
+ dependencies = [
+  "askama_shared",
+  "proc-macro2",
+- "quote",
+  "syn",
+ ]
+ 
+@@ -61,12 +66,12 @@ checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb"
+ 
+ [[package]]
+ name = "askama_shared"
+-version = "0.10.4"
++version = "0.11.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5"
++checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc"
+ dependencies = [
+  "askama_escape",
+- "nom",
++ "nom 6.0.1",
+  "proc-macro2",
+  "quote",
+  "serde",
+@@ -104,9 +109,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+ 
+ [[package]]
+ name = "base64"
+-version = "0.12.3"
++version = "0.13.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+ 
+ [[package]]
+ name = "bincode"
+@@ -124,6 +129,18 @@ version = "1.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+ 
++[[package]]
++name = "bitvec"
++version = "0.19.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
++dependencies = [
++ "funty",
++ "radium",
++ "tap",
++ "wyz",
++]
++
+ [[package]]
+ name = "block-buffer"
+ version = "0.9.0"
+@@ -164,9 +181,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "cc"
+-version = "1.0.61"
++version = "1.0.65"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
++checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15"
+ 
+ [[package]]
+ name = "cfg-if"
+@@ -206,6 +223,16 @@ dependencies = [
+  "winapi 0.3.9",
+ ]
+ 
++[[package]]
++name = "console_error_panic_hook"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
++dependencies = [
++ "cfg-if 0.1.10",
++ "wasm-bindgen",
++]
++
+ [[package]]
+ name = "core-foundation"
+ version = "0.9.1"
+@@ -341,6 +368,16 @@ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+ 
++[[package]]
++name = "form_urlencoded"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
++dependencies = [
++ "matches",
++ "percent-encoding",
++]
++
+ [[package]]
+ name = "fuchsia-cprng"
+ version = "0.1.1"
+@@ -363,53 +400,59 @@ version = "0.3.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+ 
++[[package]]
++name = "funty"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8"
++
+ [[package]]
+ name = "futures-channel"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151"
++checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
+ dependencies = [
+  "futures-core",
+ ]
+ 
+ [[package]]
+ name = "futures-core"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46"
++checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
+ 
+ [[package]]
+ name = "futures-io"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b"
++checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
+ 
+ [[package]]
+ name = "futures-sink"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11"
++checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
+ 
+ [[package]]
+ name = "futures-task"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c"
++checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
+ dependencies = [
+  "once_cell",
+ ]
+ 
+ [[package]]
+ name = "futures-util"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34"
++checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
+ dependencies = [
+  "futures-core",
+  "futures-io",
+  "futures-task",
+  "memchr",
+- "pin-project 1.0.1",
++ "pin-project 1.0.2",
+  "pin-utils",
+  "slab",
+ ]
+@@ -543,7 +586,7 @@ dependencies = [
+  "httparse",
+  "httpdate",
+  "itoa",
+- "pin-project 1.0.1",
++ "pin-project 1.0.2",
+  "socket2",
+  "tokio",
+  "tower-service",
+@@ -678,6 +721,19 @@ version = "1.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+ 
++[[package]]
++name = "lexical-core"
++version = "0.7.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
++dependencies = [
++ "arrayvec",
++ "bitflags",
++ "cfg-if 0.1.10",
++ "ryu",
++ "static_assertions",
++]
++
+ [[package]]
+ name = "libc"
+ version = "0.2.80"
+@@ -790,14 +846,14 @@ dependencies = [
+  "rand 0.7.3",
+  "regex",
+  "serde_json",
+- "serde_urlencoded",
++ "serde_urlencoded 0.6.1",
+ ]
+ 
+ [[package]]
+ name = "native-tls"
+-version = "0.2.5"
++version = "0.2.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1a1cda389c26d6b88f3d2dc38aa1b750fe87d298cc5d795ec9e975f402f00372"
++checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f"
+ dependencies = [
+  "lazy_static",
+  "libc",
+@@ -859,6 +915,18 @@ dependencies = [
+  "version_check",
+ ]
+ 
++[[package]]
++name = "nom"
++version = "6.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
++dependencies = [
++ "bitvec",
++ "lexical-core",
++ "memchr",
++ "version_check",
++]
++
+ [[package]]
+ name = "num-traits"
+ version = "0.2.14"
+@@ -880,9 +948,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "once_cell"
+-version = "1.4.1"
++version = "1.5.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
++checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+ 
+ [[package]]
+ name = "opaque-debug"
+@@ -954,9 +1022,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "paste"
+-version = "1.0.2"
++version = "1.0.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ba7ae1a2180ed02ddfdb5ab70c70d596a26dd642e097bb6fe78b1bde8588ed97"
++checksum = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9"
+ 
+ [[package]]
+ name = "paste-impl"
+@@ -984,11 +1052,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "pin-project"
+-version = "1.0.1"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841"
++checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
+ dependencies = [
+- "pin-project-internal 1.0.1",
++ "pin-project-internal 1.0.2",
+ ]
+ 
+ [[package]]
+@@ -1004,9 +1072,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "pin-project-internal"
+-version = "1.0.1"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86"
++checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -1019,6 +1087,12 @@ version = "0.1.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
+ 
++[[package]]
++name = "pin-project-lite"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
++
+ [[package]]
+ name = "pin-utils"
+ version = "0.1.0"
+@@ -1114,6 +1188,12 @@ dependencies = [
+  "proc-macro2",
+ ]
+ 
++[[package]]
++name = "radium"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
++
+ [[package]]
+ name = "rand"
+ version = "0.4.6"
+@@ -1227,9 +1307,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "reqwest"
+-version = "0.10.8"
++version = "0.10.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e"
++checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce"
+ dependencies = [
+  "base64",
+  "bytes",
+@@ -1248,14 +1328,15 @@ dependencies = [
+  "mime_guess",
+  "native-tls",
+  "percent-encoding",
+- "pin-project-lite",
++ "pin-project-lite 0.2.0",
+  "serde",
+- "serde_urlencoded",
++ "serde_urlencoded 0.7.0",
+  "tokio",
+  "tokio-tls",
+  "url",
+  "wasm-bindgen",
+  "wasm-bindgen-futures",
++ "wasm-bindgen-test",
+  "web-sys",
+  "winreg",
+ ]
+@@ -1299,6 +1380,12 @@ dependencies = [
+  "winapi 0.3.9",
+ ]
+ 
++[[package]]
++name = "scoped-tls"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
++
+ [[package]]
+ name = "security-framework"
+ version = "2.0.0"
+@@ -1381,6 +1468,18 @@ dependencies = [
+  "url",
+ ]
+ 
++[[package]]
++name = "serde_urlencoded"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
++dependencies = [
++ "form_urlencoded",
++ "itoa",
++ "ryu",
++ "serde",
++]
++
+ [[package]]
+ name = "sha2"
+ version = "0.9.2"
+@@ -1402,16 +1501,22 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+ 
+ [[package]]
+ name = "socket2"
+-version = "0.3.15"
++version = "0.3.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44"
++checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
+ dependencies = [
+- "cfg-if 0.1.10",
++ "cfg-if 1.0.0",
+  "libc",
+  "redox_syscall",
+  "winapi 0.3.9",
+ ]
+ 
++[[package]]
++name = "static_assertions"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
++
+ [[package]]
+ name = "strsim"
+ version = "0.8.0"
+@@ -1420,9 +1525,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+ 
+ [[package]]
+ name = "syn"
+-version = "1.0.48"
++version = "1.0.51"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
++checksum = "3b4f34193997d92804d359ed09953e25d5138df6bcc055a71bf68ee89fdf9223"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -1441,6 +1546,12 @@ dependencies = [
+  "unicode-xid",
+ ]
+ 
++[[package]]
++name = "tap"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
++
+ [[package]]
+ name = "tempdir"
+ version = "0.3.7"
+@@ -1467,9 +1578,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "termcolor"
+-version = "1.1.0"
++version = "1.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
++checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+ dependencies = [
+  "winapi-util",
+ ]
+@@ -1514,15 +1625,24 @@ dependencies = [
+ 
+ [[package]]
+ name = "tinyvec"
+-version = "0.3.4"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
++dependencies = [
++ "tinyvec_macros",
++]
++
++[[package]]
++name = "tinyvec_macros"
++version = "0.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117"
++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+ 
+ [[package]]
+ name = "tokio"
+-version = "0.2.22"
++version = "0.2.23"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
++checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff"
+ dependencies = [
+  "bytes",
+  "fnv",
+@@ -1532,7 +1652,7 @@ dependencies = [
+  "memchr",
+  "mio",
+  "num_cpus",
+- "pin-project-lite",
++ "pin-project-lite 0.1.11",
+  "slab",
+ ]
+ 
+@@ -1556,7 +1676,7 @@ dependencies = [
+  "futures-core",
+  "futures-sink",
+  "log",
+- "pin-project-lite",
++ "pin-project-lite 0.1.11",
+  "tokio",
+ ]
+ 
+@@ -1577,13 +1697,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+ 
+ [[package]]
+ name = "tracing"
+-version = "0.1.21"
++version = "0.1.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27"
++checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
+ dependencies = [
+- "cfg-if 0.1.10",
++ "cfg-if 1.0.0",
+  "log",
+- "pin-project-lite",
++ "pin-project-lite 0.2.0",
+  "tracing-core",
+ ]
+ 
+@@ -1638,18 +1758,18 @@ dependencies = [
+ 
+ [[package]]
+ name = "unicode-normalization"
+-version = "0.1.13"
++version = "0.1.16"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
++checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
+ dependencies = [
+  "tinyvec",
+ ]
+ 
+ [[package]]
+ name = "unicode-segmentation"
+-version = "1.6.0"
++version = "1.7.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
++checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
+ 
+ [[package]]
+ name = "unicode-width"
+@@ -1675,7 +1795,7 @@ dependencies = [
+  "ffi-support",
+  "lazy_static",
+  "log",
+- "paste 1.0.2",
++ "paste 1.0.3",
+ ]
+ 
+ [[package]]
+@@ -1706,10 +1826,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "url"
+-version = "2.1.1"
++version = "2.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
++checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
+ dependencies = [
++ "form_urlencoded",
+  "idna",
+  "matches",
+  "percent-encoding",
+@@ -1746,7 +1867,6 @@ checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+ [[package]]
+ name = "viaduct"
+ version = "0.1.0"
+-source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664f6428..."
+ dependencies = [
+  "ffi-support",
+  "log",
+@@ -1762,7 +1882,6 @@ dependencies = [
+ [[package]]
+ name = "viaduct-reqwest"
+ version = "0.1.0"
+-source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664f6428..."
+ dependencies = [
+  "ffi-support",
+  "lazy_static",
+@@ -1855,6 +1974,30 @@ version = "0.2.68"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
+ 
++[[package]]
++name = "wasm-bindgen-test"
++version = "0.3.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "34d1cdc8b98a557f24733d50a1199c4b0635e465eecba9c45b214544da197f64"
++dependencies = [
++ "console_error_panic_hook",
++ "js-sys",
++ "scoped-tls",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "wasm-bindgen-test-macro",
++]
++
++[[package]]
++name = "wasm-bindgen-test-macro"
++version = "0.3.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e8fb9c67be7439ee8ab1b7db502a49c05e51e2835b66796c705134d9b8e1a585"
++dependencies = [
++ "proc-macro2",
++ "quote",
++]
++
+ [[package]]
+ name = "web-sys"
+ version = "0.3.45"
+@@ -1871,7 +2014,7 @@ version = "0.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37"
+ dependencies = [
+- "nom",
++ "nom 5.1.2",
+ ]
+ 
+ [[package]]
+@@ -1935,3 +2078,9 @@ dependencies = [
+  "winapi 0.2.8",
+  "winapi-build",
+ ]
++
++[[package]]
++name = "wyz"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+-- 
+2.29.2
+
diff --git a/projects/nss/config b/projects/nss/config
index fb3550c..4fc6c90 100644
--- a/projects/nss/config
+++ b/projects/nss/config
@@ -2,8 +2,8 @@
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 # The required versions for application-services can be found at the respective
 # commit in libs/build-all.sh
-version: 3.56
-nspr_version: 4.28
+version: 3.57
+nspr_version: 4.29
 var:
   container:
     use_container: 1
@@ -19,7 +19,7 @@ input_files:
     project: ninja
   - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_%5B% c("version") | replace("\.", "_") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz'
     name: nss
-    sha256sum: 989b548aa5589d15e31a306218d3c48dbc472b6043b78c6846b5acc54ebfed67
+    sha256sum: d457f915846219b20e8ad1dba80b9273e3f27aca3cebc4a0775ae8641e899ad1
   - filename: configure.patch
   - filename: config.patch
   - filename: bug_13028.patch

    