From 2f3b186262867515736eec97f555fd077805ddf7 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Wed, 26 Oct 2022 13:41:46 +0200
Subject: [PATCH] Switch to cargo-workspaces

---
 Makefile                    | 23 ++++++++---------------
 syndicate-macros/Cargo.toml |  2 +-
 syndicate-server/Cargo.toml | 10 +++++-----
 syndicate-tools/Cargo.toml  |  4 ++--
 syndicate/Cargo.toml        |  6 +++---
 5 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 72bc8cf..f27ce40 100644
--- a/Makefile
+++ b/Makefile
@@ -11,22 +11,15 @@ test:
 test-all:
 	cargo test --all-targets
 
-# Try
-#
-#   make release-minor
-#
-# to check things, and
-#
-#   make release-minor RELEASE_DRY_RUN=
-#
-# to do things for real.
+ws-bump:
+	cargo workspaces version \
+		--no-global-tag \
+		--individual-tag-prefix '%nv' \
+		--allow-branch 'main'
 
-RELEASE_DRY_RUN=--dry-run
-release-%:
-	PUBLISH_GRACE_SLEEP=15 cargo release \
-		$(RELEASE_DRY_RUN) \
-		-vv --no-dev-version --exclude-unchanged \
-		$*
+ws-publish:
+	cargo workspaces publish \
+		--from-git
 
 pull-protocols:
 	git subtree pull -P syndicate/protocols \
diff --git a/syndicate-macros/Cargo.toml b/syndicate-macros/Cargo.toml
index 532babc..940f943 100644
--- a/syndicate-macros/Cargo.toml
+++ b/syndicate-macros/Cargo.toml
@@ -13,7 +13,7 @@ license = "Apache-2.0"
 proc-macro = true
 
 [dependencies]
-syndicate = { path = "../syndicate", version = "^0.24.0"}
+syndicate = { path = "../syndicate", version = "0.24"}
 
 proc-macro2 = { version = "^1.0", features = ["span-locations"] }
 quote = "^1.0"
diff --git a/syndicate-server/Cargo.toml b/syndicate-server/Cargo.toml
index e223b24..b9f0c13 100644
--- a/syndicate-server/Cargo.toml
+++ b/syndicate-server/Cargo.toml
@@ -10,13 +10,13 @@ repository = "https://git.syndicate-lang.org/syndicate-lang/syndicate-rs"
 license = "Apache-2.0"
 
 [build-dependencies]
-preserves-schema = "^3.0.0"
-syndicate = { path = "../syndicate", version = "^0.24.0"}
+preserves-schema = "3.0"
+syndicate = { path = "../syndicate", version = "0.24"}
 
 [dependencies]
-preserves-schema = "^3.0.0"
-syndicate = { path = "../syndicate", version = "^0.24.0"}
-syndicate-macros = { path = "../syndicate-macros", version = "^0.19.0"}
+preserves-schema = "3.0"
+syndicate = { path = "../syndicate", version = "0.24"}
+syndicate-macros = { path = "../syndicate-macros", version = "0.19"}
 
 chrono = "0.4"
 futures = "0.3"
diff --git a/syndicate-tools/Cargo.toml b/syndicate-tools/Cargo.toml
index 529aed1..b3fd3d4 100644
--- a/syndicate-tools/Cargo.toml
+++ b/syndicate-tools/Cargo.toml
@@ -10,8 +10,8 @@ repository = "https://git.syndicate-lang.org/syndicate-lang/syndicate-rs"
 license = "Apache-2.0"
 
 [dependencies]
-preserves = "^2"
-syndicate = { path = "../syndicate", version = "^0.24.0"}
+preserves = "2.4"
+syndicate = { path = "../syndicate", version = "0.24"}
 
 clap = { version = "^4.0", features = ["derive"] }
 clap_complete = "^4.0"
diff --git a/syndicate/Cargo.toml b/syndicate/Cargo.toml
index a50466b..ceea4f0 100644
--- a/syndicate/Cargo.toml
+++ b/syndicate/Cargo.toml
@@ -13,11 +13,11 @@ license = "Apache-2.0"
 vendored-openssl = ["openssl/vendored"]
 
 [build-dependencies]
-preserves-schema = "^3.0.0"
+preserves-schema = "3.0"
 
 [dependencies]
-preserves = "^2"
-preserves-schema = "^3.0.0"
+preserves = "2.4"
+preserves-schema = "3.0"
 
 tokio = { version = "1.10", features = ["io-util", "macros", "rt", "rt-multi-thread", "time"] }
 tokio-util = "0.6"