warp-tech/warpgate
1
1
Fork 0
mirror of https://github.com/warp-tech/warpgate.git synced 2024-09-20 06:46:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into mysql

Browse source
This commit is contained in:
Eugene Pankov 2022-07-19 22:37:26 +02:00
parent 1b747e136b 0e5ad669d0
commit b6452ae0a3
No known key found for this signature in database
GPG key ID: 5896FCBBDD1CF4F4
8 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Cargo.lock generated
View file

@ -3853,10 +3853,11 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.19.2" version = "1.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e"
dependencies = [ dependencies = [
"autocfg",
"bytes", "bytes",
"libc", "libc",
"memchr", "memchr",
@ -3926,9 +3927,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-tungstenite" name = "tokio-tungstenite"
version = "0.17.1" version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae" checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"log", "log",
@ -4143,9 +4144,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]] [[package]]
name = "tungstenite" name = "tungstenite"
version = "0.17.2" version = "0.17.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
dependencies = [ dependencies = [
"base64", "base64",
"byteorder", "byteorder",

2
warpgate-admin/Cargo.toml
View file

@ -34,7 +34,7 @@ sea-orm = { version = "^0.9", features = [
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
thiserror = "1.0" thiserror = "1.0"
tokio = { version = "1.19", features = ["tracing"] } tokio = {version = "1.20", features = ["tracing"]}
tracing = "0.1" tracing = "0.1"
uuid = { version = "1.0", features = ["v4", "serde"] } uuid = { version = "1.0", features = ["v4", "serde"] }
warpgate-common = { version = "*", path = "../warpgate-common" } warpgate-common = { version = "*", path = "../warpgate-common" }

2
warpgate-common/Cargo.toml
View file

@ -25,7 +25,7 @@ sea-orm = {version = "^0.9", features = ["sqlx-sqlite", "runtime-tokio-native-tl
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
thiserror = "1.0" thiserror = "1.0"
tokio = {version = "1.19", features = ["tracing"]} tokio = {version = "1.20", features = ["tracing"]}
totp-rs = {version = "2.0", features = ["otpauth"]} totp-rs = {version = "2.0", features = ["otpauth"]}
tracing = "0.1" tracing = "0.1"
tracing-core = "0.1" tracing-core = "0.1"

2
warpgate-database-protocols/Cargo.toml
View file

@ -12,7 +12,7 @@ authors = [
] ]
[dependencies] [dependencies]
tokio = { version = "1.19", features = ["io-util"] } tokio = { version = "1.20", features = ["io-util"] }
bitflags = { version = "1.3", default-features = false } bitflags = { version = "1.3", default-features = false }
bytes = "1.1" bytes = "1.1"
futures-core = { version = "0.3", default-features = false } futures-core = { version = "0.3", default-features = false }

2
warpgate-protocol-http/Cargo.toml
View file

@ -18,7 +18,7 @@ poem-openapi = {version = "^2.0.4", features = ["swagger-ui"]}
reqwest = {version = "0.11", features = ["rustls-tls-native-roots", "stream"]} reqwest = {version = "0.11", features = ["rustls-tls-native-roots", "stream"]}
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
tokio = {version = "1.19", features = ["tracing", "signal"]} tokio = {version = "1.20", features = ["tracing", "signal"]}
tokio-tungstenite = {version = "0.17", features = ["rustls-tls-native-roots"]} tokio-tungstenite = {version = "0.17", features = ["rustls-tls-native-roots"]}
tracing = "0.1" tracing = "0.1"
warpgate-admin = {version = "*", path = "../warpgate-admin"} warpgate-admin = {version = "*", path = "../warpgate-admin"}

2
warpgate-protocol-mysql/Cargo.toml
View file

@ -11,7 +11,7 @@ warpgate-db-entities = { version = "*", path = "../warpgate-db-entities" }
warpgate-database-protocols = { version = "*", path = "../warpgate-database-protocols" } warpgate-database-protocols = { version = "*", path = "../warpgate-database-protocols" }
anyhow = { version = "1.0", features = ["std"] } anyhow = { version = "1.0", features = ["std"] }
async-trait = "0.1" async-trait = "0.1"
tokio = { version = "1.19", features = ["tracing", "signal"] } tokio = { version = "1.20", features = ["tracing", "signal"] }
tracing = "0.1" tracing = "0.1"
uuid = { version = "1.0", features = ["v4"] } uuid = { version = "1.0", features = ["v4"] }
bytes = "1.1" bytes = "1.1"

2
warpgate-protocol-ssh/Cargo.toml
View file

@ -17,7 +17,7 @@ russh-keys = {version = "0.22.0-beta.3", features = ["openssl"]}
sea-orm = {version = "^0.9", features = ["runtime-tokio-native-tls"], default-features = false} sea-orm = {version = "^0.9", features = ["runtime-tokio-native-tls"], default-features = false}
thiserror = "1.0" thiserror = "1.0"
time = "0.3" time = "0.3"
tokio = {version = "1.19", features = ["tracing", "signal"]} tokio = {version = "1.20", features = ["tracing", "signal"]}
tracing = "0.1" tracing = "0.1"
uuid = {version = "1.0", features = ["v4"]} uuid = {version = "1.0", features = ["v4"]}
warpgate-common = {version = "*", path = "../warpgate-common"} warpgate-common = {version = "*", path = "../warpgate-common"}

2
warpgate/Cargo.toml
View file

@ -24,7 +24,7 @@ qrcode = "0.12"
rcgen = {version = "0.9", features = ["zeroize"]} rcgen = {version = "0.9", features = ["zeroize"]}
serde_yaml = "0.8.23" serde_yaml = "0.8.23"
time = "0.3" time = "0.3"
tokio = {version = "1.19", features = ["tracing", "signal", "macros"]} tokio = {version = "1.20", features = ["tracing", "signal", "macros"]}
tracing = "0.1" tracing = "0.1"
tracing-subscriber = {version = "0.3", features = ["env-filter", "local-time"]} tracing-subscriber = {version = "0.3", features = ["env-filter", "local-time"]}
warpgate-admin = {version = "*", path = "../warpgate-admin"} warpgate-admin = {version = "*", path = "../warpgate-admin"}