refactor: extract common workspace manifest sections (#34)

febo · Nov 7, 2024 · 5311c27 · 5311c27
1 parent 4e2ff61
commit 5311c27
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 25 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,8 +1,13 @@
 [workspace]
 resolver = "2"
-members = [
-    "programs/system",
-    "programs/token",
-    "sdk/pinocchio",
-    "sdk/pubkey",
-]
+members = ["programs/system", "programs/token", "sdk/pinocchio", "sdk/pubkey"]
+
+[workspace.package]
+edition = "2021"
+license = "Apache-2.0"
+repository = "https://github.com/febo/pinocchio"
+
+[workspace.dependencies]
+five8_const = "0.1.3"
+pinocchio = { path = "sdk/pinocchio", version = "0.6" }
+pinocchio-pubkey = { path = "sdk/pubkey", version = "0.2.1" }
diff --git a/programs/system/Cargo.toml b/programs/system/Cargo.toml
@@ -2,11 +2,11 @@
 name = "pinocchio-system"
 description = "Pinocchio helpers to invoke System program instructions"
 version = "0.2.0"
-edition = "2021"
-license = "Apache-2.0"
+edition = { workspace = true }
+license = { workspace = true }
 readme = "./README.md"
-repository = "https://github.com/febo/pinocchio"
+repository = { workspace = true }
 
 [dependencies]
-pinocchio = { version="0.6", path="../../sdk/pinocchio" }
-pinocchio-pubkey = { version="0.2.1", path="../../sdk/pubkey" }
+pinocchio = { workspace = true }
+pinocchio-pubkey = { workspace = true }
diff --git a/programs/token/Cargo.toml b/programs/token/Cargo.toml
@@ -2,11 +2,11 @@
 name = "pinocchio-token"
 description = "Pinocchio helpers to invoke Token program instructions"
 version = "0.2.0"
-edition = "2021"
-license = "Apache-2.0"
+edition = { workspace = true }
+license = { workspace = true }
 readme = "./README.md"
-repository = "https://github.com/febo/pinocchio"
+repository = { workspace = true }
 
 [dependencies]
-pinocchio = { version="0.6", path="../../sdk/pinocchio" }
-pinocchio-pubkey = { version="0.2.1", path="../../sdk/pubkey" }
+pinocchio = { workspace = true }
+pinocchio-pubkey = { workspace = true }
diff --git a/sdk/pinocchio/Cargo.toml b/sdk/pinocchio/Cargo.toml
@@ -2,10 +2,13 @@
 name = "pinocchio"
 description = "Create Solana programs with no dependencies attached"
 version = "0.6.0"
-edition = "2021"
-license = "Apache-2.0"
+edition = { workspace = true }
+license = { workspace = true }
 readme = "./README.md"
-repository = "https://github.com/febo/pinocchio"
+repository = { workspace = true }
 
 [lints.rust]
-unexpected_cfgs = {level = "warn", check-cfg = ['cfg(target_os, values("solana"))', 'cfg(target_feature, values("static-syscalls"))'] }
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(target_os, values("solana"))',
+    'cfg(target_feature, values("static-syscalls"))',
+] }
diff --git a/sdk/pubkey/Cargo.toml b/sdk/pubkey/Cargo.toml
@@ -2,11 +2,11 @@
 name = "pinocchio-pubkey"
 description = "Companion pubkey helpers for Pinocchio"
 version = "0.2.1"
-edition = "2021"
-license = "Apache-2.0"
+edition = { workspace = true }
+license = { workspace = true }
 readme = "./README.md"
-repository = "https://github.com/febo/pinocchio"
+repository = { workspace = true }
 
 [dependencies]
-five8_const = "0.1.3"
-pinocchio = { version="<= 0.6", path="../pinocchio" }
+five8_const = { workspace = true }
+pinocchio = { workspace = true }