GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Unverified Commit 1bd55777 authored by Georg Koppen's avatar Georg Koppen Committed by Matthew Finkel
Browse files

Bug 40156: Update application-services to v67.0.0 for Fenix 84

Our offline builds are busted with Nimbus SDK landing as submodule. See:
https://github.com/mozilla/application-services/issues/3732. We work
around that by pointing to the local viaduct* crates.

We need to add kotlinx-coroutines-android-1.3.9.jar manually, see:
tor-browser-build#40056.

The jvnet-parent-*.pom files got slightly updated without the respective
version numbers getting incremented.

The proguard-gradle and httpcomponents-parent-10 .pom files got mainly
reformatted without a version number bump as well.
parent a5471ba2
From bca7900361a57278293444fdf0855240987ebb49 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Fri, 9 Oct 2020 13:35:24 +0000
Subject: [PATCH] Bug 40085: Bump glean_parser to 1.28.6
diff --git a/build.gradle b/build.gradle
index c6e0be82..2a13739c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
ext.kotlin_version = '1.3.71'
ext.jna_version = '5.2.0'
ext.android_gradle_plugin_version = '3.6.0'
- ext.android_components_version = '56.0.0'
+ ext.android_components_version = '62.0.0'
ext.build = [
ndkVersion: "21.3.6528147", // Keep it in sync in TC Dockerfile.
--
2.28.0
...@@ -6,6 +6,10 @@ builddir=/var/tmp/build/[% project %] ...@@ -6,6 +6,10 @@ builddir=/var/tmp/build/[% project %]
mkdir $distdir mkdir $distdir
mkdir /var/tmp/build mkdir /var/tmp/build
tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %]
# XXX: Not needed once we are done with moving Gradle out of our toolchain
# project.
export PATH=$GRADLE_HOME/gradle/bin:$PATH
cd /var/tmp/dist cd /var/tmp/dist
[% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%]
# The host (i.e. Linux) bits should be the same for all four targets. Thus, # The host (i.e. Linux) bits should be the same for all four targets. Thus,
...@@ -17,7 +21,8 @@ cd /var/tmp/dist ...@@ -17,7 +21,8 @@ cd /var/tmp/dist
tar -xf $rootdir/[% c('input_files_by_name/sqlcipher-' _ arch) %] tar -xf $rootdir/[% c('input_files_by_name/sqlcipher-' _ arch) %]
mv sqlcipher sqlcipher-[% arch %] mv sqlcipher sqlcipher-[% arch %]
[% END -%] [% END -%]
export PATH=/var/tmp/dist/rust/bin:$PATH tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs') %]
export PATH=/var/tmp/dist/rust/bin:/var/tmp/dist/uniffi-rs:$PATH
cd $rootdir cd $rootdir
# application-services uses a newer NDK, 21, than everything else... # application-services uses a newer NDK, 21, than everything else...
...@@ -56,6 +61,12 @@ directory = "/var/tmp/build/application-services/vendor" ...@@ -56,6 +61,12 @@ directory = "/var/tmp/build/application-services/vendor"
offline=true offline=true
EOF EOF
patch -p1 < $rootdir/update-cargo-lock.patch
cd components/external/nimbus-sdk
patch -p1 < $rootdir/viaduct-workaround.patch
patch -p1 < $rootdir/viaduct-workaround2.patch
cd ../../../
# Move NSS and SQLCipher to the right place # Move NSS and SQLCipher to the right place
# XXX: Maybe merge with the loop above. # XXX: Maybe merge with the loop above.
archs="armv7 aarch64 x86 x86_64" archs="armv7 aarch64 x86 x86_64"
...@@ -82,13 +93,10 @@ patch -p1 < $rootdir/no-git.patch ...@@ -82,13 +93,10 @@ patch -p1 < $rootdir/no-git.patch
# XXX: We don't build the code for Linux for now as this involves additional # XXX: We don't build the code for Linux for now as this involves additional
# complexity. That's needed for running unit tests later on, though. # complexity. That's needed for running unit tests later on, though.
patch -p1 < $rootdir/target.patch patch -p1 < $rootdir/target.patch
# We need to pick up a newer glean_parser until an updated glean is used by
# application-services.
patch -p1 < $rootdir/40085.patch
[% IF c('var/fetch_gradle_dependencies') %] [% IF c('var/fetch_gradle_dependencies') %]
# XXX: `assemble` is still not enough to see all fetched dependencies via # XXX: `assemble` is still not enough to see all fetched dependencies via
# Gradle's --debug. See: tor-browser-build#40056. # Gradle's --debug. See: tor-browser-build#40056.
$GRADLE_HOME/gradle-6.3/bin/gradle --debug --no-daemon assemble gradle --debug --no-daemon assemble
[% ELSE %] [% ELSE %]
# Prepare Glean dependencies for offline build # Prepare Glean dependencies for offline build
tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2
...@@ -98,8 +106,8 @@ patch -p1 < $rootdir/40085.patch ...@@ -98,8 +106,8 @@ patch -p1 < $rootdir/40085.patch
export LANG=C.UTF-8 export LANG=C.UTF-8
patch -p1 < $rootdir/mavenLocal.patch patch -p1 < $rootdir/mavenLocal.patch
gradle_flags="--offline --no-daemon -Dmaven.repo.local=$gradle_repo" gradle_flags="--offline --no-daemon -Dmaven.repo.local=$gradle_repo"
$GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags assembleRelease gradle $gradle_flags assembleRelease
$GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags publish gradle $gradle_flags publish
cd build cd build
find maven -regex '.*[0-9].\(aar\|pom\)' -exec cp --parents {} $distdir \; find maven -regex '.*[0-9].\(aar\|pom\)' -exec cp --parents {} $distdir \;
......
# vim: filetype=yaml sw=2 # vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
version: 63.0.0 version: 67.0.0
git_hash: 8e63363359c3d20385ed55f5308d19e321816898 git_hash: 6a234c2b1e1972f11e585551d4cf2e40e84bf16f
git_url: https://github.com/mozilla/application-services git_url: https://github.com/mozilla/application-services
git_submodule: 1
var: var:
container: container:
use_container: 1 use_container: 1
# This should be updated when the list of gradle dependencies is changed. # This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 3 gradle_dependencies_version: 4
# This should be updated when the list of rust dependencies is changed. # This should be updated when the list of rust dependencies is changed.
rust_vendor_version: 2 rust_vendor_version: 3
# For armv7 we need a different target than the default one we use for # For armv7 we need a different target than the default one we use for
# GeckoView. We set this variable so the Rust project in the `input_files` # GeckoView. We set this variable so the Rust project in the `input_files`
# below can set the correct target when built for use in this project, # below can set the correct target when built for use in this project,
...@@ -23,6 +24,8 @@ input_files: ...@@ -23,6 +24,8 @@ input_files:
- project: container-image - project: container-image
- project: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]'
name: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]'
- project: gradle
name: gradle
# We need the torbrowser-* targets for Rust, see: #40094. # We need the torbrowser-* targets for Rust, see: #40094.
- project: rust - project: rust
name: rust-armv7 name: rust-armv7
...@@ -72,6 +75,8 @@ input_files: ...@@ -72,6 +75,8 @@ input_files:
name: sqlcipher-x86_64 name: sqlcipher-x86_64
target_prepend: target_prepend:
- android-x86_64 - android-x86_64
- name: uniffi-rs
project: uniffi-rs
- name: python - name: python
project: python project: python
enable: '[% !c("var/fetch_gradle_dependencies") %]' enable: '[% !c("var/fetch_gradle_dependencies") %]'
...@@ -85,9 +90,11 @@ input_files: ...@@ -85,9 +90,11 @@ input_files:
# `cargo vendor vendor` in the `application-services` directory has vendored # `cargo vendor vendor` in the `application-services` directory has vendored
# the sources. # the sources.
- URL: https://people.torproject.org/~gk/mirrors/sources/application-services-vendor-[% c('var/rust_vendor_version') %].tar.bz2 - URL: https://people.torproject.org/~gk/mirrors/sources/application-services-vendor-[% c('var/rust_vendor_version') %].tar.bz2
sha256sum: 70e02d587661e5d93dbe30ffa9265fb8b6b66ba8483f3268017ca919623688bc sha256sum: f2d08275920c6e163617d5f102abc0665fd0f74550a400b1970b5b25bcabd3ef
- filename: no-git.patch - filename: no-git.patch
- filename: mavenLocal.patch - filename: mavenLocal.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]' enable: '[% !c("var/fetch_gradle_dependencies") %]'
- filename: target.patch - filename: target.patch
- filename: 40085.patch - filename: viaduct-workaround.patch
- filename: viaduct-workaround2.patch
- filename: update-cargo-lock.patch
This diff is collapsed.
From 2b79903b41133799bcbe72aed2e9e8d54b278d30 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Wed, 2 Dec 2020 09:26:24 +0000
Subject: [PATCH 1/2] Bug 40156: viaduct*-workaround
See: https://github.com/mozilla/application-services/issues/3732.
diff --git a/nimbus/Cargo.toml b/nimbus/Cargo.toml
index 3f118b7..0d0fa9b 100644
--- a/nimbus/Cargo.toml
+++ b/nimbus/Cargo.toml
@@ -25,7 +25,7 @@ serde_derive = "1"
serde_json = "1"
log = "0.4"
# Viaduct locked to version same version of app-services as mozilla-central
-viaduct = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"}
+viaduct = { path = "../../../viaduct" }
thiserror = "1"
url = "2.1"
rkv = "0.15"
@@ -40,7 +40,7 @@ uniffi = "0.5"
uniffi_build = { version = "0.5", features = [ "builtin-bindgen" ] }
[dev-dependencies]
-viaduct-reqwest = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"}
+viaduct-reqwest = { path = "../../../support/viaduct-reqwest" }
mockito = "0.27"
env_logger = "0.7"
clap = "2.33.3"
--
2.29.2
From 5d34bb6b8aa779cbb9d9bdb465aa38ff99ecc2d1 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Wed, 2 Dec 2020 09:26:43 +0000
Subject: [PATCH 2/2] Bug 40156: Cargo.lock update after viaduct*-workaround
diff --git a/nimbus/Cargo.lock b/nimbus/Cargo.lock
index 2339236..dfe0f6f 100644
--- a/nimbus/Cargo.lock
+++ b/nimbus/Cargo.lock
@@ -30,11 +30,17 @@ version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
[[package]]
name = "askama"
-version = "0.10.3"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12"
+checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134"
dependencies = [
"askama_derive",
"askama_escape",
@@ -43,13 +49,12 @@ dependencies = [
[[package]]
name = "askama_derive"
-version = "0.10.3"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881"
+checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522"
dependencies = [
"askama_shared",
"proc-macro2",
- "quote",
"syn",
]
@@ -61,12 +66,12 @@ checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb"
[[package]]
name = "askama_shared"
-version = "0.10.4"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5"
+checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc"
dependencies = [
"askama_escape",
- "nom",
+ "nom 6.0.1",
"proc-macro2",
"quote",
"serde",
@@ -104,9 +109,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "base64"
-version = "0.12.3"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bincode"
@@ -124,6 +129,18 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+[[package]]
+name = "bitvec"
+version = "0.19.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
[[package]]
name = "block-buffer"
version = "0.9.0"
@@ -164,9 +181,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.61"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
+checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15"
[[package]]
name = "cfg-if"
@@ -206,6 +223,16 @@ dependencies = [
"winapi 0.3.9",
]
+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
+dependencies = [
+ "cfg-if 0.1.10",
+ "wasm-bindgen",
+]
+
[[package]]
name = "core-foundation"
version = "0.9.1"
@@ -341,6 +368,16 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+[[package]]
+name = "form_urlencoded"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
+dependencies = [
+ "matches",
+ "percent-encoding",
+]
+
[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
@@ -363,53 +400,59 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+[[package]]
+name = "funty"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8"
+
[[package]]
name = "futures-channel"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151"
+checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
dependencies = [
"futures-core",
]
[[package]]
name = "futures-core"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46"
+checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
[[package]]
name = "futures-io"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b"
+checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
[[package]]
name = "futures-sink"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11"
+checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
[[package]]
name = "futures-task"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c"
+checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
dependencies = [
"once_cell",
]
[[package]]
name = "futures-util"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34"
+checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
dependencies = [
"futures-core",
"futures-io",
"futures-task",
"memchr",
- "pin-project 1.0.1",
+ "pin-project 1.0.2",
"pin-utils",
"slab",
]
@@ -543,7 +586,7 @@ dependencies = [
"httparse",
"httpdate",
"itoa",
- "pin-project 1.0.1",
+ "pin-project 1.0.2",
"socket2",
"tokio",
"tower-service",
@@ -678,6 +721,19 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+[[package]]
+name = "lexical-core"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
+dependencies = [
+ "arrayvec",
+ "bitflags",
+ "cfg-if 0.1.10",
+ "ryu",
+ "static_assertions",
+]
+
[[package]]
name = "libc"
version = "0.2.80"
@@ -790,14 +846,14 @@ dependencies = [
"rand 0.7.3",
"regex",
"serde_json",
- "serde_urlencoded",
+ "serde_urlencoded 0.6.1",
]
[[package]]
name = "native-tls"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a1cda389c26d6b88f3d2dc38aa1b750fe87d298cc5d795ec9e975f402f00372"
+checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f"
dependencies = [
"lazy_static",
"libc",
@@ -859,6 +915,18 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "nom"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
+dependencies = [
+ "bitvec",
+ "lexical-core",
+ "memchr",
+ "version_check",
+]
+
[[package]]
name = "num-traits"
version = "0.2.14"
@@ -880,9 +948,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.4.1"
+version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
[[package]]
name = "opaque-debug"
@@ -954,9 +1022,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba7ae1a2180ed02ddfdb5ab70c70d596a26dd642e097bb6fe78b1bde8588ed97"
+checksum = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9"
[[package]]
name = "paste-impl"
@@ -984,11 +1052,11 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841"
+checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
dependencies = [
- "pin-project-internal 1.0.1",
+ "pin-project-internal 1.0.2",
]
[[package]]
@@ -1004,9 +1072,9 @@ dependencies = [
[[package]]
name = "pin-project-internal"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86"
+checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
dependencies = [
"proc-macro2",
"quote",
@@ -1019,6 +1087,12 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
+[[package]]
+name = "pin-project-lite"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
+
[[package]]
name = "pin-utils"
version = "0.1.0"
@@ -1114,6 +1188,12 @@ dependencies = [
"proc-macro2",
]
+[[package]]
+name = "radium"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
+
[[package]]
name = "rand"
version = "0.4.6"
@@ -1227,9 +1307,9 @@ dependencies = [
[[package]]
name = "reqwest"
-version = "0.10.8"
+version = "0.10.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e"
+checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce"
dependencies = [
"base64",
"bytes",
@@ -1248,14 +1328,15 @@ dependencies = [
"mime_guess",
"native-tls",
"percent-encoding",
- "pin-project-lite",
+ "pin-project-lite 0.2.0",
"serde",
- "serde_urlencoded",
+ "serde_urlencoded 0.7.0",
"tokio",
"tokio-tls",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
+ "wasm-bindgen-test",
"web-sys",
"winreg",
]
@@ -1299,6 +1380,12 @@ dependencies = [
"winapi 0.3.9",
]
+[[package]]
+name = "scoped-tls"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+
[[package]]
name = "security-framework"
version = "2.0.0"
@@ -1381,6 +1468,18 @@ dependencies = [
"url",
]