Merge branch 'master' into SaveloadExample

CHANGELOG.md

@@ -5,11 +5,13 @@ Note this bumps the minimum supported rust version to 1.28.0 ([#447]).
 * Deprecated `world::Bundle` ([#486])
 * Updated Chapter 7: Setup to be more explicit, updated examples to follow that methodology ([#487])
 * Added some comments to the `saveload` example ([#492])
+* Updated dependency versions ([#494])
 
 [#447]: https://github.com/slide-rs/specs/pull/447
 [#486]: https://github.com/slide-rs/specs/pull/486
 [#487]: https://github.com/slide-rs/specs/pull/487
 [#492]: https://github.com/slide-rs/specs/pull/492
+[#494]: https://github.com/slide-rs/specs/pull/494
 
 # 0.12.3
 

Cargo.toml

@@ -21,7 +21,7 @@ autobenches = false
 travis-ci = { repository = "slide-rs/specs" }
 
 [dependencies]
-crossbeam = "0.3.0"
+crossbeam = "0.4.1"
 derivative = "1"
 fnv = "1.0"
 hibitset = { version = "0.5.2", features = ["parallel"] }
@@ -48,7 +48,7 @@ nightly = ["shred/nightly"]
 features = ["common", "serde"]
 
 [dev-dependencies]
-cgmath =  { version = "0.14", features = ["eders"] }
+cgmath =  { version = "0.16" }
 criterion = "0.2"
 ron = "0.4"
 rand = "0.5.5"

specs-derive/Cargo.toml

@@ -9,8 +9,13 @@ keywords = ["gamedev", "parallel", "specs", "ecs", "derive"]
 license = "MIT/Apache-2.0"
 
 [dependencies]
-syn = "0.12"
-quote = "0.4"
+proc-macro2 = "0.4"
+syn = "0.15"
+quote = "0.6"
+
+[dev-dependencies]
+specs = { path = "..", features = ["serde"] }
+serde = "1"
 
 [lib]
 proc-macro = true