aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuwn <[email protected]>2021-09-01 14:23:36 -0700
committerFuwn <[email protected]>2021-09-01 14:23:36 -0700
commita3e5cd759d6bf75f792825bfbbe64f19f2a6864d (patch)
tree4378e6022584a108d73103fd6739aef495f9a6e9
parentchore(make): only run necessary components (diff)
parentMerge pull request #87 from Whirlsplash/renovate/tokio-1.x (diff)
downloadwhirl-a3e5cd759d6bf75f792825bfbbe64f19f2a6864d.tar.xz
whirl-a3e5cd759d6bf75f792825bfbbe64f19f2a6864d.zip
Merge branch 'develop' of https://github.com/Whirlsplash/whirl into develop
-rw-r--r--README.rst3
-rw-r--r--crates/whirl/Cargo.toml14
-rw-r--r--crates/whirl_api/Cargo.toml10
-rw-r--r--crates/whirl_config/Cargo.toml4
-rw-r--r--crates/whirl_prompt/Cargo.toml2
-rw-r--r--crates/whirl_server/Cargo.toml8
-rw-r--r--package.json2
-rw-r--r--yarn.lock8
8 files changed, 26 insertions, 25 deletions
diff --git a/README.rst b/README.rst
index 64d94d0..13cb0d5 100644
--- a/README.rst
+++ b/README.rst
@@ -8,7 +8,8 @@
width="220">
</a>
</p>
- <h1 align="center">The Open-Source WorldServer.</h1>
+ <h1 align="center">The Open-Source WorldServer</h1>
+ <h3 align="center">A Worlds united</h3>
<p align="center">
diff --git a/crates/whirl/Cargo.toml b/crates/whirl/Cargo.toml
index d9405f0..932d1e4 100644
--- a/crates/whirl/Cargo.toml
+++ b/crates/whirl/Cargo.toml
@@ -18,7 +18,7 @@ dotenv = "0.15.0"
# Logging
log = "0.4.14"
-flexi_logger = "0.18.0"
+flexi_logger = "0.18.1"
human-panic = "1.0.3"
# simple-error = "0.2.3"
@@ -28,21 +28,21 @@ async-trait = "0.1.51"
whirl_common = { path = "../whirl_common" }
# Byte Manipulation
-bytes = "1.0.1"
+bytes = "1.1.0"
byteorder = "1.4.3"
# Serialization
-serde = "1.0.127"
-serde_derive = "1.0.127"
+serde = "1.0.130"
+serde_derive = "1.0.130"
# CLI
-structopt = "0.3.22"
+structopt = "0.3.23"
# Config
whirl_config = { path = "../whirl_config" }
# TCP
-tokio = { version = "1.10.0", features = ["full"] }
+tokio = { version = "1.11.0", features = ["full"] }
tokio-util = { version = "0.6.7", features = ["codec"] }
tokio-stream = "0.1.7"
@@ -65,4 +65,4 @@ mimalloc = { version = "0.1.26", default-features = false }
jemallocator = "0.3.2"
# Signal
-signal-hook = "0.3.9"
+signal-hook = "0.3.10"
diff --git a/crates/whirl_api/Cargo.toml b/crates/whirl_api/Cargo.toml
index 9467d72..6373f1b 100644
--- a/crates/whirl_api/Cargo.toml
+++ b/crates/whirl_api/Cargo.toml
@@ -17,18 +17,18 @@ publish = false
actix-web = { version = "3.3.2", features = ["rustls"] }
actix-cors = "0.5.4"
axum = "0.1.3"
-hyper = "0.14.11"
+hyper = "0.14.12"
# Utility
-sysinfo = "0.20.0"
+sysinfo = "0.20.2"
whirl_common = { path = "../whirl_common" }
-tokio = { version = "1.10.0", features = ["full"] }
+tokio = { version = "1.11.0", features = ["full"] }
num-traits = "0.2.14"
qstring = "0.7.2"
# Serialization
-serde = "1.0.127"
-serde_derive = "1.0.127"
+serde = "1.0.130"
+serde_derive = "1.0.130"
# Logging
log = "0.4.14"
diff --git a/crates/whirl_config/Cargo.toml b/crates/whirl_config/Cargo.toml
index 22dfd86..476166e 100644
--- a/crates/whirl_config/Cargo.toml
+++ b/crates/whirl_config/Cargo.toml
@@ -17,8 +17,8 @@ publish = false
config = "0.11.0"
# Serialization
-serde = "1.0.127"
-serde_derive = "1.0.127"
+serde = "1.0.130"
+serde_derive = "1.0.130"
# Logging
log = "0.4.14"
diff --git a/crates/whirl_prompt/Cargo.toml b/crates/whirl_prompt/Cargo.toml
index 788ff25..a5f8838 100644
--- a/crates/whirl_prompt/Cargo.toml
+++ b/crates/whirl_prompt/Cargo.toml
@@ -14,7 +14,7 @@ publish = false
[dependencies]
# Utility
-sysinfo = "0.20.0"
+sysinfo = "0.20.2"
colour = "0.6.0"
# Config
diff --git a/crates/whirl_server/Cargo.toml b/crates/whirl_server/Cargo.toml
index 5d766f5..898a178 100644
--- a/crates/whirl_server/Cargo.toml
+++ b/crates/whirl_server/Cargo.toml
@@ -22,15 +22,15 @@ num-traits = "0.2.14"
num-derive = "0.3.3"
# Byte Manipulation
-bytes = "1.0.1"
+bytes = "1.1.0"
byteorder = "1.4.3"
# Serialization
-serde = "1.0.127"
-serde_derive = "1.0.127"
+serde = "1.0.130"
+serde_derive = "1.0.130"
# TCP
-tokio = { version = "1.10.0", features = ["full"] }
+tokio = { version = "1.11.0", features = ["full"] }
tokio-util = { version = "0.6.7", features = ["codec"] }
tokio-stream = "0.1.7"
diff --git a/package.json b/package.json
index 8b7d260..0d8cc36 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,6 @@
"@commitlint/config-conventional": "13.1.0",
"commitizen": "4.2.4",
"cz-conventional-changelog": "3.3.0",
- "husky": "7.0.1"
+ "husky": "7.0.2"
}
}
diff --git a/yarn.lock b/yarn.lock
index 6f8ee57..13c5095 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -775,10 +775,10 @@ human-signals@^2.1.0:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.1.tgz#579f4180b5da4520263e8713cc832942b48e1f1c"
- integrity sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.2.tgz#21900da0f30199acca43a46c043c4ad84ae88dff"
+ integrity sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg==
iconv-lite@^0.4.24:
version "0.4.24"