Use geom crate in its own repo, breaking part of the circular depende…

…ncy with abstreet
a-b-street · Nov 27, 2023 · 086a347 · 086a347
1 parent 3392517
commit 086a347
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,10 +16,11 @@ resolver = "2"
 # repeating in a bunch of crates
 [workspace.dependencies]
 anyhow = "1.0.38"
-serde = "1.0.123"
-serde_json = "1.0.61"
+geom = { git = "https://github.com/a-b-street/geom" }
+serde = "1.0.193"
+serde_json = "1.0.108"
 
 # To temporarily work on dependencies locally, uncomment this
 #[patch."https://github.com/a-b-street/abstreet"]
 #abstutil = { path = "/home/dabreegster/abstreet/abstutil" }
-#geom = { path = "/home/dabreegster/abstreet/geom" }
+#geom = { path = "/home/dabreegster/geom" }
diff --git a/experimental/Cargo.toml b/experimental/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-itertools = "0.10.2"
+itertools = "0.11.0"
 petgraph = "0.6.3"
 
 # utilities from abstreet

diff --git a/osm2lanes/Cargo.toml b/osm2lanes/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 abstutil = { git = "https://github.com/a-b-street/abstreet" }
 anyhow = { workspace = true }
 enumset = { version = "1.0.12", features=["serde"] }
-geom = { git = "https://github.com/a-b-street/abstreet" }
+geom = { workspace = true }
 serde = { workspace = true }
 
 [dev-dependencies]

diff --git a/osm2streets-js/Cargo.toml b/osm2streets-js/Cargo.toml
@@ -14,7 +14,7 @@ abstutil = { git = "https://github.com/a-b-street/abstreet" }
 anyhow = { workspace = true }
 console_error_panic_hook = "0.1.6"
 console_log = "1.0.0"
-geom = { git = "https://github.com/a-b-street/abstreet" }
+geom = { workspace = true }
 experimental = { path = "../experimental" }
 # TODO Upstream this in abstutil crate. WASM is missing some runtime dep otherwise.
 instant = { version = "0.1.12", features = ["wasm-bindgen"] }

diff --git a/osm2streets/Cargo.toml b/osm2streets/Cargo.toml
@@ -11,8 +11,8 @@ anyhow = { workspace = true }
 enumset = { version = "1.0.12", features=["serde"] }
 geo = "0.26.0"
 geojson = "0.24.1"
-geom = { git = "https://github.com/a-b-street/abstreet" }
-itertools = "0.10.5"
+geom = { workspace = true }
+itertools = "0.11.0"
 log = "0.4.14"
 osm2lanes = { path = "../osm2lanes" }
 petgraph = { version = "0.6.3" }

diff --git a/streets_reader/Cargo.toml b/streets_reader/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 abstutil = { git = "https://github.com/a-b-street/abstreet" }
 anyhow = { workspace = true }
 country-geocoder = { git = "https://github.com/a-b-street/country-geocoder" }
-geom = { git = "https://github.com/a-b-street/abstreet" }
+geom = { workspace = true }
 log = "0.4.14"
 osm2streets = { path = "../osm2streets" }
 xmlparser = "0.13.5"
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 abstutil = { git = "https://github.com/a-b-street/abstreet" }
 anyhow = { workspace = true }
 env_logger = "0.10.1"
-geom = { git = "https://github.com/a-b-street/abstreet" }
+geom = { workspace = true }
 streets_reader = { path = "../streets_reader" }
 serde = { workspace = true }
 serde_json = { workspace = true }