From 3ff90386bee8bdb5fed59f4bdb6b9ad16412ddd3 Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Mon, 11 Mar 2024 19:06:41 -0400
Subject: [PATCH] Set up workspace

Signed-off-by: mulhern <amulhern@redhat.com>
---
 .packit.yaml                    |  4 ++--
 Cargo.toml                      | 14 +++++++++++---
 stratisd_proc_macros/Cargo.toml |  6 +++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.packit.yaml b/.packit.yaml
index dd8dd9608d..48fb3f88c4 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -12,14 +12,14 @@ actions:
     post-upstream-clone:
         - "git clone https://github.com/mulkieran/ci -b issue_project_694 --depth=1 ../distro"
         - "mv ../distro/mockbuild_test/stratisd.spec ../distro/stratisd.spec"
-        - "cargo install cargo-version-util"
+        - "cargo install cargo-get"
         - "cargo install cargo-vendor-filterer"
     create-archive:
         - "sh -c 'python3 ../distro/release_management/create_artifacts.py ../distro/ --pre-release --specfile-path=../distro/stratisd.spec stratisd --vendor-method=filtered'"
     fix-spec-file:
         - "echo 'skipping automatic fix-spec-file actions'"
     get-current-version:
-        - "cargo version-util get-version"
+        - "cargo get package.version"
 
 srpm_build_deps:
     - git
diff --git a/Cargo.toml b/Cargo.toml
index c9402544e6..bd7f4c86fe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "stratisd"
 version = "3.7.0"
-authors = ["Stratis Developers <stratis-devel@lists.fedorahosted.org>"]
-edition = "2021"
-rust-version = "1.71.1"  # LOWEST SUPPORTED RUST TOOLCHAIN
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
 build = "build.rs"
 description = "Stratis daemon"
 license = "MPL-2.0"
@@ -31,6 +31,14 @@ exclude = [
     "/udev"
 ]
 
+[workspace]
+members = [".", "stratisd_proc_macros"]
+
+[workspace.package]
+authors = ["Stratis Developers <stratis-devel@lists.fedorahosted.org>"]
+edition = "2021"
+rust-version = "1.71.1"  # LOWEST SUPPORTED RUST TOOLCHAIN
+
 [[bin]]
 name = "stratisd"
 required-features = ["engine"]
diff --git a/stratisd_proc_macros/Cargo.toml b/stratisd_proc_macros/Cargo.toml
index e8327a185b..64987b7611 100644
--- a/stratisd_proc_macros/Cargo.toml
+++ b/stratisd_proc_macros/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "stratisd_proc_macros"
 version = "0.2.1"
-authors = ["Stratis Developers <stratis-devel@lists.fedorahosted.org>"]
-edition = "2021"
-rust-version = "1.71.1"  # LOWEST SUPPORTED RUST TOOLCHAIN
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
 description = "Stratis daemon procedural macros"
 license = "MPL-2.0"
 repository = "https://github.com/stratis-storage/stratisd/"