[tor-commits] [tor-browser-build/master] Bug 40241: Update components for mozilla87-based Fenix (application-services part)
sysrqb at torproject.org
sysrqb at torproject.org
Tue Mar 16 21:50:16 UTC 2021
commit 50910998efdc74a10a7ac9beb80206cc4c68f387
Author: Nicolas Vigier <boklm at torproject.org>
Date: Tue Mar 9 19:35:52 2021 +0100
Bug 40241: Update components for mozilla87-based Fenix (application-services part)
---
projects/application-services/config | 22 +-
.../gradle-dependencies-list.txt | 125 ++---
.../application-services/update-cargo-lock.patch | 146 +++--
.../application-services/viaduct-workaround.patch | 16 +-
.../application-services/viaduct-workaround2.patch | 588 +--------------------
projects/uniffi-rs/config | 8 +-
6 files changed, 164 insertions(+), 741 deletions(-)
diff --git a/projects/application-services/config b/projects/application-services/config
index 11fc5d7..951d5b0 100644
--- a/projects/application-services/config
+++ b/projects/application-services/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-version: 67.2.0
-git_hash: 4cc798c8cd8a1e38ce88e0bb22a05692be63b164
+version: 71.0.0
+git_hash: 1ee6b32f3ee569036fdf1015cf7ffc01ded2860f
git_url: https://github.com/mozilla/application-services
git_submodule: 1
@@ -9,13 +9,11 @@ var:
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
- gradle_dependencies_version: 4
+ gradle_dependencies_version: 5
# This should be updated when the list of rust dependencies is changed.
- rust_vendor_version: 3
+ rust_vendor_version: 4
# Switch to make it easier to grab all dependencies during a dry-run.
fetch_gradle_dependencies: 0
- # application-services is still stuck on an older glean_parser version.
- glean_parser: 1.28.6
gradle_version: 6.5
input_files:
@@ -68,12 +66,14 @@ input_files:
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2
- sha256sum: bdbb421fdcc9b66aebe8f41b33e254cab722355c59c0f43f10a8322d7d6da6a4
+ sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- # `cargo vendor vendor` in the `application-services` directory has vendored
- # the sources.
- - URL: https://people.torproject.org/~gk/mirrors/sources/application-services-vendor-[% c('var/rust_vendor_version') %].tar.bz2
- sha256sum: f2d08275920c6e163617d5f102abc0665fd0f74550a400b1970b5b25bcabd3ef
+ # `cargo vendor vendor -s components/external/nimbus-sdk/nimbus/Cargo.toml`
+ # in the `application-services` directory has vendored the sources,
+ # after applying update-cargo-lock.patch, viaduct-workaround.patch and
+ # viaduct-workaround2.patch
+ - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-vendor-[% c('var/rust_vendor_version') %].tar.bz2
+ sha256sum: 500d0fa471c8ad2037c4bbe648e716e77da1ff1fc5678542b144cd257a34abbf
- filename: no-git.patch
- filename: mavenLocal.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]'
diff --git a/projects/application-services/gradle-dependencies-list.txt b/projects/application-services/gradle-dependencies-list.txt
index dee28f3..bd001d9 100644
--- a/projects/application-services/gradle-dependencies-list.txt
+++ b/projects/application-services/gradle-dependencies-list.txt
@@ -5,21 +5,21 @@ d1bc9842455c2e534415d88c44df4d52413b478db9093a1ba36324f705f44c3d | https://dl.go
27a4be7462629c312da0b831a0978d2076fc34074145fb61dd4e86d7c8469b82 | https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/activity-1.0.0.pom
d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692 | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.jar
2e9372ba7780ef44952adbf86b66e1f08682c1e5277c926185f6564a13799efe | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.pom
-19944d32b46551a17c347e21894b95837fbd7baaafc9e2082794344f222f7361 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.aar
-046011e16cb01b6f14842565661551110ef1b6427483f5d9068493f4c49690f2 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.pom
-8d7299bca44cb3bdf17f5595766acbf459fc81fee223e8686cc6acd3a42ab5c0 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.aar
-340d617121f8ef8e02a6680c8f357aa3e542276d0c8a1cdcb6fd98984b2cb7b9 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.pom
-fe1237bf029d063e7f29fe39aeaf73ef74c8b0a3658486fc29d3c54326653889 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0.jar
+c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.2.0/appcompat-resources-1.2.0.aar
+149dd8cec3664bef8ffde86c396ba1e2ab156ea68793d29800d008bacbc9c0f8 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.2.0/appcompat-resources-1.2.0.pom
+3d2131a55a61a777322e2126e0018011efa6339e53b44153eb651b16020cca70 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/appcompat-1.2.0.aar
+8eb3cbe823b609853b481646e3d2c1aa39dbde53dd269712fd844ffdef2ebb42 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/appcompat-1.2.0.pom
83bbb3960eaabc600ac366c94cb59414e441532a1d6aa9388b0b8bfface5cf01 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0.pom
+fe1237bf029d063e7f29fe39aeaf73ef74c8b0a3658486fc29d3c54326653889 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0.jar
dd77615bd3dd275afb11b62df25bae46b10b4a117cd37943af45bdcbf8755852 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0.aar
c0c4ed0160cd2ca18390015de8b392b697c173327c6b2c0947d4e62f6958c05d | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0.pom
a7913a5275ad68e555d2612ebe8c14c367b153e14ca48a1872a64899020e54ef | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.0/collection-1.0.0.pom
-632a0e5407461de774409352940e292a291037724207a787820c77daf7d33b72 | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0/collection-1.1.0.jar
67e9066ca4acfdc6e3cc508293c31ba0398057ff118e4f70b1e1813c9a3456d1 | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0/collection-1.1.0.pom
-dcb74d510d552b35eff73b0dd27b829649535f3902e5b5a1f26040383c10a940 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.2.0/core-ktx-1.2.0.aar
-29eaddba4e6a35e68a128e594ebae3b72ef7e767f1b273ef93dc2ed019ff97f6 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.2.0/core-ktx-1.2.0.pom
-524b8b88ceb6a74a7e44e6b567a135660f211799904cb218bfee5be1166820b2 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0.aar
-3d1f4e37b77dd92353879a040ab4ce2f706798bcbdf066147491c3642b3f79a6 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0.pom
+632a0e5407461de774409352940e292a291037724207a787820c77daf7d33b72 | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0/collection-1.1.0.jar
+78309600ba6fe4473c045976906649b25b3c9a49b14642f8a8a7dcd9e1afe7c8 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-ktx-1.3.2.aar
+ba6a806bc1a6faf0cbae08397b3f781feca293ff2b5f3aa600b3d2db142e5ab4 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-ktx-1.3.2.pom
+94de196cd67950cff6ef3e1ac59015f8eaaf61840bdc238f2cf54ddef8dd0be9 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.2/core-1.3.2.aar
+afb5ea494dd083ed404cd51f580d218e37362f8ae326e893bee521290ed34920 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.2/core-1.3.2.pom
a81c8fe78815fa47df5b749deb52727ad11f9397da58b16017f4eb2c11e28564 | https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0.aar
62d95c89850af21030b19f14d5f7ecd6d8bcc9a3014c59002ec99624caac8100 | https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0.pom
20e5b8f6526a34595a604f56718da81167c0b40a7a94a57daa355663f2594df2 | https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0/customview-1.0.0.aar
@@ -53,16 +53,16 @@ ba55fb7ac1b2828d5327cda8acf7085d990b2b4c43ef336caa67686249b8523d | https://dl.go
29aa72e339c3e227e74c973a4c85c7b79c926f0d37b61ed94f4d99a137c9a4b4 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.1.0/lifecycle-viewmodel-2.1.0.pom
11f735cb3b55c458d470bed9e25254375b518b4b1bad6926783a7026db0f5025 | https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-1.0.0.aar
c978d550808b47434aa49a63164110a50b55b0bcc6160a93a2e37d5110df8c5e | https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-1.0.0.pom
-388d33ff503d8c3d010a5dd7ecfe0e44bb19afcc28fd1e6336755d00ef7ad3c6 | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.1.0/room-common-2.1.0.jar
-831d4e3c7e5481e73f37c1cb2e08f24e27306976d3c83916f89b00b28857998b | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.1.0/room-common-2.1.0.pom
-175efd0a722810272098282819ebd52d6d0fa0aa5f9bfb25ac54268e1daa041e | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.1.0/room-runtime-2.1.0.aar
-ce8566bc008cc900268c07a4acb8840e4b54cdc404f73081a0986906f205fd7c | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.1.0/room-runtime-2.1.0.pom
+fbb37fcf02b35ba7a909fffb52ce4ccb36874f03c1f927f6338b68ef9f1d6b7a | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.2.5/room-common-2.2.5.pom
+2b130dd4a1d3d91b6701ed33096d389f01c4fc1197a7acd6b91724ddc5acfc06 | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.2.5/room-common-2.2.5.jar
+24a5549b796e43e337513d2908adac67f45350d9a90bca7e2e6120692140bb14 | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.2.5/room-runtime-2.2.5.aar
+5d7e35be6728b331c82eed418fee9133d2481ba2c5a12500c182b27545bc4bbb | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.2.5/room-runtime-2.2.5.pom
2510a5619c37579c9ce1a04574faaf323cd0ffe2fc4e20fa8f8f01e5bb402e83 | https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0/savedstate-1.0.0.aar
844d7d22fcea798c78bf5559229daf88ec9cad8136f5eea0a29aa76b3f8fde7c | https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0/savedstate-1.0.0.pom
-870e3bce33ad21ef034332b083b2925105becfd73d262e3a1270901229e45076 | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite-framework/2.0.1/sqlite-framework-2.0.1.aar
-c4dedda03bd663e0ff34c8eaaf608ae86be05929a2f7cf2ce1e17160201bca3e | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite-framework/2.0.1/sqlite-framework-2.0.1.pom
-cdfceb8f6ec64aac217dc5a499a5edb6d610f9d6a575fba7bea06b2bfaf3ea7f | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite/2.0.1/sqlite-2.0.1.aar
-bc69fd52e7eb5563a766319b7a84efda32f15473c4cec0e12b99502d91489cb1 | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite/2.0.1/sqlite-2.0.1.pom
+8673737fdb2efbad91aeaeed1927ebb29212d36a867d93b9639c8069019f8a1e | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite-framework/2.1.0/sqlite-framework-2.1.0.aar
+ecd1fa9421e442cec59b4e642a51f8398e8d16bb5fcc92ac6fbb085ecc73685c | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite-framework/2.1.0/sqlite-framework-2.1.0.pom
+8341ff092d6060d62a07227f29237155fff36fb16f96c95fbd9a884e375db912 | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite/2.1.0/sqlite-2.1.0.aar
+a9fe19b196fb25df41719ea6f1bc53f380eaed4bd5e651ec6fd75bcbeeb2a9ee | https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite/2.1.0/sqlite-2.1.0.pom
76da2c502371d9c38054df5e2b248d00da87809ed058f3363eae87ce5e2403f8 | https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.1.0/vectordrawable-animated-1.1.0.aar
276a20116b705fb75b9003ee9496c56f6fd3b32375fb232472811eba60a040bd | https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.1.0/vectordrawable-animated-1.1.0.pom
46fd633ac01b49b7fcabc263bf098c5a8b9e9a69774d234edcca04fb02df8e26 | https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.1.0/vectordrawable-1.1.0.aar
@@ -71,10 +71,10 @@ bc69fd52e7eb5563a766319b7a84efda32f15473c4cec0e12b99502d91489cb1 | https://dl.go
c729c7be0cc06323bda829d460666e79dbd43b799a21089a44bd3b293dc253b5 | https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.0/versionedparcelable-1.1.0.pom
147af4e14a1984010d8f155e5e19d781f03c1d70dfed02a8e0d18428b8fc8682 | https://dl.google.com/dl/android/maven2/androidx/viewpager/viewpager/1.0.0/viewpager-1.0.0.aar
1f72f836339d03c6eb013f65075e76ca87075a577578eb4f95f74a3a5d253128 | https://dl.google.com/dl/android/maven2/androidx/viewpager/viewpager/1.0.0/viewpager-1.0.0.pom
-e93836f35d35e47ba501add90fa6559964fa7a70975bf4ffc4a04836189611e9 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime-ktx/2.2.0/work-runtime-ktx-2.2.0.aar
-7cbb32f2fe880d407d4c53268bcd554c11dc9316a1d6cd556a08fe45a4631f22 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime-ktx/2.2.0/work-runtime-ktx-2.2.0.pom
-de617480ce64e4e9055e2d0295c87ee20929b06c4f2a5efdaded27dcca8520e4 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.2.0/work-runtime-2.2.0.aar
-960a24728eaedfc4ff7a2f366b9360e02a1d88f9eb0a9c7142ed94ed462797b0 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.2.0/work-runtime-2.2.0.pom
+290d2e9c1a22388b3f0c3dbc204a6176f8c49174126de884820befa83899f129 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime-ktx/2.4.0/work-runtime-ktx-2.4.0.aar
+3eb66e171b40c9cd2a9b9d9cd61a62d90e4a515491619a8d0a95e98866624b97 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime-ktx/2.4.0/work-runtime-ktx-2.4.0.pom
+7801441cb973fb007ef311d3db35c3b3c9d011cef890357e7ca33890833354e5 | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.4.0/work-runtime-2.4.0.aar
+0ed72c9c5a7be5b0004f226a42fa519093d49985c3eaa1a15b1563f94e9eddda | https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.4.0/work-runtime-2.4.0.pom
d2ff1905ff7e7cbed7ecce20408a76b69a52d52fdf655b696ba49007c61a0e11 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.0.1/baseLibrary-4.0.1.jar
ec6fe50839c05802cc262ec5611e160d17dff69c5a634bb322b27341f9176e9d | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.0.1/baseLibrary-4.0.1.pom
9a29bf34909bca58b85cacda7d1f09cebe8079e56722911395f1ad6a0b377b94 | https://dl.google.com/dl/android/maven2/com/android/signflinger/4.0.1/signflinger-4.0.1.jar
@@ -179,9 +179,9 @@ f8698ab46ca996ce889c1afc8ca4f25eb8ac6b034dc898d4583742360016cc04 | https://jcent
317e88291262e0cf2805e956c18850f1d4565c85c2e1112f5d9d08ab1732e696 | https://jcenter.bintray.com/com/google/guava/guava-parent/27.0.1-jre/guava-parent-27.0.1-jre.pom
f31a5846bd9e14a4c374da1b9b146a5715ecdca925e071e1d2bf4da2daaded90 | https://jcenter.bintray.com/com/google/guava/guava-parent/28.1-jre/guava-parent-28.1-jre.pom
6a8dd041f23a6bb14a86e440fccb993537b62271357a0dac0a3cb0ff39158f36 | https://jcenter.bintray.com/com/google/guava/guava/27.0.1-jre/guava-27.0.1-jre.pom
-e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069 | https://jcenter.bintray.com/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.jar
30beb8b8527bd07c6e747e77f1a92122c2f29d57ce347461a4a55eb26e382da4 | https://jcenter.bintray.com/com/google/guava/guava/28.1-jre/guava-28.1-jre.jar
74af0e8dd935894ce9bcb8e2842dd0001581b84cb6a7751c3ef9314011399ba4 | https://jcenter.bintray.com/com/google/guava/guava/28.1-jre/guava-28.1-jre.pom
+e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069 | https://jcenter.bintray.com/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.jar
53873caf26bc1ed8a567ea6c939ab2aaa3f47a5e32d5cade95ddf5080d23238a | https://jcenter.bintray.com/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99 | https://jcenter.bintray.com/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
18d4b1db26153d4e55079ce1f76bb1fe05cdb862ef9954a88cbcc4ff38b8679b | https://jcenter.bintray.com/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
@@ -192,8 +192,8 @@ c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://jcent
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-bom-3.10.0.pom
74ee43b09e711b13d568811e12f33bd16e6087b15f1aeded22b0dfe89ae76856 | https://jcenter.bintray.com/com/google/protobuf/protobuf-bom/3.11.4/protobuf-bom-3.11.4.pom
-433ae1f99ae3c330f1b54971b39c2672d49948e6acf661d9bb4f1e9a7743de8e | https://jcenter.bintray.com/com/google/protobuf/protobuf-gradle-plugin/0.8.12/protobuf-gradle-plugin-0.8.12.jar
-d9fdbf20ea7e2b965a8870d17ebbd2900a64cef3c9a7c2bf0bd4d4857462680a | https://jcenter.bintray.com/com/google/protobuf/protobuf-gradle-plugin/0.8.12/protobuf-gradle-plugin-0.8.12.pom
+dadf381e55dd54a4e4d2b4070221dc596caff215c061f2c9f0c212966fea134e | https://jcenter.bintray.com/com/google/protobuf/protobuf-gradle-plugin/0.8.14/protobuf-gradle-plugin-0.8.14.jar
+13811bcb4057c7785afd5451362f37d36c1d7bb7842135255b600e7b6d55315e | https://jcenter.bintray.com/com/google/protobuf/protobuf-gradle-plugin/0.8.14/protobuf-gradle-plugin-0.8.14.pom
619b0b0dc344cb141e493cbedc5687c8fb7c985e609a1b035e621bfab2f89021 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java-util/3.10.0/protobuf-java-util-3.10.0.jar
146660182d07798ced06fa8e8ae3b9faa90aa48cf3c6adfc67db9371188ba502 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java-util/3.10.0/protobuf-java-util-3.10.0.pom
161d7d61a8cb3970891c299578702fd079646e032329d6c2cabf998d191437c9 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.10.0/protobuf-java-3.10.0.jar
@@ -219,7 +219,7 @@ f879b6e945854c6900b0dbee1c8384d7ab3de7e157fd7ac84937405c416d2a5e | https://jcent
6d704e450a816a45bce806ba22c22fe83d8e8dcf7a71517603de630a1726809f | https://jcenter.bintray.com/com/sun/istack/istack-commons-runtime/3.0.7/istack-commons-runtime-3.0.7.pom
6f83d3c85fdca9ef24010cb2f652aab1a508bff6331c087b60d0301782b78c6f | https://jcenter.bintray.com/com/sun/istack/istack-commons/3.0.7/istack-commons-3.0.7.pom
c2204f54b43593808c9af6502865ee71679823156dabdef341e71d35662c7aa0 | https://jcenter.bintray.com/com/sun/xml/bind/jaxb-bom-ext/2.3.1/jaxb-bom-ext-2.3.1.pom
-8b7d9154594e5b0e2bf1d9de6d2ac8dc7ae84179dfeb571299ce343292e9ed12 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.3.1/jaxb-parent-2.3.1.pom
+f699ef37ec7966e284742dfca83075221179041a9a49aef7991280192604462d | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.3.1/jaxb-parent-2.3.1.pom
b56383eb4d43498b145d379e2a93d5fcdcd8ff9291f89b58b82cb91658dbf14c | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.3.1/jaxb-runtime-parent-2.3.1.pom
7a8473e935504841c606686d84e9c017a739ac2c144fde687aa003a7dd44de7f | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-txw-parent/2.3.1/jaxb-txw-parent-2.3.1.pom
785861db11ca1bd0d1956682b974ad73eb19cd3e01a4b3fa82d62eca97210aec | https://jcenter.bintray.com/com/sun/xml/fastinfoset/FastInfoset/1.2.15/FastInfoset-1.2.15.jar
@@ -254,8 +254,8 @@ cd1beaa4560dc4dfdb826b9d809e464db22526dfb54264bae78a6ff7efb08e1f | https://jcent
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
+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
26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar
7af7e2d8b24b4798f04c2b7da24c9fbd1b7557b4e017c2054481565916079092 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.pom
f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar
@@ -263,7 +263,7 @@ f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://jcent
75bc89695fa66e75374ecda439b802406f0ab1d826dd386eed0a23b1f0a9d264 | https://jcenter.bintray.com/net/sf/proguard/proguard-base/6.0.3/proguard-base-6.0.3.jar
2a823d79f2675582a988d539466d1b175e939782efbe0f6e61f06cb165ed4907 | https://jcenter.bintray.com/net/sf/proguard/proguard-base/6.0.3/proguard-base-6.0.3.pom
cc12b1168e521491dd0e687cfebec11a4af874b22af70e10cf2a05b47ca00c8f | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/6.0.3/proguard-gradle-6.0.3.jar
-dab8d3d71fecb6edb4cc62fcfdd969744975a773b18e09581c63e9a9929dbb3f | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/6.0.3/proguard-gradle-6.0.3.pom
+5a5c7317d68ce80d1d40c9d8bd4e38814d42d1b16c265146e333634833a35a57 | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/6.0.3/proguard-gradle-6.0.3.pom
d87266bfd2312c3b036c4ac709310afa35c448ceb18027c3b87a33d03c6de0a0 | https://jcenter.bintray.com/net/sf/proguard/proguard-parent/6.0.3/proguard-parent-6.0.3.pom
401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://jcenter.bintray.com/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5.3.pom
a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar
@@ -285,7 +285,7 @@ c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7 | https://jcent
7efc1241e73e7fbb268bfd33242d11ebd3ca07061d7d85f2962dc32a0f0b8855 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6.pom
b042b41f2391edb00d35f7f4e509aed2123648c1d246ce58d0f7b905c9fe1f73 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client/4.5.6/httpcomponents-client-4.5.6.pom
61e9427d4be326c307a7f16ba828d1cb3b14713c9b04fc8ba992a58f376c3136 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-core/4.4.10/httpcomponents-core-4.4.10.pom
-3b9ff4e8f7788fbbb3e0011b8a9098e8acf6815709c913aa3d027dfa3a799b3f | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-parent/10/httpcomponents-parent-10.pom
+caaf967d94afb21753f36082c6086206bd1f48825ff596932cceba72b65d39fa | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-parent/10/httpcomponents-parent-10.pom
78ba1096561957db1b55200a159b648876430342d15d461277e62360da19f6fd | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar
c5c12066df2b3b88a89a2c8602b81ea9a61627e976e5129eea1899ebbaea392b | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.pom
0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.jar
@@ -315,8 +315,9 @@ affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601 | https://jcent
310a6aa2d90534c32b8f46f1fc98cd0edae95dcdfca23e2847e5efa9ae0c019a | https://jcenter.bintray.com/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.pom
303c422700f79d5d13d528b978c6abd9cd136d78d9f7f6f2556e85a81892f9f1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.3.71/kotlin-android-extensions-runtime-1.3.71.jar
648025c01c56b234a7458cb6048ae8fcfa941f9ea8ebf059090733237b9df9b6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.3.71/kotlin-android-extensions-runtime-1.3.71.pom
-4c801ff4f5151778762ce2d57080f0cb10a4a94cb76ad24593cca35bff36da48 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.4.10/kotlin-android-extensions-runtime-1.4.10.jar
f120750af0c9e0c6024c3c76469fd4638ef898fc5bc2d4c49f2fe17568f47b9e | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.4.10/kotlin-android-extensions-runtime-1.4.10.pom
+baec7911227eec34845439c38876a2dd18eda7c15ac523655411e20e8f053138 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.4.21/kotlin-android-extensions-runtime-1.4.21.jar
+ec86adcccbb839d099b8649c5277a6fbe41d2c04b61b4b296584e7af52ae4ad1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.4.21/kotlin-android-extensions-runtime-1.4.21.pom
ffd156464b8129365423e27b9e53ecbfd32d56b91af977dab2222ca2d271a65f | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/1.3.71/kotlin-android-extensions-1.3.71.jar
eb68121782d951a1db37e9a00c8fd9252eafa91388e90987239d75224490d6bb | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/1.3.71/kotlin-android-extensions-1.3.71.pom
2e508e8d23e9ab171f53ae3f71e8218e7242cd138af040d62651ecd9d3417bcd | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.3.71/kotlin-annotation-processing-gradle-1.3.71.jar
@@ -357,18 +358,18 @@ e67e0eaf0d532e4d312947ac4cf02135ea44aee646b32273707dc0c4646a3662 | https://jcent
93f5cb50148dee7da746ed487e6278ee8d94da9a99b670f9f5248456c2f66341 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.71/kotlin-stdlib-common-1.3.71.pom
5e7d1552863e480c1628b1cc39ce230ef829f5b7230106215a05acda5172203a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72/kotlin-stdlib-common-1.3.72.jar
24781edf5b0934804930dcafc8911b9e710d146239a82699889132e7b37be9dc | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72/kotlin-stdlib-common-1.3.72.pom
-4681f2d436a68c7523595d84ed5758e1382f9da0f67c91e6a848690d711274fe | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.10/kotlin-stdlib-common-1.4.10.jar
-63480e72a7d4de742b49a6ff90e45f544ca37f3fe11af8b4839f9cd747515d00 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.10/kotlin-stdlib-common-1.4.10.pom
+812cf197d9c4c67e1f47f95e2d72a9b600f0d1124560617bfe9850773eccbcff | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.21/kotlin-stdlib-common-1.4.21.jar
+cd840ab880f838af0eb76e25930392c6bf0aa2a2adb5e2d4b0bb9f717a295ebd | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.21/kotlin-stdlib-common-1.4.21.pom
b046a5ef54c7006db852e48e547aaff525a9e7a0a5909ffe5fe2c966c1a3a72e | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.71/kotlin-stdlib-jdk7-1.3.71.jar
7163f88887d050f76f86ad2304f84a9d79c39a96178bf02e4524bdeacc5bb149 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.71/kotlin-stdlib-jdk7-1.3.71.pom
40566c0c08d414b9413ba556ff7f8a0b04b98b9f0f424d122dd2088510efccc4 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.jar
9d5a13d9abc33445e1366d258af0a77e42f01945acef7c0917b9d539854e2fce | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.pom
-f9566380c08722c780ce33ceee23e98ddf765ca98fabd3e2fabae7975c8d232b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.10/kotlin-stdlib-jdk7-1.4.10.jar
-78f2fe1d48e99c64958930ccdc43fce5939460ecdfc65f302823a021d63c520d | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.10/kotlin-stdlib-jdk7-1.4.10.pom
+50de5f7dad6235064ac6c0ff577f095a91b3306c2547d8bc372291587495024a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.21/kotlin-stdlib-jdk7-1.4.21.jar
+3b54ad496e7a7f7ad8ad6e846e5c061911242ef474e030ff602beef7565943d6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.21/kotlin-stdlib-jdk7-1.4.21.pom
133da70cfc07b56094282eac5c59bccd59f167ee2ead22e5282876d8bc10bf95 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.jar
a6d50f0321bdb52838c99136930c8dcc78c3074a592d526862ec01be91fa622b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.pom
-39b7a9442d7a3865e0f4a732c56c1d5da0e11ffb3bb82a461d32deb0c0ca7673 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/kotlin-stdlib-jdk8-1.4.10.jar
-c2f4d70082dbbfcea68fdfa74289cef32df9e4b5ddf359f006036dff1c5b06d6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/kotlin-stdlib-jdk8-1.4.10.pom
+8ec3db1516948b2d3524e3afbe75cb5ac59e02d98cb6ef586ef57ba63ca8d11f | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.21/kotlin-stdlib-jdk8-1.4.21.jar
+5bd2b4922398bd94d1d94e2dca0401089092b453e724a9e746daacacead735b7 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.21/kotlin-stdlib-jdk8-1.4.21.pom
ab355888358a25478591aafe2cab2dd0b2e44af323a0acc3fd03581b24712430 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.41/kotlin-stdlib-jre7-1.2.41.jar
a5e970ffd412599c8159068e670356509193e3238dddf20273ed6a8fb7b09de2 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.41/kotlin-stdlib-jre7-1.2.41.pom
1b8355ce90079352de296f3f0b175473e7cbbde34d7338b92e4a80c633baab96 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.41/kotlin-stdlib-jre8-1.2.41.jar
@@ -377,19 +378,19 @@ f6837401cbd13a8a31f126a9e22430ab9861602d91a4c310a47805453690f76d | https://jcent
ff03e9989faa2d40fa4a9098aaad71e247f27ea4d24b0754da642eb0924bd8c5 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.71/kotlin-stdlib-1.3.71.pom
3856a7349ebacd6d1be6802b2fed9c4dc2c5a564ea92b6b945ac988243d4b16b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.jar
4f0d574a969ea93c45628a163e1ed3ffabb4584278d72c647ec124f8c8109481 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.pom
-01ecb09782c042b931c1839acf21a188340b295d05400afd6e3415d4475b8daa | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.10/kotlin-stdlib-1.4.10.jar
-a4b9cfbb4bbda523af1e24d52c775fb9c0f7cb568e48b065d45aeb56e63c2762 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.10/kotlin-stdlib-1.4.10.pom
+f78c5d8c09db985912ab83a1de3c3b53ddf208d7b151f06a72358ea3e137d01b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.21/kotlin-stdlib-1.4.21.jar
+076c5a29b7a79ba2050b52e12307783d6b18d7701ce5245a3f48d005c51ae2be | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.21/kotlin-stdlib-1.4.21.pom
71cdc094af3463af5773122941819ce11951e8550c499938bb79a04b3d5ee842 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-io/1.3.71/kotlin-util-io-1.3.71.jar
ab2b2bd3304dcd40562a2930c53002b1e2d80fb21d0d9cc7d6448a83b9ae6b0b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-io/1.3.71/kotlin-util-io-1.3.71.pom
51f7f966cd071ff412df49849bdd0a6a651f800c8816defaa29fcd106eedcdac | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-klib/1.3.71/kotlin-util-klib-1.3.71.jar
fae43f08052e63bf49cbcda0ade70c05381c4093521e20f31dd564947c1b7105 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-util-klib/1.3.71/kotlin-util-klib-1.3.71.pom
-3b6529d1872a2c689b2231cf3e75476badd5c5a430206c2c1967e4deb171e50d | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.3.9/kotlinx-coroutines-android-1.3.9.jar
-504b6599eb3a3b4d8b4db267d1628e79f3e58f17fc4f6d44c24cda530b0edf39 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.3.9/kotlinx-coroutines-android-1.3.9.pom
-64c6d2b53e52eb65e26c6b828d848d8ceab30473c3511bbd1c116cf9799bc127 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.3.9/kotlinx-coroutines-core-jvm-1.3.9.pom
+5cfd02a5e7dd9be15835522035d32eca33be0e63085d27f7c918fa495e34f81f | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.4.2/kotlinx-coroutines-android-1.4.2.pom
+58b3ce8be4521230361fe6679b5930e75730164be1c7b900ddca4218072fee85 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.4.2/kotlinx-coroutines-android-1.4.2.jar
+3286bd65e41eae735600c0e9a441cb4a0988d0d76647923b9c978c90b0cb7311 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.4.2/kotlinx-coroutines-core-jvm-1.4.2.pom
7177ed4629704537e0252537629886f5409526ecd041d8d8e308e20624b14394 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.2.1/kotlinx-coroutines-core-1.2.1.jar
6f7523ea8a56d7f12d11a004cfe5a4577bfba3ed6c84cc5ac48b72d54975552c | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.2.1/kotlinx-coroutines-core-1.2.1.pom
-6538f458473a42b6e2a92676f00d70d4fa0f6ae824d13c1e31c8051c196d2335 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.3.9/kotlinx-coroutines-core-1.3.9.jar
-51be6791ac5aed9718a58b297c8c9081c9b704dfd72a849c4754a40da55ee236 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.3.9/kotlinx-coroutines-core-1.3.9.pom
+99319ebdd562d9519dfd15f78fe79bc09c3a28875083eea4577d9584359a2f61 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.4.2/kotlinx-coroutines-core-1.4.2.pom
+4cd24a06b2a253110d8afd250e9eec6c6faafea6463d740824743d637e761f12 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.4.2/kotlinx-coroutines-core-1.4.2.jar
1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.jar
5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
518080049ba83181914419d11a25d9bc9833a2d729b6a6e7469fa52851356da8 | https://jcenter.bintray.com/org/json/json/20180813/json-20180813.jar
@@ -411,24 +412,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
-e00994073f2c041891e511707ce991a7671b335f8863099719eb749897c231b9 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/63.0.0/concept-base-63.0.0.aar
-f16249682aa48169d0508bd5310778241f856df91b57201a99ad78d0b4741f34 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/63.0.0/concept-base-63.0.0.pom
-be10c6c12568bfb4ce987756c6bfcf60ce01085a2dab185e0aef8092cd5c779c | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/63.0.0/concept-fetch-63.0.0.aar
-ea6cb3d94121d03fefd5329072c7b01d891b8bb25c2c303b28dfd6728eeaa72f | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/63.0.0/concept-fetch-63.0.0.pom
-377092988061736b0a6e8ddfd243fb9766598724abe0153767310ad2b0be86f5 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.0/service-glean-63.0.0.aar
-45ea21040eadcdce28620267916dc6fd7c252ec54bed1bbefb8f5b6b456e6a5c | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.0/service-glean-63.0.0.pom
-6215b79ff57a56a1ec3f1937ce9870614f96b5afc3e54837d48239b74a28c185 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/63.0.0/support-base-63.0.0.aar
-6a80782f831863c5c592cf2851cbec06f0661a868bca960512b0cc920711bddb | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/63.0.0/support-base-63.0.0.pom
-9eadd1526848b5669c6e00bfc4283eb63c2d2c1179db5c1329cca2a2e227003a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/support-ktx-63.0.0.aar
-ca3c96c281e314f07170bbfa766693ef0d2e4d865433a9622254088ee7e68363 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/support-ktx-63.0.0.pom
-93fd44998bfeeab9d7137cb34a50d510876ec8362e988b8a4ddf4e1629a69e71 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.0/support-utils-63.0.0.aar
-b3836516ae7c9f1ca38ce636e24e3d10b2b421d94e344f14033daa5f20df3168 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.0/support-utils-63.0.0.pom
-c844c630c520e7ca53db9282380242248fe5c11d9ab6b941ddded5bb51296721 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle/63.0.0/tooling-glean-gradle-63.0.0.jar
-a8cc4657e66af457b8f8ef675ff59b0a1dbfe71466fc93271b6867bc270a7712 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle/63.0.0/tooling-glean-gradle-63.0.0.pom
-5eb5d86577ecf64ba66df368c07dde772d1e82da63f25d73e63118d261ca7a7c | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/33.0.4/glean-gradle-plugin-33.0.4.jar
-d1a407ad60d86df547ca4521ed5355e609bbe09f22ef658c89cade0780468994 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/33.0.4/glean-gradle-plugin-33.0.4.pom
-a1925b30aed9675e339205797eebd0598885cc987fc61890e81f4a2c12dcf6b6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.0.4/glean-33.0.4.aar
-477ee8ea2f4bbcf2860553987f3e5fddaac7cfd6bcae7c1bef7a7b29cdc5d9d8 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.0.4/glean-33.0.4.pom
+e5801430997ccd358df0b4b48f101402b924a72de87cc5f12d80a32bb6d61865 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0/concept-base-71.0.0.aar
+5d08cc1bb3c2432ab3ecaaa6c06ca0603a9957ece9524643b9db4fb77a01f7b8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0/concept-base-71.0.0.pom
+bfbb680afd838af36e4609d1b7236dbef93f47e92b386bb7ca08efca910e2e59 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/71.0.0/concept-fetch-71.0.0.aar
+c65c694e7579c0531eb09f569c97121793c11895e66fe8b206d1e9941b5ea9c8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/71.0.0/concept-fetch-71.0.0.pom
+d5b2a0cf4022b8287b0e515909262c3969fde476d3df71fcc165b4b76de0fdf1 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/71.0.0/service-glean-71.0.0.aar
+b7e1a47fc0a4819023b0356c11b929e22caf101c62318981882a04ecea22d859 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/71.0.0/service-glean-71.0.0.pom
+fe504319fc0bc08ca00d8b951bf5d5f6fa4a5fc467e28b609cd34e8c59c20ad9 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/71.0.0/support-base-71.0.0.aar
+d1741144ed2ea215a84f5d94d779cafcfaf778cce8cc7224437a2884cb1101bc | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/71.0.0/support-base-71.0.0.pom
+755cd9e2c9d550b7d13e32b2d0fc3838021967405cf6b7bf30c58577fec5827a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/support-ktx-71.0.0.aar
+7b0a3bd6d32c8002f785db8fdbf3b08e3541366e784cac1304cb3f49642b916a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/support-ktx-71.0.0.pom
+f7bf27270904abd8639b543151b6eaf268b821b8e6235c8decf8031e02ec8648 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.0/support-utils-71.0.0.aar
+0b80acf7d1dd0d9484b0e82cd1a04ae57270d7f7e6b339ce39424554d48798e3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.0/support-utils-71.0.0.pom
+6f26ffb388a1d23809b99e9c84c0be54e27a90dcc14abcc779b0216bc6356946 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle/71.0.0/tooling-glean-gradle-71.0.0.jar
+a073c6239b797829a580265497d770eabfec2c40cc4d361f72a01c0a0987326a | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle/71.0.0/tooling-glean-gradle-71.0.0.pom
+ccd3a75eb0e0f8ce5882d9d3a3154e3d3c40ce9c44f6c506ad4e28df84bab751 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/33.1.2/glean-gradle-plugin-33.1.2.jar
+a09eccf8b4fbb071e1acf3ea3ce1d30017250ee9c35424a0f98659526ff19597 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/33.1.2/glean-gradle-plugin-33.1.2.pom
+a1db8db94979392030d8a5eb1c5d7eccc8383adbf031575d746c68a92e9b0d20 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.1.2/glean-33.1.2.aar
+d6394ad35c63daca22246363ff826749deb62d514a1843eea27d8f39dfb778e6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.1.2/glean-33.1.2.pom
470564ff0a452da1c96be4ca3a9cdeceaa2912537ee2a8def486f3b383d43f15 | https://plugins.gradle.org/m2/com/jetbrains/python/envs/com.jetbrains.python.envs.gradle.plugin/0.0.26/com.jetbrains.python.envs.gradle.plugin-0.0.26.pom
6438812f927b505a4c4ef2703b45433a1b99e45334526bfed25e71e1a79abb14 | https://plugins.gradle.org/m2/gradle/plugin/com/jetbrains/python/gradle-python-envs/0.0.26/gradle-python-envs-0.0.26.jar
317aa4c467a37d5fcab6657c326a4069ea8e8c6dda951ec2091ffb95c596a2a3 | https://plugins.gradle.org/m2/gradle/plugin/com/jetbrains/python/gradle-python-envs/0.0.26/gradle-python-envs-0.0.26.pom
diff --git a/projects/application-services/update-cargo-lock.patch b/projects/application-services/update-cargo-lock.patch
index 283a3a2..5e28cca 100644
--- a/projects/application-services/update-cargo-lock.patch
+++ b/projects/application-services/update-cargo-lock.patch
@@ -1,11 +1,14 @@
-From 214a01a43691302b52c2fd8c39c26ef66d4c00b8 Mon Sep 17 00:00:00 2001
+From cdcce5ffd9e49d4648dd6b23a6dfbc8011352883 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk at torproject.org>
Date: Fri, 27 Nov 2020 09:55:49 +0000
Subject: [PATCH] update cargo.lock
+---
+ Cargo.lock | 390 +++++++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 273 insertions(+), 117 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
-index 21244f27..a28c22d7 100644
+index 813c475c..20b6e4d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -86,9 +86,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
@@ -52,7 +55,7 @@ index 21244f27..a28c22d7 100644
"proc-macro2",
"quote",
"serde",
-@@ -186,9 +185,9 @@ dependencies = [
+@@ -191,9 +190,9 @@ dependencies = [
[[package]]
name = "backtrace"
@@ -64,7 +67,7 @@ index 21244f27..a28c22d7 100644
dependencies = [
"addr2line",
"cfg-if 1.0.0",
-@@ -210,6 +209,12 @@ version = "0.12.3"
+@@ -215,6 +214,12 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
@@ -77,7 +80,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "bincode"
version = "1.3.1"
-@@ -232,6 +237,18 @@ version = "1.2.1"
+@@ -237,6 +242,18 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
@@ -96,7 +99,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "blake2b_simd"
version = "0.5.11"
-@@ -320,9 +337,9 @@ dependencies = [
+@@ -325,9 +342,9 @@ dependencies = [
[[package]]
name = "cc"
@@ -108,7 +111,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "cfg-if"
-@@ -437,11 +454,21 @@ dependencies = [
+@@ -442,11 +459,21 @@ dependencies = [
"winapi-util",
]
@@ -132,7 +135,7 @@ index 21244f27..a28c22d7 100644
dependencies = [
"const-random-macro",
"proc-macro-hack",
-@@ -449,12 +476,14 @@ dependencies = [
+@@ -454,12 +481,14 @@ dependencies = [
[[package]]
name = "const-random-macro"
@@ -149,7 +152,7 @@ index 21244f27..a28c22d7 100644
]
[[package]]
-@@ -471,9 +500,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+@@ -476,9 +505,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
[[package]]
name = "core-foundation"
@@ -161,7 +164,7 @@ index 21244f27..a28c22d7 100644
dependencies = [
"core-foundation-sys",
"libc",
-@@ -481,9 +510,9 @@ dependencies = [
+@@ -486,9 +515,9 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
@@ -173,7 +176,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "cpuid-bool"
-@@ -543,7 +572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -548,7 +577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
dependencies = [
"cfg-if 1.0.0",
@@ -182,7 +185,7 @@ index 21244f27..a28c22d7 100644
]
[[package]]
-@@ -554,18 +583,18 @@ checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+@@ -559,18 +588,18 @@ checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-epoch",
@@ -205,7 +208,7 @@ index 21244f27..a28c22d7 100644
"lazy_static",
"memoffset",
"scopeguard",
-@@ -573,26 +602,20 @@ dependencies = [
+@@ -578,26 +607,20 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
@@ -238,7 +241,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "csv"
-@@ -738,7 +761,7 @@ version = "1.2.1"
+@@ -743,7 +766,7 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53d97f19730c1eb3332d0657d0f3ca72795d77c61d8eb26bdd7f15edc0c61eb2"
dependencies = [
@@ -247,7 +250,7 @@ index 21244f27..a28c22d7 100644
"byteorder",
"once_cell",
"serde",
-@@ -1034,6 +1057,16 @@ version = "0.1.1"
+@@ -1039,6 +1062,16 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
@@ -264,7 +267,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
-@@ -1056,53 +1089,59 @@ version = "0.3.3"
+@@ -1061,53 +1094,59 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
@@ -337,7 +340,7 @@ index 21244f27..a28c22d7 100644
"pin-utils",
"slab",
]
-@@ -1112,7 +1151,7 @@ name = "fxa-client"
+@@ -1117,7 +1156,7 @@ name = "fxa-client"
version = "0.1.0"
dependencies = [
"anyhow",
@@ -346,7 +349,7 @@ index 21244f27..a28c22d7 100644
"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"
+@@ -1278,7 +1317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7539c8d8699bae53238aacd3f93cfb0bcaef77b85dc963902b9367c5d7a84c48"
dependencies = [
"anyhow",
@@ -355,7 +358,7 @@ index 21244f27..a28c22d7 100644
"log 0.4.11",
"once_cell",
"thiserror",
-@@ -1361,7 +1400,7 @@ dependencies = [
+@@ -1367,7 +1406,7 @@ dependencies = [
"httparse",
"httpdate",
"itoa",
@@ -364,7 +367,7 @@ index 21244f27..a28c22d7 100644
"socket2",
"tokio",
"tower-service",
-@@ -1488,7 +1527,7 @@ dependencies = [
+@@ -1494,7 +1533,7 @@ dependencies = [
name = "jwcrypto"
version = "0.1.0"
dependencies = [
@@ -373,7 +376,7 @@ index 21244f27..a28c22d7 100644
"rc_crypto",
"serde",
"serde_derive",
-@@ -1521,6 +1560,19 @@ version = "1.4.0"
+@@ -1527,6 +1566,19 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
@@ -392,8 +395,8 @@ index 21244f27..a28c22d7 100644
+
[[package]]
name = "libc"
- version = "0.2.80"
-@@ -1673,9 +1725,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+ version = "0.2.84"
+@@ -1680,9 +1732,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]]
name = "memoffset"
@@ -405,7 +408,7 @@ index 21244f27..a28c22d7 100644
dependencies = [
"autocfg 1.0.1",
]
-@@ -1777,7 +1829,7 @@ dependencies = [
+@@ -1784,7 +1836,7 @@ dependencies = [
"rand 0.7.3",
"regex",
"serde_json",
@@ -414,7 +417,7 @@ index 21244f27..a28c22d7 100644
]
[[package]]
-@@ -1800,9 +1852,9 @@ checksum = "ba896fb4d7fe86433ebaf18c532bd9202e54c450a1bf7723855220e0e76d71d1"
+@@ -1807,9 +1859,9 @@ checksum = "ba896fb4d7fe86433ebaf18c532bd9202e54c450a1bf7723855220e0e76d71d1"
[[package]]
name = "native-tls"
@@ -426,7 +429,7 @@ index 21244f27..a28c22d7 100644
dependencies = [
"lazy_static",
"libc",
-@@ -1877,11 +1929,23 @@ dependencies = [
+@@ -1884,11 +1936,23 @@ dependencies = [
"version_check",
]
@@ -451,15 +454,7 @@ index 21244f27..a28c22d7 100644
"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"
+@@ -1986,9 +2050,9 @@ checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
[[package]]
name = "oorandom"
@@ -471,7 +466,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "opaque-debug"
-@@ -2073,9 +2137,9 @@ dependencies = [
+@@ -2080,9 +2144,9 @@ dependencies = [
[[package]]
name = "paste"
@@ -483,7 +478,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "paste-impl"
-@@ -2113,11 +2177,11 @@ dependencies = [
+@@ -2120,11 +2184,11 @@ dependencies = [
[[package]]
name = "pin-project"
@@ -498,7 +493,7 @@ index 21244f27..a28c22d7 100644
]
[[package]]
-@@ -2133,9 +2197,9 @@ dependencies = [
+@@ -2140,9 +2204,9 @@ dependencies = [
[[package]]
name = "pin-project-internal"
@@ -510,7 +505,7 @@ index 21244f27..a28c22d7 100644
dependencies = [
"proc-macro2",
"quote",
-@@ -2148,6 +2212,12 @@ version = "0.1.11"
+@@ -2155,6 +2219,12 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
@@ -523,7 +518,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "pin-utils"
version = "0.1.0"
-@@ -2391,7 +2461,7 @@ dependencies = [
+@@ -2398,7 +2468,7 @@ dependencies = [
name = "push"
version = "0.1.0"
dependencies = [
@@ -532,7 +527,7 @@ index 21244f27..a28c22d7 100644
"bincode",
"error-support",
"ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -2417,7 +2487,7 @@ dependencies = [
+@@ -2424,7 +2494,7 @@ dependencies = [
name = "push-ffi"
version = "0.1.0"
dependencies = [
@@ -541,7 +536,7 @@ index 21244f27..a28c22d7 100644
"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 = [
+@@ -2450,6 +2520,12 @@ dependencies = [
"proc-macro2",
]
@@ -554,7 +549,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "rand"
version = "0.4.6"
-@@ -2636,7 +2712,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+@@ -2643,7 +2719,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -563,7 +558,7 @@ index 21244f27..a28c22d7 100644
"lazy_static",
"num_cpus",
]
-@@ -2645,7 +2721,7 @@ dependencies = [
+@@ -2652,7 +2728,7 @@ dependencies = [
name = "rc_crypto"
version = "0.1.0"
dependencies = [
@@ -572,7 +567,7 @@ index 21244f27..a28c22d7 100644
"ece",
"error-support",
"hawk",
-@@ -2737,11 +2813,11 @@ dependencies = [
+@@ -2744,11 +2820,11 @@ dependencies = [
[[package]]
name = "reqwest"
@@ -587,7 +582,7 @@ index 21244f27..a28c22d7 100644
"bytes",
"encoding_rs",
"futures-core",
-@@ -2758,14 +2834,15 @@ dependencies = [
+@@ -2765,14 +2841,15 @@ dependencies = [
"mime_guess",
"native-tls",
"percent-encoding",
@@ -605,7 +600,7 @@ index 21244f27..a28c22d7 100644
"web-sys",
"winreg",
]
-@@ -2822,14 +2899,14 @@ dependencies = [
+@@ -2852,14 +2929,14 @@ dependencies = [
[[package]]
name = "rust-argon2"
@@ -624,7 +619,7 @@ index 21244f27..a28c22d7 100644
]
[[package]]
-@@ -2872,6 +2949,12 @@ dependencies = [
+@@ -2902,6 +2979,12 @@ dependencies = [
"winapi 0.3.9",
]
@@ -637,7 +632,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "scopeguard"
version = "1.1.0"
-@@ -2880,9 +2963,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+@@ -2910,9 +2993,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "security-framework"
@@ -649,7 +644,7 @@ index 21244f27..a28c22d7 100644
dependencies = [
"bitflags 1.2.1",
"core-foundation",
-@@ -2893,9 +2976,9 @@ dependencies = [
+@@ -2923,9 +3006,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
@@ -661,7 +656,7 @@ index 21244f27..a28c22d7 100644
dependencies = [
"core-foundation-sys",
"libc",
-@@ -2988,6 +3071,18 @@ dependencies = [
+@@ -3018,6 +3101,18 @@ dependencies = [
"url",
]
@@ -680,15 +675,7 @@ index 21244f27..a28c22d7 100644
[[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"
+@@ -3051,11 +3146,11 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
[[package]]
name = "socket2"
@@ -703,7 +690,7 @@ index 21244f27..a28c22d7 100644
"libc",
"redox_syscall",
"winapi 0.3.9",
-@@ -3042,6 +3137,12 @@ dependencies = [
+@@ -3072,6 +3167,12 @@ dependencies = [
"rusqlite",
]
@@ -716,7 +703,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "strsim"
version = "0.8.0"
-@@ -3074,9 +3175,9 @@ dependencies = [
+@@ -3104,9 +3205,9 @@ dependencies = [
[[package]]
name = "syn"
@@ -728,7 +715,7 @@ index 21244f27..a28c22d7 100644
dependencies = [
"proc-macro2",
"quote",
-@@ -3087,7 +3188,7 @@ dependencies = [
+@@ -3117,7 +3218,7 @@ dependencies = [
name = "sync-guid"
version = "0.1.0"
dependencies = [
@@ -737,7 +724,7 @@ index 21244f27..a28c22d7 100644
"rand 0.7.3",
"rusqlite",
"serde",
-@@ -3099,7 +3200,7 @@ name = "sync-test"
+@@ -3129,7 +3230,7 @@ name = "sync-test"
version = "0.1.0"
dependencies = [
"anyhow",
@@ -746,7 +733,7 @@ index 21244f27..a28c22d7 100644
"env_logger",
"fxa-client",
"interrupt-support",
-@@ -3127,7 +3228,7 @@ version = "0.1.0"
+@@ -3157,7 +3258,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"base16",
@@ -755,7 +742,7 @@ index 21244f27..a28c22d7 100644
"env_logger",
"error-support",
"ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -3294,6 +3395,12 @@ dependencies = [
+@@ -3324,6 +3425,12 @@ dependencies = [
"viaduct",
]
@@ -768,7 +755,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "tempdir"
version = "0.3.7"
-@@ -3341,18 +3448,18 @@ dependencies = [
+@@ -3371,18 +3478,18 @@ dependencies = [
[[package]]
name = "termcolor"
@@ -791,7 +778,7 @@ index 21244f27..a28c22d7 100644
dependencies = [
"libc",
"winapi 0.3.9",
-@@ -3428,6 +3535,15 @@ dependencies = [
+@@ -3458,6 +3565,15 @@ dependencies = [
"winapi 0.3.9",
]
@@ -807,7 +794,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "tinytemplate"
version = "1.1.0"
-@@ -3440,15 +3556,24 @@ dependencies = [
+@@ -3470,15 +3586,24 @@ dependencies = [
[[package]]
name = "tinyvec"
@@ -836,7 +823,7 @@ index 21244f27..a28c22d7 100644
dependencies = [
"bytes",
"fnv",
-@@ -3458,7 +3583,7 @@ dependencies = [
+@@ -3488,7 +3613,7 @@ dependencies = [
"memchr",
"mio",
"num_cpus",
@@ -845,7 +832,7 @@ index 21244f27..a28c22d7 100644
"slab",
]
-@@ -3482,7 +3607,7 @@ dependencies = [
+@@ -3512,7 +3637,7 @@ dependencies = [
"futures-core",
"futures-sink",
"log 0.4.11",
@@ -854,7 +841,7 @@ index 21244f27..a28c22d7 100644
"tokio",
]
-@@ -3503,13 +3628,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+@@ -3533,13 +3658,13 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
[[package]]
name = "tracing"
@@ -872,7 +859,7 @@ index 21244f27..a28c22d7 100644
"tracing-core",
]
-@@ -3574,18 +3699,18 @@ dependencies = [
+@@ -3604,18 +3729,18 @@ dependencies = [
[[package]]
name = "unicode-normalization"
@@ -895,7 +882,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "unicode-width"
-@@ -3617,7 +3742,7 @@ dependencies = [
+@@ -3647,7 +3772,7 @@ dependencies = [
"ffi-support 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static",
"log 0.4.11",
@@ -904,7 +891,7 @@ index 21244f27..a28c22d7 100644
]
[[package]]
-@@ -3648,10 +3773,11 @@ dependencies = [
+@@ -3678,10 +3803,11 @@ dependencies = [
[[package]]
name = "url"
@@ -918,7 +905,7 @@ index 21244f27..a28c22d7 100644
"idna",
"matches",
"percent-encoding",
-@@ -3813,6 +3939,30 @@ version = "0.2.68"
+@@ -3843,6 +3969,30 @@ version = "0.2.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
@@ -949,7 +936,7 @@ index 21244f27..a28c22d7 100644
[[package]]
name = "web-sys"
version = "0.3.45"
-@@ -3876,7 +4026,7 @@ version = "0.11.0"
+@@ -3906,7 +4056,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37"
dependencies = [
@@ -958,7 +945,7 @@ index 21244f27..a28c22d7 100644
]
[[package]]
-@@ -3956,6 +4106,12 @@ dependencies = [
+@@ -3986,6 +4136,12 @@ dependencies = [
"winapi-build",
]
@@ -971,6 +958,3 @@ index 21244f27..a28c22d7 100644
[[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
index 0c74aa7..b5b0121 100644
--- a/projects/application-services/viaduct-workaround.patch
+++ b/projects/application-services/viaduct-workaround.patch
@@ -1,15 +1,18 @@
-From 2b79903b41133799bcbe72aed2e9e8d54b278d30 Mon Sep 17 00:00:00 2001
+From 5020520a2b240512284a7396e99ed22c54042257 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk at 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.
+---
+ nimbus/Cargo.toml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nimbus/Cargo.toml b/nimbus/Cargo.toml
-index 3f118b7..0d0fa9b 100644
+index b19acc9..fd267b5 100644
--- a/nimbus/Cargo.toml
+++ b/nimbus/Cargo.toml
-@@ -25,7 +25,7 @@ serde_derive = "1"
+@@ -26,7 +26,7 @@ serde_derive = "1"
serde_json = "1"
log = "0.4"
# Viaduct locked to version same version of app-services as mozilla-central
@@ -18,8 +21,8 @@ index 3f118b7..0d0fa9b 100644
thiserror = "1"
url = "2.1"
rkv = "0.15"
-@@ -40,7 +40,7 @@ uniffi = "0.5"
- uniffi_build = { version = "0.5", features = [ "builtin-bindgen" ] }
+@@ -41,7 +41,7 @@ uniffi = { version = "0.7", optional = true }
+ uniffi_build = { version = "0.7", features = [ "builtin-bindgen" ], optional = true }
[dev-dependencies]
-viaduct-reqwest = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"}
@@ -27,6 +30,3 @@ index 3f118b7..0d0fa9b 100644
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
index df84602..1bc27bb 100644
--- a/projects/application-services/viaduct-workaround2.patch
+++ b/projects/application-services/viaduct-workaround2.patch
@@ -1,109 +1,17 @@
-From 5d34bb6b8aa779cbb9d9bdb465aa38ff99ecc2d1 Mon Sep 17 00:00:00 2001
+From 9f3cf867a22a807cf997d2b0af283c7ce9d298fe Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk at torproject.org>
Date: Wed, 2 Dec 2020 09:26:43 +0000
Subject: [PATCH 2/2] Bug 40156: Cargo.lock update after viaduct*-workaround
+---
+ nimbus/Cargo.lock | 43 +++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 41 insertions(+), 2 deletions(-)
diff --git a/nimbus/Cargo.lock b/nimbus/Cargo.lock
-index 2339236..dfe0f6f 100644
+index 9caa76c..a73e464 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 = [
+@@ -223,6 +223,16 @@ dependencies = [
"winapi 0.3.9",
]
@@ -120,262 +28,7 @@ index 2339236..dfe0f6f 100644
[[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",
+@@ -1326,6 +1336,7 @@ dependencies = [
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -383,7 +36,7 @@ index 2339236..dfe0f6f 100644
"web-sys",
"winreg",
]
-@@ -1299,6 +1380,12 @@ dependencies = [
+@@ -1369,6 +1380,12 @@ dependencies = [
"winapi 0.3.9",
]
@@ -396,200 +49,7 @@ index 2339236..dfe0f6f 100644
[[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"
+@@ -1850,7 +1867,6 @@ checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
[[package]]
name = "viaduct"
version = "0.1.0"
@@ -597,7 +57,7 @@ index 2339236..dfe0f6f 100644
dependencies = [
"ffi-support",
"log",
-@@ -1762,7 +1882,6 @@ dependencies = [
+@@ -1866,7 +1882,6 @@ dependencies = [
[[package]]
name = "viaduct-reqwest"
version = "0.1.0"
@@ -605,9 +65,9 @@ index 2339236..dfe0f6f 100644
dependencies = [
"ffi-support",
"lazy_static",
-@@ -1855,6 +1974,30 @@ version = "0.2.68"
+@@ -1959,6 +1974,30 @@ version = "0.2.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
+ checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
+[[package]]
+name = "wasm-bindgen-test"
@@ -635,26 +95,4 @@ index 2339236..dfe0f6f 100644
+
[[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
-
+ version = "0.3.46"
diff --git a/projects/uniffi-rs/config b/projects/uniffi-rs/config
index 7d89cc2..acd9d2d 100644
--- a/projects/uniffi-rs/config
+++ b/projects/uniffi-rs/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
-version: 0.5.0
+version: 0.7.0
git_url: https://github.com/mozilla/uniffi-rs
-git_hash: bc4a8570ab8430a4f80c3722ef79ff9a4819969e
+git_hash: ea3ff0402438ef1ebceda4c5fbbbd2ed6a9be227
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
var:
@@ -13,6 +13,6 @@ input_files:
- name: rust
project: rust
# `cargo vendor vendor` in the `uniffi-rs` directory has vendored the sources.
- - URL: https://people.torproject.org/~gk/mirrors/sources/uniffi-rs-vendor-[% c('version') %].tar.bz2
- sha256sum: 71d912237208c35a762b3c812afe0a758823792dd745c1253314bcccc1694b7f
+ - URL: https://people.torproject.org/~boklm/mirrors/sources/uniffi-rs-vendor-[% c('version') %].tar.bz2
+ sha256sum: 8f201df618b3e7bcaaf01a87e0d55171605b80abeb1b660fe4dd0b9bfc10a0d8
- filename: btreeset.patch
More information about the tor-commits
mailing list