Use Cargo workspace dependencies

For library dependencies, not (yet) all framework dependencies.

Author: madsmtm

Cargo.toml

@@ -26,6 +26,16 @@ categories = [
     "os::macos-apis",
 ]
 
+# Used in framework crates.
+[workspace.dependencies]
+dispatch2 = { path = "crates/dispatch2", version = "0.2.0", default-features = false }
+block2 = { path = "crates/block2", version = "0.6.0", default-features = false }
+objc2 = { path = "crates/objc2", version = "0.6.0", default-features = false }
+# Use a reasonably new version of libc.
+libc = { version = "0.2.80", default-features = false }
+# Use a version of bitflags that supports `impl`.
+bitflags = { version = "2.5.0", default-features = false }
+
 [workspace.lints.rust]
 elided_lifetimes_in_paths = "warn"
 missing_copy_implementations = "warn"

crates/block2/Cargo.toml

@@ -50,7 +50,7 @@ unstable-private = []
 unstable-coerce-pointee = []
 
 [dependencies]
-objc2 = { path = "../objc2", version = "0.6.0", default-features = false, features = ["std"] }
+objc2 = { workspace = true, features = ["std"] }
 
 [dev-dependencies]
 objc2-foundation = { path = "../../framework-crates/objc2-foundation", default-features = false, features = [

crates/dispatch2/Cargo.toml

@@ -17,10 +17,10 @@ authors = ["Mads Marquart <[email protected]>", "Mary <[email protected]>"]
 workspace = true
 
 [dependencies]
-bitflags = { version = "2.5.0", default-features = false, features = ["std"] }
-block2 = { path = "../block2", version = "0.6.0", default-features = false, optional = true, features = ["alloc"] }
-libc = { version = "0.2.80", default-features = false, optional = true }
-objc2 = { path = "../objc2", version = "0.6.0", default-features = false, optional = true, features = ["std"] }
+bitflags = { workspace = true, features = ["std"] }
+block2 = { workspace = true, optional = true, features = ["alloc"] }
+libc = { workspace = true, optional = true }
+objc2 = { workspace = true, optional = true, features = ["std"] }
 
 [package.metadata.docs.rs]
 default-target = "aarch64-apple-darwin"

crates/header-translator/src/library.rs

@@ -365,35 +365,22 @@ see that for related crates.", self.data.krate)?;
         for (krate, required_features) in self.dependencies(config) {
             let library = config.library_from_crate(krate);
             let required = self.data.required_crates.contains(krate);
-            let path = match (library.is_library, self.data.is_library) {
-                (true, true) => format!("../{krate}"),
-                (true, false) => format!("../../crates/{krate}"),
-                (false, true) => format!("../../framework-crates/{krate}"),
-                (false, false) => format!("../{krate}"),
-            };
-            let mut table = match krate {
-                "dispatch2" => InlineTable::from_iter([
-                    ("path", Value::from(path)),
-                    ("version", Value::from("0.2.0")),
-                ]),
-                "objc2" => InlineTable::from_iter([
-                    ("path", Value::from(path)),
-                    ("version", Value::from("0.6.0")),
-                ]),
-                "block2" => InlineTable::from_iter([
-                    ("path", Value::from(path)),
-                    ("version", Value::from("0.6.0")),
+            let mut table = match (library.is_library, self.data.is_library) {
+                (true, _) => InlineTable::from_iter([("workspace", Value::from(true))]),
+                (false, true) => InlineTable::from_iter([
+                    (
+                        "path",
+                        Value::from(format!("../../framework-crates/{krate}")),
+                    ),
+                    ("version", Value::from(VERSION)),
+                    ("default-features", Value::from(false)),
                 ]),
-                // Use a reasonably new version of libc
-                "libc" => InlineTable::from_iter([("version", Value::from("0.2.80"))]),
-                // Use a version of bitflags that supports `impl`
-                "bitflags" => InlineTable::from_iter([("version", Value::from("2.5.0"))]),
-                _ => InlineTable::from_iter([
-                    ("path", Value::from(path)),
+                (false, false) => InlineTable::from_iter([
+                    ("path", Value::from(format!("../{krate}"))),
                     ("version", Value::from(VERSION)),
+                    ("default-features", Value::from(false)),
                 ]),
             };
-            table.insert("default-features", Value::from(false));
             if !required {
                 table.insert("optional", Value::from(true));
             }

crates/header-translator/src/main.rs

@@ -809,22 +809,28 @@ fn update_test_metadata(workspace_dir: &Path, config: &Config) {
         (
             "block2",
             toml_edit::Value::InlineTable(toml_edit::InlineTable::from_iter([(
-                "path",
-                "../block2",
+                "workspace",
+                toml_edit::Value::from(true),
             )])),
         ),
         (
             "objc2",
             toml_edit::Value::InlineTable(toml_edit::InlineTable::from_iter([
-                ("path", toml_edit::Value::from("../objc2")),
+                ("workspace", toml_edit::Value::from(true)),
                 // FIXME: Make these not required for tests
                 (
                     "features",
                     toml_edit::Value::Array(toml_edit::Array::from_iter(["relax-sign-encoding"])),
                 ),
             ])),
         ),
-        ("libc", "0.2.80".into()),
+        (
+            "libc",
+            toml_edit::Value::InlineTable(toml_edit::InlineTable::from_iter([(
+                "workspace",
+                toml_edit::Value::from(true),
+            )])),
+        ),
     ]));
     let _ = cargo_toml.remove("target");
 

crates/objc2/Cargo.toml

@@ -149,6 +149,8 @@ static_assertions = "1.1.0"
 backtrace = "0.3.74"
 memoffset = "0.9.0"
 block2 = { path = "../block2" }
+
+# Intentionally does not use workspace deps, since we want to NOT put a version number in here for *Cargo reasons*
 objc2-core-foundation = { path = "../../framework-crates/objc2-core-foundation", default-features = false, features = [
     "CFCGTypes",
 ] }

crates/test-frameworks/Cargo.toml

@@ -375,9 +375,9 @@ objc2-phase = ["dep:objc2-phase"]
 objc2-carbon = ["dep:objc2-carbon"]
 
 [dependencies]
-block2 = { path = "../block2" }
-objc2 = { path = "../objc2", features = ["relax-sign-encoding"] }
-libc = "0.2.80"
+block2 = { workspace = true }
+objc2 = { workspace = true, features = ["relax-sign-encoding"] }
+libc = { workspace = true }
 objc2-avf-audio = { path = "../../framework-crates/objc2-avf-audio", optional = true }
 objc2-av-foundation = { path = "../../framework-crates/objc2-av-foundation", optional = true }
 objc2-av-kit = { path = "../../framework-crates/objc2-av-kit", optional = true }