Skip to content

Commit

Permalink
Upgrade many dependencies. Some duplicate versions introduced in
Browse files Browse the repository at this point in the history 
Cargo.lock, unfortunately
  • Loading branch information
@dabreegster
dabreegster committed Nov 25, 2023
1 parent dc073c3 commit 1884460
Show file tree
Hide file tree
Showing 13 changed files with 417 additions and 280 deletions.
639 changes: 388 additions & 251 deletions Cargo.lock
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@ csv = "1.2.0"
flate2 = "1.0.26"
fs-err = "2.9.0"
futures = { version = "0.3.27"}
futures-channel = { version = "0.3.27"}
futures-channel = { version = "0.3.29"}
geo = "0.26.0"
geojson = { version = "0.24.1", features = ["geo-types"] }
getrandom = "0.2.3"
getrandom = "0.2.11"
instant = "0.1.7"
log = "0.4.14"
log = "0.4.20"
rand = "0.8.3"
rand_xorshift = "0.3.0"
serde = "1.0.123"
serde_json = "1.0.61"
serde = "1.0.193"
serde_json = "1.0.108"
structopt = "0.3.23"
tokio = { version ="1.28.0", features=["full"] }
wasm-bindgen = "0.2.84"
web-sys = "0.3.61"
tokio = { version = "1.34.0", features=["full"] }
wasm-bindgen = "0.2.88"
web-sys = "0.3.65"

# There's a circular dependency between this repo (abstreet) and osm2streets,
# due to the 2 core dependency crates listed below. This patch is required to
Expand Down
8 changes: 4 additions & 4 deletions abstio/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ edition = "2021"
[dependencies]
abstutil = { path = "../abstutil" }
anyhow = { workspace = true }
base64 = "0.21.0"
base64 = "0.21.5"
bincode = { workspace = true }
fs-err = { workspace = true }
instant = { workspace = true }
log = { workspace = true }
reqwest = { version = "0.11.17", default-features=false, features=["rustls-tls"] }
reqwest = { version = "0.11.22", default-features=false, features=["rustls-tls"] }
serde = { workspace = true }
serde_json = { workspace = true }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
futures-channel = { workspace = true }
# Don't use workspace, because that includes features=full
tokio = "1.28.0"
tokio = "1.34.0"

[target.'cfg(target_arch = "wasm32")'.dependencies]
include_dir = { git = "https://github.com/dabreegster/include_dir", branch = "union" }
js-sys = "0.3.61"
js-sys = "0.3.65"
wasm-bindgen = { workspace = true }
web-sys = { workspace = true, features=["HtmlElement", "Storage", "Window"] }
8 changes: 4 additions & 4 deletions abstutil/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ edition = "2021"
[dependencies]
anyhow = { workspace = true }
bincode = { workspace = true }
env_logger = { version = "0.10.0" }
env_logger = { version = "0.10.1" }
fs-err = { workspace = true }
instant = { workspace = true }
itertools = "0.10.5"
itertools = "0.12.0"
log = { workspace = true }
num_cpus = "1.15.0"
num_cpus = "1.16.0"
scoped_threadpool = "0.1.9"
serde = { workspace = true }
serde_json = { workspace = true }

[target.'cfg(unix)'.dependencies]
termion = "2.0.1"
termion = "2.0.3"

[target.'cfg(target_arch = "wasm32")'.dependencies]
console_log = "1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion apps/game/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ colorous = { workspace = true }
contour = { workspace = true }
csv = { workspace = true }
downcast-rs = "1.2.0"
enumset = "1.0.13"
enumset = "1.1.3"
fs-err = { workspace = true }
futures-channel = { workspace = true }
geo = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion apps/santa/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ map_gui = { path = "../../map_gui" }
map_model = { path = "../../map_model" }
rand = { workspace = true }
rand_xorshift = { workspace = true }
rodio = { version = "0.17.1", default-features = false, features = ["vorbis"] }
rodio = { version = "0.17.3", default-features = false, features = ["vorbis"] }
serde = { workspace = true }
wasm-bindgen = { workspace = true, optional = true }
widgetry = { path = "../../widgetry" }
2 changes: 1 addition & 1 deletion geom/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"

[dependencies]
anyhow = { workspace = true }
earcutr = "0.4.2"
earcutr = "0.4.3"
fs-err = { workspace = true }
geo = { workspace = true }
geojson = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion headless/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ sim = { path = "../sim" }
synthpop = { path = "../synthpop" }
structopt = { workspace = true }
tokio = { workspace = true }
url = "2.3.1"
url = "2.5.0"
2 changes: 1 addition & 1 deletion kml/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ anyhow = { workspace = true }
csv = { workspace = true }
geom = { path = "../geom" }
log = { workspace = true }
roxmltree = { version = "0.18.0", features=["std"] }
roxmltree = { version = "0.19.0", features=["std"] }
serde = { workspace = true }
4 changes: 2 additions & 2 deletions map_gui/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = { workspace = true }
built = { version = "0.7.1", optional = true, features=["chrono"] }
chrono = "0.4.24"
chrono = "0.4.31"
colorous = { workspace = true }
contour = { workspace = true }
flate2 = { workspace = true }
Expand All @@ -26,7 +26,7 @@ instant = { workspace = true }
log = { workspace = true }
lyon = "1.0.1"
map_model = { path = "../map_model" }
regex = "1.8.1"
regex = "1.10.2"
rfd = "0.11.3"
serde = { workspace = true }
synthpop = { path = "../synthpop" }
Expand Down
4 changes: 2 additions & 2 deletions map_model/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ edition = "2021"
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = { workspace = true }
enumset = { version = "1.0.13", features=["serde"] }
enumset = { version = "1.1.3", features=["serde"] }
fast_paths = { git = "https://github.com/easbar/fast_paths", rev = "9a954e02f01ed16939d3c4a2dc9dd3fb4f6c03ee"}
geojson = { workspace = true }
geom = { path = "../geom" }
kml = { path = "../kml" }
log = { workspace = true }
lyon = "1.0.1"
md5 = "0.7.0"
petgraph = { version = "0.6.3", features=["serde-1"] }
petgraph = { version = "0.6.4", features=["serde-1"] }
popgetter = { git = "https://github.com/dabreegster/popgetter/" }
rand = { workspace = true }
rand_xorshift = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions sim/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ edition = "2021"
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = { workspace = true }
ctrlc = { version = "3.2.5", optional = true }
ctrlc = { version = "3.4.1", optional = true }
downcast-rs = "1.2.0"
enum_dispatch = "0.3.11"
enum_dispatch = "0.3.12"
geom = { path = "../geom" }
instant = { workspace = true }
libm = "0.2.6"
libm = "0.2.8"
log = { workspace = true }
map_model = { path = "../map_model" }
rand = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion updater/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ futures-channel = { workspace = true }
md5 = "0.7.0"
structopt = { workspace = true }
tokio = { workspace = true }
walkdir = "2.3.3"
walkdir = "2.4.0"

0 comments on commit 1884460

Please sign in to comment.