diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e3ae1f5d..16ad022b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,6 +1,34 @@ [bumpversion] -current_version = 0.1.0 +current_version = 0.1.1 -[bumpversion:file:Cargo.toml] +[bumpversion:file:veilid-server/Cargo.toml] search = version = "{current_version}" -replace = version = "{new_version}" \ No newline at end of file +replace = version = "{new_version}" + +[bumpversion:file:veilid-flutter/rust/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:veilid-wasm/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:veilid-core/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:veilid-cli/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:veilid-tools/Cargo.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:veilid-python/pyproject.toml] +search = version = "{current_version}" +replace = version = "{new_version}" + +[bumpversion:file:veilid-flutter/pubspec.yaml] +search = version: {current_version} +replace = version: {new_version} diff --git a/Cargo.lock b/Cargo.lock index 25dd43f2..9088eb4c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -390,6 +390,18 @@ 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.11.0" @@ -434,6 +446,7 @@ 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", @@ -4169,6 +4182,19 @@ 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.19.1" @@ -5788,7 +5814,7 @@ version = "0.1.0" dependencies = [ "ansi_term", "async-std", - "async-tungstenite 0.22.2", + "async-tungstenite 0.8.0", "backtrace", "bugsalot", "cfg-if 1.0.0", @@ -5804,11 +5830,11 @@ dependencies = [ "hostname", "json", "lazy_static", - "nix 0.26.2", + "nix 0.22.3", "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "parking_lot 0.12.1", + "parking_lot 0.11.2", "rpassword", "serde", "serde_derive", @@ -6101,6 +6127,15 @@ 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.21.1" diff --git a/RELEASING.md b/RELEASING.md index 0259c867..f866b5ae 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -76,5 +76,5 @@ All versions of Veilid Rust crates as well as `veilid-python` and `veilid-flutte * MINOR version when you add functionality in a backward compatible manner * PATCH version when you make backward compatible bug fixes -The default 'version_bump.sh' script should be run on every release to stable. All of the Rust crates are versioned together and should have the same version, as well as the `veilid-python` Python package and `veilid-flutter` Flutter plugin. +The `version_bump.sh` script should be run on every release to stable. All of the Rust crates are versioned together and should have the same version, as well as the `veilid-python` Python package and `veilid-flutter` Flutter plugin. diff --git a/setup_linux.sh b/setup_linux.sh index 54d9a26c..cd629446 100755 --- a/setup_linux.sh +++ b/setup_linux.sh @@ -97,7 +97,7 @@ fi rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android wasm32-unknown-unknown # install cargo packages -cargo install wasm-bindgen-cli wasm-pack cargo-edit +cargo install wasm-bindgen-cli wasm-pack # install pip packages pip3 install --upgrade bumpversion diff --git a/setup_macos.sh b/setup_macos.sh index 790eee62..3f37caec 100755 --- a/setup_macos.sh +++ b/setup_macos.sh @@ -132,7 +132,7 @@ $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager build-tools\;33.0.1 ndk\;2 rustup target add aarch64-apple-darwin aarch64-apple-ios x86_64-apple-darwin x86_64-apple-ios wasm32-unknown-unknown aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android # install cargo packages -cargo install wasm-bindgen-cli wasm-pack cargo-edit +cargo install wasm-bindgen-cli wasm-pack # install pip packages pip3 install --upgrade bumpversion diff --git a/veilid-cli/Cargo.toml b/veilid-cli/Cargo.toml index 781ee798..1b8c3c52 100644 --- a/veilid-cli/Cargo.toml +++ b/veilid-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veilid-cli" -version = "0.1.0" +version = "0.1.1" authors = ["John Smith "] edition = "2021" license = "LGPL-2.0-or-later OR MPL-2.0 OR (MIT AND BSD-3-Clause)" diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index 3af4b7a8..bc2380c4 100644 --- a/veilid-core/Cargo.toml +++ b/veilid-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veilid-core" -version = "0.1.0" +version = "0.1.1" authors = ["John Smith "] edition = "2021" build = "build.rs" diff --git a/veilid-flutter/pubspec.yaml b/veilid-flutter/pubspec.yaml index 98bdeddc..a7611f81 100644 --- a/veilid-flutter/pubspec.yaml +++ b/veilid-flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: veilid description: Veilid Network -version: 0.1.0 +version: 0.1.1 homepage: https://veilid.com publish_to: "none" # Remove this line if you wish to publish to pub.dev diff --git a/veilid-flutter/rust/Cargo.toml b/veilid-flutter/rust/Cargo.toml index 002db7da..3c4acd8c 100644 --- a/veilid-flutter/rust/Cargo.toml +++ b/veilid-flutter/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veilid-flutter" -version = "0.1.0" +version = "0.1.1" edition = "2021" [lib] diff --git a/veilid-python/pyproject.toml b/veilid-python/pyproject.toml index 1bb32e8d..8f193362 100644 --- a/veilid-python/pyproject.toml +++ b/veilid-python/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "veilid" -version = "0.1.0" +version = "0.1.1" description = "" authors = ["Veilid Team "] readme = "README.md" diff --git a/veilid-server/Cargo.toml b/veilid-server/Cargo.toml index a2193b74..619adda2 100644 --- a/veilid-server/Cargo.toml +++ b/veilid-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veilid-server" -version = "0.1.0" +version = "0.1.1" authors = ["John Smith "] edition = "2021" license = "LGPL-2.0-or-later OR MPL-2.0 OR (MIT AND BSD-3-Clause)" diff --git a/veilid-tools/Cargo.toml b/veilid-tools/Cargo.toml index 94c6be7a..0232e04d 100644 --- a/veilid-tools/Cargo.toml +++ b/veilid-tools/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veilid-tools" -version = "0.1.0" +version = "0.1.1" authors = ["John Smith "] edition = "2021" license = "LGPL-2.0-or-later OR MPL-2.0 OR (MIT AND BSD-3-Clause)" diff --git a/veilid-wasm/Cargo.toml b/veilid-wasm/Cargo.toml index dfe6820c..757e93f2 100644 --- a/veilid-wasm/Cargo.toml +++ b/veilid-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "veilid-wasm" -version = "0.1.0" +version = "0.1.1" authors = ["John Smith "] edition = "2021" license = "LGPL-2.0-or-later OR MPL-2.0 OR (MIT AND BSD-3-Clause)" diff --git a/version_bump.sh b/version_bump.sh index 5be30d80..aaccf339 100755 --- a/version_bump.sh +++ b/version_bump.sh @@ -15,7 +15,5 @@ else exit 1 fi -CARGO_TOMLS=$(find . -name Cargo.toml -not -path ./external/\* -not -path ./Cargo.toml | xargs) - -bumpversion --dry-run $PART $CARGO_TOMLS ./veilid-python/pyproject.toml ./veilid-flutter/pubspec.yaml +bumpversion $PART