From 09623d1cae704fe5a847b23e30860a1bf9bedb8b Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 16 Sep 2023 14:04:36 -0400 Subject: [PATCH] Revert "version bump fix" This reverts commit 2d291b86b64542845bc10c092e8ad6a78e8b85df. --- .bumpversion.cfg | 2 +- Cargo.lock | 114 +++++++++++---------------------- veilid-cli/Cargo.toml | 2 +- veilid-core/Cargo.toml | 2 +- veilid-flutter/pubspec.yaml | 2 +- veilid-flutter/rust/Cargo.toml | 2 +- veilid-python/pyproject.toml | 2 +- veilid-server/Cargo.toml | 2 +- veilid-tools/Cargo.toml | 2 +- veilid-wasm/Cargo.toml | 2 +- version_bump.sh | 4 +- 11 files changed, 47 insertions(+), 89 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 89f06175..824c0b03 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.2 +current_version = 0.2.1 [bumpversion:file:veilid-server/Cargo.toml] search = name = "veilid-server" diff --git a/Cargo.lock b/Cargo.lock index 45843680..4ad66551 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -439,18 +439,6 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" -[[package]] -name = "async-tls" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e7fbc0843fc5ad3d5ca889c5b2bea9130984d34cd0e62db57ab70c2529a8e3" -dependencies = [ - "futures", - "rustls 0.18.1", - "webpki 0.21.4", - "webpki-roots 0.20.0", -] - [[package]] name = "async-tls" version = "0.12.0" @@ -459,9 +447,9 @@ checksum = "cfeefd0ca297cbbb3bd34fd6b228401c2a5177038257afd751bc29f0a2da4795" dependencies = [ "futures-core", "futures-io", - "rustls 0.20.9", + "rustls", "rustls-pemfile", - "webpki 0.22.1", + "webpki", "webpki-roots 0.22.6", ] @@ -482,7 +470,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5c45a0dd44b7e6533ac4e7acc38ead1a3b39885f5bbb738140d30ea528abc7c" dependencies = [ - "async-tls 0.9.0", "futures-io", "futures-util", "log", @@ -496,7 +483,7 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" dependencies = [ - "async-tls 0.12.0", + "async-tls", "futures-io", "futures-util", "log", @@ -2170,6 +2157,19 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "grpcio" version = "0.9.1" @@ -4218,19 +4218,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "rustls" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" -dependencies = [ - "base64 0.12.3", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - [[package]] name = "rustls" version = "0.20.9" @@ -4239,8 +4226,8 @@ checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.1", + "sct", + "webpki", ] [[package]] @@ -4309,16 +4296,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sct" version = "0.7.0" @@ -5417,7 +5394,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0" dependencies = [ - "gloo-utils", + "gloo-utils 0.1.7", "serde", "serde-wasm-bindgen", "serde_json", @@ -5603,7 +5580,7 @@ checksum = "a9ee584edf237fac328b891dd06c21e7914a1db3762907edc366a13803451fe3" [[package]] name = "veilid-cli" -version = "0.2.2" +version = "0.2.1" dependencies = [ "arboard", "async-std", @@ -5625,7 +5602,7 @@ dependencies = [ "indent", "json", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "serde", "serde_derive", "serial_test 0.10.0", @@ -5639,14 +5616,14 @@ dependencies = [ [[package]] name = "veilid-core" -version = "0.2.2" +version = "0.2.1" dependencies = [ "argon2", "async-io", "async-lock", "async-std", "async-std-resolver", - "async-tls 0.12.0", + "async-tls", "async-tungstenite 0.23.0", "async_executors", "backtrace", @@ -5698,7 +5675,7 @@ dependencies = [ "range-set-blaze", "rtnetlink", "rusqlite", - "rustls 0.20.9", + "rustls", "rustls-pemfile", "schemars", "send_wrapper 0.6.0", @@ -5733,7 +5710,7 @@ dependencies = [ "wasm-logger", "weak-table", "web-sys", - "webpki 0.22.1", + "webpki", "webpki-roots 0.25.2", "wee_alloc", "winapi", @@ -5745,7 +5722,7 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.2.2" +version = "0.2.1" dependencies = [ "allo-isolate", "async-std", @@ -5760,7 +5737,7 @@ dependencies = [ "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "serde", "serde_json", "tokio", @@ -5797,11 +5774,11 @@ dependencies = [ [[package]] name = "veilid-server" -version = "0.2.2" +version = "0.2.1" dependencies = [ "ansi_term", "async-std", - "async-tungstenite 0.8.0", + "async-tungstenite 0.23.0", "backtrace", "cfg-if 1.0.0", "clap 4.4.3", @@ -5816,11 +5793,11 @@ dependencies = [ "hostname", "json", "lazy_static", - "nix 0.22.3", + "nix 0.27.1", "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "rpassword", "serde", "serde_derive", @@ -5847,7 +5824,7 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.2.2" +version = "0.2.1" dependencies = [ "android_logger 0.13.3", "async-lock", @@ -5899,17 +5876,17 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.2.2" +version = "0.2.1" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", "data-encoding", "futures-util", - "gloo-utils", + "gloo-utils 0.2.0", "js-sys", "lazy_static", "parking_lot 0.12.1", - "send_wrapper 0.4.0", + "send_wrapper 0.6.0", "serde", "serde-wasm-bindgen", "serde_json", @@ -6092,16 +6069,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki" version = "0.22.1" @@ -6112,22 +6079,13 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" -dependencies = [ - "webpki 0.21.4", -] - [[package]] name = "webpki-roots" version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.1", + "webpki", ] [[package]] diff --git a/veilid-cli/Cargo.toml b/veilid-cli/Cargo.toml index 71ae433a..a3b39d02 100644 --- a/veilid-cli/Cargo.toml +++ b/veilid-cli/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-cli" -version = "0.2.2" +version = "0.2.1" # --- authors = ["Veilid Team "] edition = "2021" diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index f5d7cf00..c4d5d338 100644 --- a/veilid-core/Cargo.toml +++ b/veilid-core/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-core" -version = "0.2.2" +version = "0.2.1" # --- description = "Core library used to create a Veilid node and operate it as part of an application" authors = ["Veilid Team "] diff --git a/veilid-flutter/pubspec.yaml b/veilid-flutter/pubspec.yaml index edaf48c6..afda391d 100644 --- a/veilid-flutter/pubspec.yaml +++ b/veilid-flutter/pubspec.yaml @@ -1,6 +1,6 @@ # --- Bumpversion match - do not reorder name: veilid -version: 0.2.2 +version: 0.2.1 # --- description: Veilid Framework homepage: https://veilid.com diff --git a/veilid-flutter/rust/Cargo.toml b/veilid-flutter/rust/Cargo.toml index 821e7978..df806257 100644 --- a/veilid-flutter/rust/Cargo.toml +++ b/veilid-flutter/rust/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-flutter" -version = "0.2.2" +version = "0.2.1" # --- authors = ["Veilid Team "] license = "MPL-2.0" diff --git a/veilid-python/pyproject.toml b/veilid-python/pyproject.toml index a6a96c53..19a71176 100644 --- a/veilid-python/pyproject.toml +++ b/veilid-python/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] # --- Bumpversion match - do not reorder name = "veilid" -version = "0.2.2" +version = "0.2.1" # --- description = "" authors = ["Veilid Team "] diff --git a/veilid-server/Cargo.toml b/veilid-server/Cargo.toml index 028b289e..66ea0b0c 100644 --- a/veilid-server/Cargo.toml +++ b/veilid-server/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-server" -version = "0.2.2" +version = "0.2.1" # --- description = "Veilid Server" authors = ["Veilid Team "] diff --git a/veilid-tools/Cargo.toml b/veilid-tools/Cargo.toml index 726826a1..e9333b9e 100644 --- a/veilid-tools/Cargo.toml +++ b/veilid-tools/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-tools" -version = "0.2.2" +version = "0.2.1" # --- description = "A collection of baseline tools for Rust development use by Veilid and Veilid-enabled Rust applications" authors = ["Veilid Team "] diff --git a/veilid-wasm/Cargo.toml b/veilid-wasm/Cargo.toml index c4acf2bd..2abb4c45 100644 --- a/veilid-wasm/Cargo.toml +++ b/veilid-wasm/Cargo.toml @@ -1,7 +1,7 @@ [package] # --- Bumpversion match - do not reorder name = "veilid-wasm" -version = "0.2.2" +version = "0.2.1" # --- authors = ["Veilid Team "] license = "MPL-2.0" diff --git a/version_bump.sh b/version_bump.sh index 58bd228f..2166527e 100755 --- a/version_bump.sh +++ b/version_bump.sh @@ -25,8 +25,8 @@ NEW_VERSION=$(cat .bumpversion.cfg | grep current_version\ = | cut -d\ -f3) echo NEW_VERSION=$NEW_VERSION # Update crate dependencies for the crates we publish -cargo upgrade -p veilid-tools@$NEW_VERSION -cargo upgrade -p veilid-core@$NEW_VERSION +cargo upgrade veilid-tools@$NEW_VERSION +cargo upgrade veilid-core@$NEW_VERSION # Update lockfile cargo update \ No newline at end of file