From a8d82bb7b7dce297e2bb4178991adb94ac2786e7 Mon Sep 17 00:00:00 2001
From: jane400 <libpaket@j4ne.de>
Date: Sat, 21 Sep 2024 20:57:59 +0200
Subject: [PATCH] chore: move dependencies to workspace root

---
 Cargo.lock          |  5 +++--
 Cargo.toml          |  5 ++++-
 libpaket/Cargo.toml |  4 ++--
 paket/Cargo.toml    | 11 +++++++----
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7ea749c..ebaabc2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2087,6 +2087,7 @@ dependencies = [
  "relm4",
  "relm4-icons",
  "reqwest",
+ "secrecy",
  "tracker",
  "webkit6",
 ]
@@ -2569,9 +2570,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "secrecy"
-version = "0.8.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e"
+checksum = "ba079fa568d52545cd70b334b2ce6f88f62b8fc2bda9290f48a0578388a49331"
 dependencies = [
  "serde",
  "zeroize",
diff --git a/Cargo.toml b/Cargo.toml
index db7272c..73656fb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,9 +6,12 @@ members = [
 	"paket",
 ]
 
-
 [workspace.package]
 authors = ["Jane Rachinger <libpaket@j4ne.de>"]
 edition = "2021"
 license = "AGPL-3.0-only"
 version = "0.1.0"
+
+[workspace.dependencies]
+secrecy = { version = "0.10"}
+reqwest = { version = "0.12", features = ["json", "cookies", "gzip", "http2"] }
\ No newline at end of file
diff --git a/libpaket/Cargo.toml b/libpaket/Cargo.toml
index aa278f8..176bf6b 100644
--- a/libpaket/Cargo.toml
+++ b/libpaket/Cargo.toml
@@ -14,8 +14,8 @@ num_enum = { version = "0.7", optional = true }
 # TODO: Consolidate?
 rand = "0.8.5"
 random-string = "1.1.0"
-reqwest = { version = "0.12", features = ["json", "cookies", "gzip", "http2"] }
-secrecy = { version = "0.8.0", features = ["serde"] }
+reqwest = { workspace = true }
+secrecy = { workspace = true, features = ["serde"]}
 serde = { version = "1.0.195", features = ["derive"] }
 serde_json = "1.0.111"
 serde_repr = { version = "0.1.18", optional = true }
diff --git a/paket/Cargo.toml b/paket/Cargo.toml
index 647b15f..5e3c550 100644
--- a/paket/Cargo.toml
+++ b/paket/Cargo.toml
@@ -7,14 +7,17 @@ version.workspace = true
 
 [dependencies]
 # using git version, for https://github.com/Relm4/Relm4/pull/677
-relm4 = { version = "0.9", features = [ "libadwaita", "macros" ], git = "https://github.com/Relm4/Relm4.git" }
+relm4 = { version = "0.9", features = [
+    "libadwaita",
+    "macros",
+], git = "https://github.com/Relm4/Relm4.git" }
 relm4-icons = { version = "0.9", git = "https://github.com/Relm4/icons.git" }
 tracker = "0.2"
-adw = {package = "libadwaita", version = "0.7", features = [ "v1_6" ]}
+adw = { package = "libadwaita", version = "0.7", features = ["v1_6"] }
 webkit = { package = "webkit6", version = "0.4" }
-reqwest = "0.12"
+reqwest = { workspace = true }
 libpaket = { path = "../libpaket" }
 glycin = { version = "2.0.0-beta", features = ["gdk4"] }
 oo7 = { version = "0.3" }
 futures = "0.3"
-gtk = { package = "gtk4", version = "0.9", features = ["v4_16"]}
\ No newline at end of file
+gtk = { package = "gtk4", version = "0.9", features = ["v4_16"] }