Skip to content

Commit

Permalink
Upgrades workspace dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@azriel91
azriel91 committed Sep 25, 2020
1 parent dbc9a09 commit d2d673c
Show file tree
Hide file tree
Showing 80 changed files with 214 additions and 214 deletions.
6 changes: 3 additions & 3 deletions app/session_server/Cargo.toml
View file
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
amethyst = { git = "https://github.com/amethyst/amethyst.git", branch = "wasm", default-features = false, features = ["network", "web_socket"] }
bimap = "0.4.0"
bimap = "0.5.2"
bincode = "1.3.1"
derivative = "2.1.1"
derive-new = "0.5.8"
Expand All @@ -22,8 +22,8 @@ serde_yaml = "0.8.13"
session_host_model = { path = "../../crate/session_host_model" }
session_join_model = { path = "../../crate/session_join_model" }
session_lobby_model = { path = "../../crate/session_lobby_model" }
structopt = "0.3.15"
structopt-derive = "0.4.8"
structopt = "0.3.18"
structopt-derive = "0.4.11"

[features]
# We use `"gl"` because `clippy` is run from the workspace root, and we cannot control features at that level,
Expand Down
10 changes: 5 additions & 5 deletions app/will/Cargo.toml
View file
Expand Up @@ -48,7 +48,7 @@ network_session_model = { path = "../../crate/network_session_model" }
network_session_play = { path = "../../crate/network_session_play" }
parent_play = { path = "../../crate/parent_play" }
sequence_loading = { path = "../../crate/sequence_loading" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
serde_yaml = "0.8.13"
session_host_play = { path = "../../crate/session_host_play" }
session_host_stdio = { path = "../../crate/session_host_stdio" }
Expand All @@ -63,8 +63,8 @@ state_registry = { path = "../../crate/state_registry" }
stdio_command_stdio = { path = "../../crate/stdio_command_stdio" }
stdio_input = { path = "../../crate/stdio_input" }
stdio_spi = { path = "../../crate/stdio_spi" }
structopt = "0.3.15"
structopt-derive = "0.4.8"
structopt = "0.3.18"
structopt-derive = "0.4.11"
structopt-toml = "0.4.5"
tracker = { path = "../../crate/tracker" }
ui_audio_loading = { path = "../../crate/ui_audio_loading" }
Expand All @@ -73,8 +73,8 @@ ui_play = { path = "../../crate/ui_play" }

[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.6"
wasm-bindgen = "0.2.65"
web-sys = { version = "0.3.42", features = ["ErrorEvent", "MessageEvent", "WebSocket"] }
wasm-bindgen = "0.2.68"
web-sys = { version = "0.3.45", features = ["ErrorEvent", "MessageEvent", "WebSocket"] }

[dev-dependencies]
assert_cmd = "1.0.1"
Expand Down
4 changes: 2 additions & 2 deletions crate/application/Cargo.toml
View file
Expand Up @@ -13,8 +13,8 @@ amethyst = { git = "https://github.com/amethyst/amethyst.git", branch = "wasm",
derivative = "2.1.1"
derive-new = "0.5.8"
log = "0.4.11"
ron = "0.5.1"
serde = { version = "1.0.114", features = ["derive"] }
ron = "0.6.2"
serde = { version = "1.0.116", features = ["derive"] }
serde_yaml = "0.8.13"

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions crate/application_event/Cargo.toml
View file
Expand Up @@ -12,7 +12,7 @@ test = false
amethyst = { git = "https://github.com/amethyst/amethyst.git", branch = "wasm", default-features = false, features = ["audio", "network", "renderer", "no-slow-safety-checks", "test-support", "wav", "web_socket"] }
asset_selection_model = { path = "../asset_selection_model" }
control_settings_model = { path = "../control_settings_model" }
derive_more = "0.99.9"
derive_more = "0.99.10"
game_input_model = { path = "../game_input_model" }
game_mode_selection_model = { path = "../game_mode_selection_model" }
game_play_model = { path = "../game_play_model" }
Expand All @@ -21,5 +21,5 @@ session_host_model = { path = "../session_host_model" }
session_join_model = { path = "../session_join_model" }
session_lobby_model = { path = "../session_lobby_model" }
stdio_command_model = { path = "../stdio_command_model" }
strum = "0.18.0"
strum_macros = "0.18.0"
strum = "0.19.2"
strum_macros = "0.19.2"
2 changes: 1 addition & 1 deletion crate/application_menu/Cargo.toml
View file
Expand Up @@ -11,4 +11,4 @@ test = false
[dependencies]
game_mode_selection_model = { path = "../game_mode_selection_model" }
network_mode_selection_model = { path = "../network_mode_selection_model" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
6 changes: 3 additions & 3 deletions crate/application_ui/Cargo.toml
View file
Expand Up @@ -12,6 +12,6 @@ test = false
amethyst = { git = "https://github.com/amethyst/amethyst.git", branch = "wasm", default-features = false, features = ["audio", "network", "renderer", "no-slow-safety-checks", "test-support", "wav", "web_socket"] }
application = { path = "../application" }
derive-new = "0.5.8"
serde = { version = "1.0.114", features = ["derive"] }
strum = "0.18.0"
strum_macros = "0.18.0"
serde = { version = "1.0.116", features = ["derive"] }
strum = "0.19.2"
strum_macros = "0.19.2"
4 changes: 2 additions & 2 deletions crate/asset_derive/Cargo.toml
View file
Expand Up @@ -10,10 +10,10 @@ doctest = true
test = false

[dependencies]
proc-macro2 = "1.0.18"
proc-macro2 = "1.0.22"
proc_macro_roids = "0.7.0"
quote = "1.0.7"
syn = { version = "1.0.34", features = ["extra-traits", "visit"] }
syn = { version = "1.0.41", features = ["extra-traits", "visit"] }

[dev-dependencies]
amethyst = { git = "https://github.com/amethyst/amethyst.git", branch = "wasm", default-features = false, features = ["audio", "network", "renderer", "no-slow-safety-checks", "test-support", "wav", "web_socket"] }
2 changes: 1 addition & 1 deletion crate/asset_gfx_gen/Cargo.toml
View file
Expand Up @@ -11,4 +11,4 @@ test = false
[dependencies]
amethyst = { git = "https://github.com/amethyst/amethyst.git", branch = "wasm", default-features = false, features = ["audio", "network", "renderer", "no-slow-safety-checks", "test-support", "wav", "web_socket"] }
derivative = "2.1.1"
integer-sqrt = "0.1.3"
integer-sqrt = "0.1.5"
4 changes: 2 additions & 2 deletions crate/asset_loading/Cargo.toml
View file
Expand Up @@ -16,9 +16,9 @@ derive-new = "0.5.8"
heck = "0.3.1"
log = "0.4.11"
object_type = { path = "../object_type" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
serde_yaml = "0.8.13"
strum = "0.18.0"
strum = "0.19.2"

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm_support_fs = { path = "../wasm_support_fs" }
8 changes: 4 additions & 4 deletions crate/asset_model/Cargo.toml
View file
Expand Up @@ -15,9 +15,9 @@ derive-new = "0.5.8"
derive_builder = "0.9.0"
derive_deref = "1.1.1"
enum_variant_type = "0.2.0"
indexmap = { version = "1.5.0", features = ["serde-1"] }
indexmap = { version = "1.6.0", features = ["serde-1"] }
object_type = { path = "../object_type" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
slotmap = { version = "0.4.0", features = ["serde"] }
strum = "0.18.0"
strum_macros = "0.18.0"
strum = "0.19.2"
strum_macros = "0.19.2"
6 changes: 3 additions & 3 deletions crate/asset_selection_model/Cargo.toml
View file
Expand Up @@ -12,6 +12,6 @@ test = false
amethyst = { git = "https://github.com/amethyst/amethyst.git", branch = "wasm", default-features = false, features = ["audio", "network", "renderer", "no-slow-safety-checks", "test-support", "wav", "web_socket"] }
asset_model = { path = "../asset_model" }
game_input_model = { path = "../game_input_model" }
serde = { version = "1.0.114", features = ["derive"] }
structopt = "0.3.15"
structopt-derive = "0.4.8"
serde = { version = "1.0.116", features = ["derive"] }
structopt = "0.3.18"
structopt-derive = "0.4.11"
4 changes: 2 additions & 2 deletions crate/asset_selection_ui_model/Cargo.toml
View file
Expand Up @@ -17,12 +17,12 @@ derivative = "2.1.1"
derive-new = "0.5.8"
derive_deref = "1.1.1"
game_input_model = { path = "../game_input_model" }
indexmap = { version = "1.5.0", features = ["serde-1"] }
indexmap = { version = "1.6.0", features = ["serde-1"] }
kinematic_model = { path = "../kinematic_model" }
log = "0.4.11"
object_type = { path = "../object_type" }
parent_model = { path = "../parent_model" }
sequence_model = { path = "../sequence_model" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
sprite_model = { path = "../sprite_model" }
ui_label_model = { path = "../ui_label_model" }
4 changes: 2 additions & 2 deletions crate/asset_ui_model/Cargo.toml
View file
Expand Up @@ -17,7 +17,7 @@ chase_model = { path = "../chase_model" }
derivative = "2.1.1"
derive-new = "0.5.8"
derive_deref = "1.1.1"
indexmap = { version = "1.5.0", features = ["serde-1"] }
indexmap = { version = "1.6.0", features = ["serde-1"] }
kinematic_model = { path = "../kinematic_model" }
log = "0.4.11"
map_model = { path = "../map_model" }
Expand All @@ -26,7 +26,7 @@ object_model = { path = "../object_model" }
object_type = { path = "../object_type" }
parent_model = { path = "../parent_model" }
sequence_model = { path = "../sequence_model" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
spawn_model = { path = "../spawn_model" }
spawn_play = { path = "../spawn_play" }
sprite_model = { path = "../sprite_model" }
Expand Down
2 changes: 1 addition & 1 deletion crate/assets_test/Cargo.toml
View file
Expand Up @@ -13,4 +13,4 @@ test = false
asset_model = { path = "../asset_model" }
lazy_static = "1.4.0"
object_type = { path = "../object_type" }
strum = "0.18.0"
strum = "0.19.2"
2 changes: 1 addition & 1 deletion crate/audio_model/Cargo.toml
View file
Expand Up @@ -17,4 +17,4 @@ derive-new = "0.5.8"
derive_deref = "1.1.1"
sequence_model_derive = { path = "../sequence_model_derive" }
sequence_model_spi = { path = "../sequence_model_spi" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
6 changes: 3 additions & 3 deletions crate/background_model/Cargo.toml
View file
Expand Up @@ -15,9 +15,9 @@ asset_model = { path = "../asset_model" }
derivative = "2.1.1"
derive-new = "0.5.8"
derive_deref = "1.1.1"
derive_more = "0.99.9"
indexmap = { version = "1.5.0", features = ["serde-1"] }
derive_more = "0.99.10"
indexmap = { version = "1.6.0", features = ["serde-1"] }
sequence_model = { path = "../sequence_model" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
slotmap = "0.4.0"
sprite_model = { path = "../sprite_model" }
8 changes: 4 additions & 4 deletions crate/character_model/Cargo.toml
View file
Expand Up @@ -19,7 +19,7 @@ collision_model = { path = "../collision_model" }
derivative = "2.1.1"
derive-new = "0.5.8"
derive_deref = "1.1.1"
derive_more = "0.99.9"
derive_more = "0.99.10"
game_input_model = { path = "../game_input_model" }
input_reaction_model = { path = "../input_reaction_model" }
kinematic_model = { path = "../kinematic_model" }
Expand All @@ -29,9 +29,9 @@ object_type = { path = "../object_type" }
sequence_model = { path = "../sequence_model" }
sequence_model_derive = { path = "../sequence_model_derive" }
sequence_model_spi = { path = "../sequence_model_spi" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
slotmap = { version = "0.4.0", features = ["serde"] }
spawn_model = { path = "../spawn_model" }
sprite_model = { path = "../sprite_model" }
strum = "0.18.0"
strum_macros = "0.18.0"
strum = "0.19.2"
strum_macros = "0.19.2"
6 changes: 3 additions & 3 deletions crate/character_selection_model/Cargo.toml
View file
Expand Up @@ -14,6 +14,6 @@ asset_model = { path = "../asset_model" }
derivative = "2.1.1"
derive-new = "0.5.8"
game_input_model = { path = "../game_input_model" }
serde = { version = "1.0.114", features = ["derive"] }
strum = "0.18.0"
strum_macros = "0.18.0"
serde = { version = "1.0.116", features = ["derive"] }
strum = "0.19.2"
strum_macros = "0.19.2"
4 changes: 2 additions & 2 deletions crate/character_selection_ui_model/Cargo.toml
View file
Expand Up @@ -15,12 +15,12 @@ asset_ui_model = { path = "../asset_ui_model" }
derivative = "2.1.1"
derive-new = "0.5.8"
derive_deref = "1.1.1"
indexmap = { version = "1.5.0", features = ["serde-1"] }
indexmap = { version = "1.6.0", features = ["serde-1"] }
kinematic_model = { path = "../kinematic_model" }
log = "0.4.11"
object_type = { path = "../object_type" }
parent_model = { path = "../parent_model" }
sequence_model = { path = "../sequence_model" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
sprite_model = { path = "../sprite_model" }
ui_label_model = { path = "../ui_label_model" }
4 changes: 2 additions & 2 deletions crate/charge_model/Cargo.toml
View file
Expand Up @@ -13,7 +13,7 @@ amethyst = { git = "https://github.com/amethyst/amethyst.git", branch = "wasm",
derivative = "2.1.1"
derive-new = "0.5.8"
derive_deref = "1.1.1"
derive_more = "0.99.9"
derive_more = "0.99.10"
logic_clock = { path = "../logic_clock" }
numeric_newtype_derive = { path = "../numeric_newtype_derive" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
2 changes: 1 addition & 1 deletion crate/chase_model/Cargo.toml
View file
Expand Up @@ -14,4 +14,4 @@ asset_model = { path = "../asset_model" }
derivative = "2.1.1"
derive-new = "0.5.8"
kinematic_model = { path = "../kinematic_model" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
6 changes: 3 additions & 3 deletions crate/collision_audio_model/Cargo.toml
View file
Expand Up @@ -14,6 +14,6 @@ asset_derive = { path = "../asset_derive" }
derivative = "2.1.1"
derive-new = "0.5.8"
derive_deref = "1.1.1"
serde = { version = "1.0.114", features = ["derive"] }
strum = "0.18.0"
strum_macros = "0.18.0"
serde = { version = "1.0.116", features = ["derive"] }
strum = "0.19.2"
strum_macros = "0.19.2"
2 changes: 1 addition & 1 deletion crate/collision_loading/Cargo.toml
View file
Expand Up @@ -12,4 +12,4 @@ test = false
amethyst = { git = "https://github.com/amethyst/amethyst.git", branch = "wasm", default-features = false, features = ["audio", "network", "renderer", "no-slow-safety-checks", "test-support", "wav", "web_socket"] }
collision_model = { path = "../collision_model" }
derive-new = "0.5.8"
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
8 changes: 4 additions & 4 deletions crate/collision_model/Cargo.toml
View file
Expand Up @@ -15,16 +15,16 @@ asset_model = { path = "../asset_model" }
derivative = "2.1.1"
derive-new = "0.5.8"
derive_deref = "1.1.1"
derive_more = "0.99.9"
derive_more = "0.99.10"
kinematic_model = { path = "../kinematic_model" }
logic_clock = { path = "../logic_clock" }
numeric_newtype_derive = { path = "../numeric_newtype_derive" }
object_status_model = { path = "../object_status_model" }
sequence_model = { path = "../sequence_model" }
sequence_model_derive = { path = "../sequence_model_derive" }
sequence_model_spi = { path = "../sequence_model_spi" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
shape_model = { path = "../shape_model" }
slotmap = { version = "0.4.0", features = ["serde"] }
strum = "0.18.0"
strum_macros = "0.18.0"
strum = "0.19.2"
strum_macros = "0.19.2"
6 changes: 3 additions & 3 deletions crate/control_settings_loading/Cargo.toml
View file
Expand Up @@ -13,11 +13,11 @@ amethyst = { git = "https://github.com/amethyst/amethyst.git", branch = "wasm",
camera_model = { path = "../camera_model" }
control_settings_model = { path = "../control_settings_model" }
game_input_model = { path = "../game_input_model" }
indexmap = { version = "1.5.0", features = ["serde-1"] }
indexmap = { version = "1.6.0", features = ["serde-1"] }
kinematic_model = { path = "../kinematic_model" }
log = "0.4.11"
smallvec = "1.4.1"
smallvec = "1.4.2"
sprite_model = { path = "../sprite_model" }
ui_label_model = { path = "../ui_label_model" }
ui_model = { path = "../ui_model" }
strum = "0.18.0"
strum = "0.19.2"
4 changes: 2 additions & 2 deletions crate/control_settings_model/Cargo.toml
View file
Expand Up @@ -14,8 +14,8 @@ derivative = "2.1.1"
derive-new = "0.5.8"
derive_deref = "1.1.1"
game_input_model = { path = "../game_input_model" }
indexmap = { version = "1.5.0", features = ["serde-1"] }
indexmap = { version = "1.6.0", features = ["serde-1"] }
kinematic_model = { path = "../kinematic_model" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
sprite_model = { path = "../sprite_model" }
ui_label_model = { path = "../ui_label_model" }
8 changes: 4 additions & 4 deletions crate/energy_model/Cargo.toml
View file
Expand Up @@ -17,15 +17,15 @@ collision_model = { path = "../collision_model" }
derivative = "2.1.1"
derive-new = "0.5.8"
derive_deref = "1.1.1"
derive_more = "0.99.9"
derive_more = "0.99.10"
kinematic_model = { path = "../kinematic_model" }
object_model = { path = "../object_model" }
object_type = { path = "../object_type" }
sequence_model = { path = "../sequence_model" }
sequence_model_spi = { path = "../sequence_model_spi" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
spawn_model = { path = "../spawn_model" }
slotmap = { version = "0.4.0", features = ["serde"] }
sprite_model = { path = "../sprite_model" }
strum = "0.18.0"
strum_macros = "0.18.0"
strum = "0.19.2"
strum_macros = "0.19.2"
2 changes: 1 addition & 1 deletion crate/game_input/Cargo.toml
View file
Expand Up @@ -16,4 +16,4 @@ derive-new = "0.5.8"
game_input_model = { path = "../game_input_model" }
log = "0.4.11"
network_session_model = { path = "../network_session_model" }
serde = { version = "1.0.114", features = ["derive"] }
serde = { version = "1.0.116", features = ["derive"] }
10 changes: 5 additions & 5 deletions crate/game_input_model/Cargo.toml
View file
Expand Up @@ -15,8 +15,8 @@ derivative = "2.1.1"
derive-new = "0.5.8"
derive_deref = "1.1.1"
log = "0.4.11"
serde = { version = "1.0.114", features = ["derive"] }
structopt = "0.3.15"
structopt-derive = "0.4.8"
strum = "0.18.0"
strum_macros = "0.18.0"
serde = { version = "1.0.116", features = ["derive"] }
structopt = "0.3.18"
structopt-derive = "0.4.11"
strum = "0.19.2"
strum_macros = "0.19.2"
4 changes: 2 additions & 2 deletions crate/game_input_stdio/Cargo.toml
View file
Expand Up @@ -14,5 +14,5 @@ application_event = { path = "../application_event" }
derive-new = "0.5.8"
game_input_model = { path = "../game_input_model" }
stdio_spi = { path = "../stdio_spi" }
strum = "0.18.0"
strum_macros = "0.18.0"
strum = "0.19.2"
strum_macros = "0.19.2"
10 changes: 5 additions & 5 deletions crate/game_mode_selection_model/Cargo.toml
View file
Expand Up @@ -11,8 +11,8 @@ test = false
[dependencies]
amethyst = { git = "https://github.com/amethyst/amethyst.git", branch = "wasm", default-features = false, features = ["audio", "network", "renderer", "no-slow-safety-checks", "test-support", "wav", "web_socket"] }
menu_model = { path = "../menu_model" }
serde = { version = "1.0.114", features = ["derive"] }
structopt = "0.3.15"
structopt-derive = "0.4.8"
strum = "0.18.0"
strum_macros = "0.18.0"
serde = { version = "1.0.116", features = ["derive"] }
structopt = "0.3.18"
structopt-derive = "0.4.11"
strum = "0.19.2"
strum_macros = "0.19.2"

0 comments on commit d2d673c

Please sign in to comment.