From 80c6042c3bc8e97a5d2f382b730d0e88968a2545 Mon Sep 17 00:00:00 2001
From: Xavier Moffett <sapphirus@azorium.net>
Date: Thu, 31 Oct 2024 16:17:56 -0400
Subject: [PATCH] Tidy up manifests and inclusion of workspace dependencies

- `alpm` and `pacwrap-core` defined as workspace dependencies being
  imported by each crate.
- Set workspace resolver version to `2`
---
 Cargo.toml               | 15 +++++++++------
 pacwrap-agent/Cargo.toml |  9 +++++----
 pacwrap-core/Cargo.toml  |  4 +++-
 pacwrap/Cargo.toml       | 17 ++++++++++-------
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 279e09c..bca1f27 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,17 +1,12 @@
 [workspace]
-resolver = "1"
+resolver = "2"
 members = ["pacwrap", "pacwrap-agent", "pacwrap-core"]
 
-[profile.release]
-lto = "thin"
-opt-level = "s"
-
 [workspace.package]
 version = "0.8.7-pre"
 edition = "2021"
 rust-version = "1.72"
 readme = "README.md"
-default-run = "pacwrap"
 
 license = "GPL-3.0-only"
 authors = [ "Xavier Moffett <sapphirus@azorium.net>" ]
@@ -20,3 +15,11 @@ categories = [ "command-line-utilities", "virtualization", "filesystem", "concur
 
 homepage = "https://pacwrap.sapphirus.org/"
 repository = "https://github.com/pacwrap/pacwrap"
+
+[workspace.dependencies]
+pacwrap-core = { version = "0.8.7-pre", path = "pacwrap-core" }
+alpm = { version = "4.0.1", features = ["checkver"] }
+
+[profile.release]
+lto = "thin"
+opt-level = "s"
diff --git a/pacwrap-agent/Cargo.toml b/pacwrap-agent/Cargo.toml
index b1853bb..2d39710 100644
--- a/pacwrap-agent/Cargo.toml
+++ b/pacwrap-agent/Cargo.toml
@@ -16,11 +16,12 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
-pacwrap-core = { path = "../pacwrap-core" }
-
 # Serialization
 serde = { version = "1.0", features = ["derive"] }
 bincode = "1.3.3"
 
-# Packaging
-alpm = { version = "4.0.1", features = ["checkver"] }
+[dependencies.alpm]
+workspace = true
+
+[dependencies.pacwrap-core]
+workspace = true
diff --git a/pacwrap-core/Cargo.toml b/pacwrap-core/Cargo.toml
index 4cb61b3..fd41455 100644
--- a/pacwrap-core/Cargo.toml
+++ b/pacwrap-core/Cargo.toml
@@ -38,7 +38,6 @@ libseccomp = "0.3.0"
 signal-hook = "0.3.15"
 
 # Packaging
-alpm = { version = "4.0.1", features = ["checkver"] }
 pacmanconf = "2.0.0"
 tar = "0.4"
 zstd = "0.13.0"
@@ -52,3 +51,6 @@ indicatif = "0.17.5"
 
 #Cryptography
 sha2 = "0.10.8"
+
+[dependencies.alpm]
+workspace = true
diff --git a/pacwrap/Cargo.toml b/pacwrap/Cargo.toml
index d86bc2b..daf385a 100644
--- a/pacwrap/Cargo.toml
+++ b/pacwrap/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "pacwrap"
 description = "A package manager which facilitates Arch-based bubblewrap containers."
+
 default-run = "pacwrap"
 
 version.workspace = true
@@ -17,8 +18,7 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
-pacwrap-core = { path = "../pacwrap-core/" }
-indexmap = { version = "2.0.0", features = ["serde", "rayon"] }
+indexmap = "2.0.0"
 nix = "0.22.3, <= 0.22.3"
 simplebyteunit = "0.2.1"
 
@@ -27,13 +27,16 @@ command-fds = "0.2.2"
 signal-hook = "0.3.15"
 os_pipe = "1.1.4"
 
-# Packaging
-alpm = { version = "4.0.1", features = ["checkver"] }
-
 # Miscellaneous
 sha2 = "0.10.8"
 regex = "1.10.3"
 rand = "0.8.5"
 
-[build-dependencies]
-pacwrap-core = { path = "../pacwrap-core/" }
+[dependencies.alpm]
+workspace = true
+
+[dependencies.pacwrap-core]
+workspace = true
+
+[build-dependencies.pacwrap-core]
+workspace = true