commit a803d45ea7248d05cba2fb830d89492b7c305f4a Author: Nicolas Vigier boklm@torproject.org Date: Tue Jun 29 19:04:38 2021 +0200

Bug 40312: Update components for mozilla90: application-services part --- projects/application-services/build | 9 +- projects/application-services/config | 26 +- .../gradle-dependencies-list.txt | 117 +-- .../application-services/update-cargo-lock.patch | 947 --------------------- .../application-services/viaduct-workaround.patch | 32 - 5 files changed, 74 insertions(+), 1057 deletions(-)

diff --git a/projects/application-services/build b/projects/application-services/build index b22b4c7..ec0aea3 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -34,7 +34,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz # Prepare the offline build. # Move the directory for hardcoding the path in .cargo/config. mv /var/tmp/build/[% project %]-[% c('version') %] $builddir -tar -C $builddir -xjf application-services-vendor-[% c('var/rust_vendor_version') %].tar.bz2 +tar -C $builddir -xjf application-services-vendor-[% c('version') %].tar.bz2 cd $builddir # Make sure our vendored crates are used for offline builds. cat >> .cargo/config << 'EOF' @@ -58,11 +58,6 @@ sed -i \ uniffi_bindgen/.cargo-checksum.json popd

-patch -p1 < $rootdir/update-cargo-lock.patch -cd components/external/nimbus-sdk -patch -p1 < $rootdir/viaduct-workaround.patch -cd ../../../ - # Move NSS and SQLCipher to the right place # XXX: Maybe merge with the loop above. archs="armv7 aarch64 x86 x86_64" @@ -97,7 +92,7 @@ patch -p1 < $rootdir/target.patch mv gradle-dependencies-list.txt '[% dest_dir _ "/" _ c("filename") %]' [% ELSE %] # Prepare Glean dependencies for offline build - tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 + tar -xf $rootdir/glean-wheels-[% c('var/glean_parser') %].tar.xz # We need to set `LC_ALL` and `LANG` to something that is not ASCII as encoding # otherwise `click` barfs. See: https://click.palletsprojects.com/python3/ export LC_ALL=C.UTF-8 diff --git a/projects/application-services/config b/projects/application-services/config index c76afe1..3b05d85 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: 74.0.1 -git_hash: ad7b64fa03eeeb00815125e635d1fb8809befd40 +version: 77.0.2 +git_hash: dd09c25f14dbf45f1637ed8dca2d1e5ff668479f git_url: https://github.com/mozilla/application-services git_submodule: 1

@@ -9,10 +9,9 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 5 - # This should be updated when the list of rust dependencies is changed. - rust_vendor_version: 5 + gradle_dependencies_version: 6 gradle_version: 6.5 + glean_parser: 2.2.0

input_files: - project: container-image @@ -76,18 +75,16 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' enable: '[% !c("var/fetch_gradle_dependencies") %]' - - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-%5B% c('var/glean_parser') %].tar.bz2 - sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2 + - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-%5B% c('var/glean_parser') %].tar.xz + sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6 enable: '[% !c("var/fetch_gradle_dependencies") %]' # Use `make cargo_vendor-application-services` to re-generate the vendor tarball - - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-ve... c('var/rust_vendor_version') %].tar.bz2 - sha256sum: 5f1c9e1bc0db283e88516bd1d78187145bacbf4aeb72972ac09875c1147d2215 + - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-ve... c('version') %].tar.bz2 + sha256sum: 313c1e9b164ce9905eafe29a913edb617379e6d153ce28fa751d9f544e6e87c8 - filename: no-git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: target.patch - - filename: viaduct-workaround.patch - - filename: update-cargo-lock.patch - filename: gen_gradle_deps_file.sh enable: '[% c("var/fetch_gradle_dependencies") %]' - filename: 0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch @@ -123,13 +120,6 @@ steps:

cargo_vendor: filename: '[% project %]-vendor-[% c("version") %].tar.bz2' - var: - cargo_vendor_opts: '-s components/external/nimbus-sdk/nimbus/Cargo.toml' - pre_cargo_vendor: | - patch -p1 < $rootdir/update-cargo-lock.patch - patch -d components/external/nimbus-sdk -p1 < $rootdir/viaduct-workaround.patch input_files: - project: container-image pkg_type: build - - filename: viaduct-workaround.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 8686f74..02b4669 100644 --- a/projects/application-services/gradle-dependencies-list.txt +++ b/projects/application-services/gradle-dependencies-list.txt @@ -1,21 +1,23 @@ # On how to update dependencies see doc/how-to-create-gradle-dependencies-list.txt # Don't forget to update var/gradle_dependencies_version when modifying this file sha256sum | url -d1bc9842455c2e534415d88c44df4d52413b478db9093a1ba36324f705f44c3d | https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/act... -27a4be7462629c312da0b831a0978d2076fc34074145fb61dd4e86d7c8469b82 | https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/act... +4f2b35916768032f7d0c20e250e28b29037ed4ce9ebf3da4fcd51bcb0c6067ef | https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.1.0/act... +3690001fc5a57ad176cacf7a13f56219bffb73b93c7978dbac1e1e5db082d6c0 | https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.1.0/act... d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692 | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0... 2e9372ba7780ef44952adbf86b66e1f08682c1e5277c926185f6564a13799efe | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0... +9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36 | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.2.0... +62fb6dca2777efe08e7077d6b872d69110619df7fc21c99a6f54066499cc0383 | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.2.0... c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resourc... 149dd8cec3664bef8ffde86c396ba1e2ab156ea68793d29800d008bacbc9c0f8 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resourc... 3d2131a55a61a777322e2126e0018011efa6339e53b44153eb651b16020cca70 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/a... 8eb3cbe823b609853b481646e3d2c1aa39dbde53dd269712fd844ffdef2ebb42 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/a... -83bbb3960eaabc600ac366c94cb59414e441532a1d6aa9388b0b8bfface5cf01 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0... fe1237bf029d063e7f29fe39aeaf73ef74c8b0a3658486fc29d3c54326653889 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0... +83bbb3960eaabc600ac366c94cb59414e441532a1d6aa9388b0b8bfface5cf01 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0... dd77615bd3dd275afb11b62df25bae46b10b4a117cd37943af45bdcbf8755852 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.... c0c4ed0160cd2ca18390015de8b392b697c173327c6b2c0947d4e62f6958c05d | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.... a7913a5275ad68e555d2612ebe8c14c367b153e14ca48a1872a64899020e54ef | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.0... -67e9066ca4acfdc6e3cc508293c31ba0398057ff118e4f70b1e1813c9a3456d1 | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0... 632a0e5407461de774409352940e292a291037724207a787820c77daf7d33b72 | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0... +67e9066ca4acfdc6e3cc508293c31ba0398057ff118e4f70b1e1813c9a3456d1 | https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0... 78309600ba6fe4473c045976906649b25b3c9a49b14642f8a8a7dcd9e1afe7c8 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-kt... ba6a806bc1a6faf0cbae08397b3f781feca293ff2b5f3aa600b3d2db142e5ab4 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-kt... 94de196cd67950cff6ef3e1ac59015f8eaaf61840bdc238f2cf54ddef8dd0be9 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.2/core-1.3.2.... @@ -30,31 +32,33 @@ d7346bc57ab5bf5cad74549796e2997cba2834ef1513537639e32e60674063cc | https://dl.go 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... -a14c8b8f2153f128e800fbd266a6beab1c283982a29ec570d2cc05d307d81496 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fra... -ef78eb27ac02ddf3545d5f8a3857c73a2837a01853f8d5fcf77251011db52544 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fra... +fdd0eac80c6b26c79093a63fc699303f928cc1fa73ca7196d5590a77eb6d6873 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.0/fra... +295417fbc0edbd706c9415655c111426fba5b20718b4fde601b95ac4f00df9b8 | https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.0/fra... 33193135a64fe21fa2c35eec6688f1a76e512606c0fc83dc1b689e37add7732a | https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1... 0ddc07cc39699f48ecd9ec894b5830c0f09e22e82959294edf37217224c88b7b | https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1... -76db6be533bd730fb361c2feb12a2c26d9952824746847da82601ef81f082643 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/... -692c2a60437a95220c8fbb6e8943196f255f535d1a7c58714e6c46530782f276 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/... -bd53c64b038585215b4959c1a388437a3ad525608a31c58e4283c3e371727d4d | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extensi... -510e33b8b6ca33d2fcb3b7615a4528e338b438de398f3ee8de119c26508a5fdd | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extensi... -a150743e86c30eddf1660ad454b1f86041efdefcd1a039320c4c26db87f7119a | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedat... -6839d2e68c8fee4cc3bbf04e6b291a6ae842403fcd5f8d944c27814d296deff3 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedat... -242e446bed3db36f0df0aab0cb7f91060bd2dab7adcad1117adf54e724cd1d26 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedat... -1e4c580c995e41cd18455cfb87e3e43955be9db9ec63a8fb3c7259f01b7c4e3c | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedat... -8cddd0c7f4927bbf71fb71fca000786df82cc597c99463d6916ccbe4a205a9ac | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-process... -8bd43b3a4c017cc9f255f0a33cb216a7b5040d6ee1a8838a95b787987601a4e4 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-process... -e5173897b965e870651e83d9d5af1742d3f532d58863223a390ce3a194c8312b | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime... -af8dcf02db2d79bcd4b53d6be8dbf37d79a32b38a1dfcaebbbd8766e0d959fcb | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime... -23516745f34f16ff7850bb1eadd55cf193dd789cba428de4bca120433e3bfd69 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-service... -6b9e4fe350ed993d0c00b5ac0ff22f28bfc3bfbd9ad7eb7afc9b82f8339e673e | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-service... -ba55fb7ac1b2828d5327cda8acf7085d990b2b4c43ef336caa67686249b8523d | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmod... -29aa72e339c3e227e74c973a4c85c7b79c926f0d37b61ed94f4d99a137c9a4b4 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmod... +63898dabf7cfe5ec5d7ed8b8c2564c1427be876e1496ead95c2703cf59d3734b | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/... +cc30a8a2a97d3767bd169b747c078727308096dd3ab7917d80b2f1f42d118bd6 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/... +648c8de1d10b025d524a2e46ac994fc3f6bf186826c09ec1a62d250bf1b877ae | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extensi... +f9b3998f71fc46719f7305d054752d01a9dac0becbee530fd06b70a9cf7ee222 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extensi... +556c1f3af90aa9d7d0d330565adbf6da71b2429148bac91e07c485f4f9abf614 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedat... +aa51621be3817d1f5d21336b0c0525fe96ae899cec656c13d8ea18a51ea32c2f | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedat... +d83af94860aa9f64cbdc51f40796a7cf55b116f0e6efd752e845c0104c8b16f6 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedat... +0d1ce392cc13707fc6b7c1aca584c8c2dbc46790abc0542ba228a731e5d63f8d | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedat... +3a977e7778fc8418742d388409daaba7ea8fea8823d21ffb96e4c4236f715070 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-process... +e71869a858f4d933da2f59c273ae1a5c426cfe0b017609bb1f6ab57c02aa4bcd | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-process... +a92a46fa7aec8ac326a5d578734a2d5b63206976996b9e06cae171b35b0ab6de | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime... +2f866c07a1f33a8c9bb69a9545d4f20b4f0628cd0a155432386d7cb081e1e0bc | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime... +7f154066fed1c9162870f728b208352831b3d1f8f23f5d388958a50ca4e9f441 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime... +ca2801ffc069555afed8eddd2292130f436956452bc8bbad30fb56f8e4e382a0 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-service... +f238f90a3d9d1f42779367309127dad8ff1a595dfa0754bbae05d77bfd0b5f33 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-service... +f4cceafbf86acfc7f3ba6a61d6dc6842a6738c1274610767d3ab8f8a114cba97 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmod... +37a46395fb334f5d54843d5823f37513c80485dcae6cf16188babc49ebe65e17 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmod... +967efab24d6c49dd414a8c0ac4a1cd09b018f0b8bb43b739ad360c4158ebde27 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmod... +aaa3afaa49ff47e2bc9b2389f939d3e8137616c4616684e2dfb53ba8366aa11d | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmod... 11f735cb3b55c458d470bed9e25254375b518b4b1bad6926783a7026db0f5025 | https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-... c978d550808b47434aa49a63164110a50b55b0bcc6160a93a2e37d5110df8c5e | https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-... -fbb37fcf02b35ba7a909fffb52ce4ccb36874f03c1f927f6338b68ef9f1d6b7a | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.2.5/room... 2b130dd4a1d3d91b6701ed33096d389f01c4fc1197a7acd6b91724ddc5acfc06 | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.2.5/room... +fbb37fcf02b35ba7a909fffb52ce4ccb36874f03c1f927f6338b68ef9f1d6b7a | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.2.5/room... 24a5549b796e43e337513d2908adac67f45350d9a90bca7e2e6120692140bb14 | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.2.5/roo... 5d7e35be6728b331c82eed418fee9133d2481ba2c5a12500c182b27545bc4bbb | https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.2.5/roo... 2510a5619c37579c9ce1a04574faaf323cd0ffe2fc4e20fa8f8f01e5bb402e83 | https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0... @@ -281,8 +285,10 @@ b787d574c851505e76212968b9ae1641ea79804aef7f5a2cee2a01cd4055213a | https://jcent 3a2e69d06d641d1f3b293126dc9e2e4ea6563bf8c36c87e0ab6fa4292d04b79c | https://jcenter.bintray.com/org/apache/commons/commons-parent/34/commons-par... 7098a1ab8336ecd4c9dc21cbbcac869f82c66f64b8ac4f7988d41b4fcb44e49a | https://jcenter.bintray.com/org/apache/commons/commons-parent/35/commons-par... 87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7 | https://jcenter.bintray.com/org/apache/commons/commons-parent/39/commons-par... +cde5750309c07bbac140d0d981697243d3c58c2ee525c1319b9ba887d89f2c9c | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.5.3/httpc... c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.5.6/httpc... 7efc1241e73e7fbb268bfd33242d11ebd3ca07061d7d85f2962dc32a0f0b8855 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.5.6/httpc... +43c7d2975a1125bb00cf058a3877f549a1f1894f8b8ad47e2c3e46e3fc4623dc | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client/... 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/... @@ -290,6 +296,7 @@ caaf967d94afb21753f36082c6086206bd1f48825ff596932cceba72b65d39fa | https://jcent 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... dfbfd6ffe2a784ca9817c46365aa7f8a578320b805bde39d6f55a0b09d8aa8ca | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.5.6/httpmim... +3d6eba428555a558de046b5d76eacc1f5a54b4f5f20b84d636ed7aff18aa48c3 | https://jcenter.bintray.com/org/apache/httpcomponents/project/7/project-7.po... 7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk1... 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... @@ -316,8 +323,8 @@ affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601 | https://jcent 303c422700f79d5d13d528b978c6abd9cd136d78d9f7f6f2556e85a81892f9f1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r... 648025c01c56b234a7458cb6048ae8fcfa941f9ea8ebf059090733237b9df9b6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r... f120750af0c9e0c6024c3c76469fd4638ef898fc5bc2d4c49f2fe17568f47b9e | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r... -baec7911227eec34845439c38876a2dd18eda7c15ac523655411e20e8f053138 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r... -ec86adcccbb839d099b8649c5277a6fbe41d2c04b61b4b296584e7af52ae4ad1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r... +f210c702efaea345adf6a14211b8d39231a2679a1f960da2e0692949b9df3ec6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-r... +c9843ec810658da356c5ac2ae9bb2efa912e88b54262a0dc32d52ab40000c2e9 | 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... @@ -358,34 +365,38 @@ e67e0eaf0d532e4d312947ac4cf02135ea44aee646b32273707dc0c4646a3662 | https://jcent 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... -812cf197d9c4c67e1f47f95e2d72a9b600f0d1124560617bfe9850773eccbcff | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.21... -cd840ab880f838af0eb76e25930392c6bf0aa2a2adb5e2d4b0bb9f717a295ebd | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.21... +98e59a445a3248f58811ce6782485de53fa77fc6f5adb3eb766a78b1231abd0a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.0/... +32010683330a6f31b8d309f10433acaa109b61f2df3d252dae7dade9730074c2 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.30... +2594a44d33068bab2949750cae0c0ea052fc56faf29f06f35bd57cfa68c6736b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.30... 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... -50de5f7dad6235064ac6c0ff577f095a91b3306c2547d8bc372291587495024a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.21/k... -3b54ad496e7a7f7ad8ad6e846e5c061911242ef474e030ff602beef7565943d6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.21/k... +751cf4a51089dc4c60caec5f30125983cd1d3998a4138ae8e66db0d496f73646 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.30/k... +7e2a57538390cd609e3a9c6f7e085af5a948c663fda4eddc78907125a960ba20 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.30/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... -8ec3db1516948b2d3524e3afbe75cb5ac59e02d98cb6ef586ef57ba63ca8d11f | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.21/k... -5bd2b4922398bd94d1d94e2dca0401089092b453e724a9e746daacacead735b7 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.21/k... +c1ca432b7b4e0533deef6fe372387464f47f49260f706728854a508e413b4e66 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.30/k... +4a633aa686acf4557f64156ae07889708ac59fb6210f970ace10b2a1425a62eb | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.30/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... +e737fa1a6a51f7cff7eaf7f69525d4bec9f22e7c9d806cd46dc72051600443de | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.60/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... -f78c5d8c09db985912ab83a1de3c3b53ddf208d7b151f06a72358ea3e137d01b | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.21/kotlin... -076c5a29b7a79ba2050b52e12307783d6b18d7701ce5245a3f48d005c51ae2be | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.21/kotlin... +3db67dafc422b9015e33cfdb3a4df9e8a6912de63c4b733197c8c189cdbc6d4a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.0/kotlin-... +a7810cf68dd2c8fa79e61a463478880d1df8a5ab9597d151595a9c743b48b90f | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.30/kotlin... +cc44bf2403bc5d9cbc7515979f5ce15bcff6c01f655f7e4d1db222d26cb575cf | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.4.30/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... -5cfd02a5e7dd9be15835522035d32eca33be0e63085d27f7c918fa495e34f81f | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-android... 58b3ce8be4521230361fe6679b5930e75730164be1c7b900ddca4218072fee85 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-android... +5cfd02a5e7dd9be15835522035d32eca33be0e63085d27f7c918fa495e34f81f | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-android... +4cd24a06b2a253110d8afd250e9eec6c6faafea6463d740824743d637e761f12 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core-jv... 3286bd65e41eae735600c0e9a441cb4a0988d0d76647923b9c978c90b0cb7311 | 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.... @@ -412,24 +423,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 -e5801430997ccd358df0b4b48f101402b924a72de87cc5f12d80a32bb6d61865 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0/... -5d08cc1bb3c2432ab3ecaaa6c06ca0603a9957ece9524643b9db4fb77a01f7b8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/71.0.0/... -bfbb680afd838af36e4609d1b7236dbef93f47e92b386bb7ca08efca910e2e59 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/71.0.0... -c65c694e7579c0531eb09f569c97121793c11895e66fe8b206d1e9941b5ea9c8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/71.0.0... -d5b2a0cf4022b8287b0e515909262c3969fde476d3df71fcc165b4b76de0fdf1 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/71.0.0... -b7e1a47fc0a4819023b0356c11b929e22caf101c62318981882a04ecea22d859 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/71.0.0... -fe504319fc0bc08ca00d8b951bf5d5f6fa4a5fc467e28b609cd34e8c59c20ad9 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/71.0.0/... -d1741144ed2ea215a84f5d94d779cafcfaf778cce8cc7224437a2884cb1101bc | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/71.0.0/... -755cd9e2c9d550b7d13e32b2d0fc3838021967405cf6b7bf30c58577fec5827a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/s... -7b0a3bd6d32c8002f785db8fdbf3b08e3541366e784cac1304cb3f49642b916a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/s... -f7bf27270904abd8639b543151b6eaf268b821b8e6235c8decf8031e02ec8648 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.0... -0b80acf7d1dd0d9484b0e82cd1a04ae57270d7f7e6b339ce39424554d48798e3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.0... -6f26ffb388a1d23809b99e9c84c0be54e27a90dcc14abcc779b0216bc6356946 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle... -a073c6239b797829a580265497d770eabfec2c40cc4d361f72a01c0a0987326a | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle... -ccd3a75eb0e0f8ce5882d9d3a3154e3d3c40ce9c44f6c506ad4e28df84bab751 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... -a09eccf8b4fbb071e1acf3ea3ce1d30017250ee9c35424a0f98659526ff19597 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... -a1db8db94979392030d8a5eb1c5d7eccc8383adbf031575d746c68a92e9b0d20 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.1.2/glean-33... -d6394ad35c63daca22246363ff826749deb62d514a1843eea27d8f39dfb778e6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.1.2/glean-33... +ce8aba2b30e57cfd10ee5d0aac4ed3f4c5339e1bd54852db49df0b0aeefd305c | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/75.0.0/... +0ab8bfb846448d94b4a3c0dd85ab35026ab8bcd0c1f0802fa7ac3ac5a19bb897 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/75.0.0/... +191a6129194fb646f2ef62c3ac5682007a7d614a81567f5d6dcd366b5a8a56da | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/75.0.0... +d4d19677274277e87b5e007fb8873758b41749f1c77947861929a3fe1ef8c3b3 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/75.0.0... +32820376d60504d2740ec710257646a8d3e60954d1cae856519375029d9c2dd4 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/75.0.0... +1e5ae8c772deb9fb34d84f2733b99e7dac3fde59f0c70bbbf9ec862c033523e9 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/75.0.0... +45f36fe8af4e5b7f1d4e2c87451667f13e80b256ce1b7b0609b833e9c96a9a3f | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/75.0.0/... +7f836242c3760b77e2ed64e461cbb036b4c292c57a741ddd4ecbad1000246a89 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/75.0.0/... +e99477265ee7b3fd8c8c5d5a8a3e0b5372dfffb8b55aa037e03b5520a590c63c | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/75.0.0/s... +d5bc8b9ee51c1c99fb9d9f0a1ad5971f20d8ebca5f65ab0a511d2e68a7058ce3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/75.0.0/s... +3a8be5803d69f1c27f1c6be686b4693ed2ad815992240540e78713043b2442d0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/75.0.0... +7f2a2ee5be870a21ac6ef982ac76869d15c707b9771a54aac9ab602f74d99b86 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/75.0.0... +b43b45aec7ca4877473f2f8878cb0b559e06ecdcb387974d916a02d2e7f791e1 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle... +b7cb1d8e3bf96187158557d794d970eba1a52c50bf0f6cfc7c0a90d1a0c7b815 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradle... +624e642862770feb72c22cd80cd96f0e5d53340ded862987b3ec9c537c8bed29 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... +93d7a411ea527507fb1510d58c764aed2ec029cdd0b3c42df00ceea01afa8f45 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/3... +953648b707c804301df08d70db75086b70c141e72d66826e88f34f7aa9ab880e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/35.0.0/glean-35... +9acbb9dba515f2142695a17cb9ac123032dcba24423b660f5e0f0b95adfd22bf | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/35.0.0/glean-35... 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 deleted file mode 100644 index 3a42019..0000000 --- a/projects/application-services/update-cargo-lock.patch +++ /dev/null @@ -1,947 +0,0 @@ -From 3d6b82d24bcf05b26c69702f6dcb1a0ac91c13a1 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 - ---- - Cargo.lock | 384 +++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 267 insertions(+), 117 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 69d2dae0..2c1a3aa3 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", -@@ -191,9 +190,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", -@@ -215,6 +214,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" -@@ -237,6 +242,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" -@@ -325,9 +342,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" -@@ -442,11 +459,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", -@@ -454,12 +481,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]] -@@ -476,9 +505,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", -@@ -486,9 +515,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" -@@ -559,7 +588,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]] -@@ -570,18 +599,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", -@@ -589,26 +618,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" -@@ -754,7 +777,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", -@@ -1042,6 +1065,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" -@@ -1064,53 +1097,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", - ] -@@ -1120,7 +1159,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", -@@ -1275,7 +1314,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", -@@ -1364,7 +1403,7 @@ dependencies = [ - "httparse", - "httpdate", - "itoa", -- "pin-project 1.0.1", -+ "pin-project 1.0.2", - "socket2", - "tokio", - "tower-service", -@@ -1491,7 +1530,7 @@ dependencies = [ - name = "jwcrypto" - version = "0.1.0" - dependencies = [ -- "base64", -+ "base64 0.12.3", - "rc_crypto", - "serde", - "serde_derive", -@@ -1524,6 +1563,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.84" -@@ -1680,9 +1732,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", - ] -@@ -1784,7 +1836,7 @@ dependencies = [ - "rand 0.7.3", - "regex", - "serde_json", -- "serde_urlencoded", -+ "serde_urlencoded 0.6.1", - ] - - [[package]] -@@ -1807,9 +1859,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", -@@ -1884,11 +1936,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", -@@ -1986,9 +2050,9 @@ 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" -@@ -2080,9 +2144,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" -@@ -2120,11 +2184,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]] -@@ -2140,9 +2204,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", -@@ -2155,6 +2219,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" -@@ -2398,7 +2468,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)", -@@ -2424,7 +2494,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", -@@ -2450,6 +2520,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" -@@ -2643,7 +2719,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" - dependencies = [ - "crossbeam-channel", - "crossbeam-deque", -- "crossbeam-utils 0.8.0", -+ "crossbeam-utils", - "lazy_static", - "num_cpus", - ] -@@ -2652,7 +2728,7 @@ dependencies = [ - name = "rc_crypto" - version = "0.1.0" - dependencies = [ -- "base64", -+ "base64 0.12.3", - "ece", - "error-support", - "hawk", -@@ -2744,11 +2820,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", -@@ -2765,14 +2841,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", - ] -@@ -2829,14 +2906,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]] -@@ -2879,6 +2956,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" -@@ -2887,9 +2970,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", -@@ -2900,9 +2983,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", -@@ -2995,6 +3078,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" -@@ -3028,11 +3123,11 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - - [[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", -@@ -3087,9 +3182,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", -@@ -3100,7 +3195,7 @@ dependencies = [ - name = "sync-guid" - version = "0.1.0" - dependencies = [ -- "base64", -+ "base64 0.12.3", - "rand 0.7.3", - "rusqlite", - "serde", -@@ -3112,7 +3207,7 @@ name = "sync-test" - version = "0.1.0" - dependencies = [ - "anyhow", -- "base64", -+ "base64 0.12.3", - "env_logger", - "fxa-client", - "interrupt-support", -@@ -3140,7 +3235,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)", -@@ -3295,6 +3390,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" -@@ -3342,18 +3443,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", -@@ -3429,6 +3530,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" -@@ -3441,15 +3551,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", -@@ -3459,7 +3578,7 @@ dependencies = [ - "memchr", - "mio", - "num_cpus", -- "pin-project-lite", -+ "pin-project-lite 0.1.11", - "slab", - ] - -@@ -3483,7 +3602,7 @@ dependencies = [ - "futures-core", - "futures-sink", - "log 0.4.11", -- "pin-project-lite", -+ "pin-project-lite 0.1.11", - "tokio", - ] - -@@ -3504,13 +3623,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", - ] - -@@ -3575,18 +3694,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" -@@ -3618,7 +3737,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", - "static_assertions", - ] - -@@ -3662,10 +3781,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", -@@ -3827,6 +3947,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" -@@ -3890,7 +4034,7 @@ version = "0.12.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" - dependencies = [ -- "nom", -+ "nom 5.1.2", - ] - - [[package]] -@@ -3970,6 +4114,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" diff --git a/projects/application-services/viaduct-workaround.patch b/projects/application-services/viaduct-workaround.patch deleted file mode 100644 index 933b4bf..0000000 --- a/projects/application-services/viaduct-workaround.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4a7eb7890108939993444ad350dd064dc7448160 Mon Sep 17 00:00:00 2001 -From: Georg Koppen gk@torproject.org -Date: Wed, 2 Dec 2020 09:26:24 +0000 -Subject: [PATCH] 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 4dc51b3..0e30dd0 100644 ---- a/nimbus/Cargo.toml -+++ b/nimbus/Cargo.toml -@@ -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 --viaduct = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"} -+viaduct = { path = "../../../viaduct" } - thiserror = "1" - url = "2.1" - rkv = "0.17" -@@ -41,7 +41,7 @@ uniffi = { version = "^0.8.0", optional = true } - uniffi_build = { version = "^0.8.0", features = [ "builtin-bindgen" ], optional = true } - - [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"