From 719ee07bccb3be1320fa8e7934cee01672b31b16 Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Sat, 3 Feb 2024 23:06:11 +0800 Subject: [PATCH] chore: env_logger pushed MSRV to v1.71 --- .github/workflows/build-msrv.yml | 6 ++-- Cargo.lock | 40 +++++++++++++-------------- Cargo.toml | 4 +-- crates/shadowsocks-service/Cargo.toml | 3 +- crates/shadowsocks/Cargo.toml | 3 +- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build-msrv.yml b/.github/workflows/build-msrv.yml index f390ccc5..3ac41592 100644 --- a/.github/workflows/build-msrv.yml +++ b/.github/workflows/build-msrv.yml @@ -26,9 +26,9 @@ jobs: - name: Install Rust run: | rustup set profile minimal - rustup toolchain install 1.64 - rustup default 1.64 - rustup override set 1.64 + rustup toolchain install 1.71 + rustup default 1.71 + rustup override set 1.71 - name: Build with All Features Enabled (Unix) if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }} run: cargo build --verbose --features "local-http-rustls local-redir local-dns local-tun dns-over-tls dns-over-https stream-cipher aead-cipher-extra aead-cipher-2022 aead-cipher-2022-extra security-replay-attack-detect" diff --git a/Cargo.lock b/Cargo.lock index 71bc8944..652ebbca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1108,7 +1108,7 @@ dependencies = [ "tokio-rustls 0.24.1", "tracing", "url", - "webpki-roots 0.25.3", + "webpki-roots 0.25.4", ] [[package]] @@ -1135,7 +1135,7 @@ dependencies = [ "tokio-native-tls", "tokio-rustls 0.24.1", "tracing", - "webpki-roots 0.25.3", + "webpki-roots 0.25.4", ] [[package]] @@ -2256,7 +2256,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.3", + "webpki-roots 0.25.4", "winreg", ] @@ -2373,9 +2373,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.2", "errno", @@ -2405,7 +2405,7 @@ dependencies = [ "log", "ring 0.17.7", "rustls-pki-types", - "rustls-webpki 0.102.1", + "rustls-webpki 0.102.2", "subtle", "zeroize", ] @@ -2456,9 +2456,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" +checksum = "0a716eb65e3158e90e17cd93d855216e27bde02745ab842f2cab4a39dba1bacf" [[package]] name = "rustls-webpki" @@ -2472,9 +2472,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.1" +version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ "ring 0.17.7", "rustls-pki-types", @@ -2656,7 +2656,7 @@ dependencies = [ [[package]] name = "shadowsocks" -version = "1.17.2" +version = "1.18.0" dependencies = [ "aes", "arc-swap", @@ -2722,7 +2722,7 @@ dependencies = [ [[package]] name = "shadowsocks-rust" -version = "1.17.2" +version = "1.18.0" dependencies = [ "base64", "build-time", @@ -2760,7 +2760,7 @@ dependencies = [ [[package]] name = "shadowsocks-service" -version = "1.17.2" +version = "1.18.0" dependencies = [ "arc-swap", "async-trait", @@ -2798,7 +2798,7 @@ dependencies = [ "tokio-native-tls", "tokio-rustls 0.25.0", "tun", - "webpki-roots 0.26.0", + "webpki-roots 0.26.1", "windows-sys 0.52.0", ] @@ -3076,9 +3076,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -3434,15 +3434,15 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" dependencies = [ "rustls-pki-types", ] diff --git a/Cargo.toml b/Cargo.toml index c587f296..6d117009 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shadowsocks-rust" -version = "1.17.2" +version = "1.18.0" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." repository = "https://github.com/shadowsocks/shadowsocks-rust" @@ -9,7 +9,7 @@ documentation = "https://docs.rs/shadowsocks-rust" keywords = ["shadowsocks", "proxy", "socks", "socks5", "firewall"] license = "MIT" edition = "2021" -rust-version = "1.64" +rust-version = "1.71" [badges] maintenance = { status = "passively-maintained" } diff --git a/crates/shadowsocks-service/Cargo.toml b/crates/shadowsocks-service/Cargo.toml index b4a2bf7d..613c4ef3 100644 --- a/crates/shadowsocks-service/Cargo.toml +++ b/crates/shadowsocks-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shadowsocks-service" -version = "1.17.2" +version = "1.18.0" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." repository = "https://github.com/shadowsocks/shadowsocks-rust" @@ -9,6 +9,7 @@ documentation = "https://docs.rs/shadowsocks-service" keywords = ["shadowsocks", "proxy", "socks", "socks5", "firewall"] license = "MIT" edition = "2021" +rust-version = "1.71" [badges] maintenance = { status = "passively-maintained" } diff --git a/crates/shadowsocks/Cargo.toml b/crates/shadowsocks/Cargo.toml index 80e7e607..8354b644 100644 --- a/crates/shadowsocks/Cargo.toml +++ b/crates/shadowsocks/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shadowsocks" -version = "1.17.2" +version = "1.18.0" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." repository = "https://github.com/shadowsocks/shadowsocks-rust" @@ -9,6 +9,7 @@ documentation = "https://docs.rs/shadowsocks-core" keywords = ["shadowsocks", "proxy", "socks", "socks5", "firewall"] license = "MIT" edition = "2021" +rust-version = "1.71" [badges] maintenance = { status = "passively-maintained" }