chore: Make the url crate a workspace dependency

Liquidwe · May 14, 2024 · 6672302 · 6672302
1 parent da249bb
commit 6672302
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -64,6 +64,7 @@ tracing = { version = "0.1.40", default-features = false, features = ["std"] }
 tracing-core = "0.1.32"
 uniffi = { version = "0.27.1" }
 uniffi_bindgen = { version = "0.27.1" }
+url = "2.5.0"
 vodozemac = { version = "0.6.0" }
 wiremock = "0.6.0"
 zeroize = "1.6.0"

diff --git a/bindings/matrix-sdk-ffi/Cargo.toml b/bindings/matrix-sdk-ffi/Cargo.toml
@@ -42,7 +42,7 @@ tracing-appender = { version = "0.2.2" }
 tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
 tokio-stream = { workspace = true, features = ["time"] }
 uniffi = { workspace = true, features = ["tokio"] }
-url = "2.2.2"
+url = { workspace = true }
 zeroize = { workspace = true }
 uuid = { version = "1.4.1", features = ["v4"] }
 language-tags = "0.3.2"

diff --git a/crates/matrix-sdk-ui/Cargo.toml b/crates/matrix-sdk-ui/Cargo.toml
@@ -50,7 +50,7 @@ tokio = { workspace = true }
 tracing = { workspace = true, features = ["attributes"] }
 unicode-normalization = "0.1.22"
 uniffi = { workspace = true, optional = true }
-url = "2.2.2"
+url = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true }

diff --git a/crates/matrix-sdk/Cargo.toml b/crates/matrix-sdk/Cargo.toml
@@ -108,7 +108,7 @@ tokio-stream = { workspace = true, features = ["sync"] }
 tower = { version = "0.4.13", features = ["make"], optional = true }
 tracing = { workspace = true, features = ["attributes"] }
 uniffi = { workspace = true, optional = true }
-url = "2.2.2"
+url = { workspace = true }
 urlencoding = "2.1.3"
 uuid = { version = "1.4.1", features = ["serde", "v4"], optional = true }
 zeroize = { workspace = true }

diff --git a/examples/backups/Cargo.toml b/examples/backups/Cargo.toml
@@ -14,7 +14,7 @@ tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
 clap = { version = "4.0.15", features = ["derive"] }
 futures-util = "0.3.24"
 tracing-subscriber = "0.3.16"
-url = "2.3.1"
+url = { workspace = true }
 # when copy-pasting this, please use a git dependency or make sure that you
 # have copied the example as it was at the time of the release you use.
 matrix-sdk = { path = "../../crates/matrix-sdk" }

diff --git a/examples/cross_signing_bootstrap/Cargo.toml b/examples/cross_signing_bootstrap/Cargo.toml
@@ -12,7 +12,7 @@ test = false
 anyhow = "1"
 tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
 tracing-subscriber = "0.3.15"
-url = "2.2.2"
+url = { workspace = true }
 # when copy-pasting this, please use a git dependency or make sure that you
 # have copied the example as it was at the time of the release you use.
 matrix-sdk = { path = "../../crates/matrix-sdk" }

diff --git a/examples/emoji_verification/Cargo.toml b/examples/emoji_verification/Cargo.toml
@@ -14,7 +14,7 @@ tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
 clap = { version = "4.0.15", features = ["derive"] }
 futures-util = "0.3.24"
 tracing-subscriber = "0.3.16"
-url = "2.3.1"
+url = { workspace = true }
 # when copy-pasting this, please use a git dependency or make sure that you
 # have copied the example as it was at the time of the release you use.
 matrix-sdk = { path = "../../crates/matrix-sdk" }

diff --git a/examples/get_profiles/Cargo.toml b/examples/get_profiles/Cargo.toml
@@ -12,7 +12,7 @@ test = false
 anyhow = "1"
 tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
 tracing-subscriber = "0.3.15"
-url = "2.2.2"
+url = { workspace = true }
 # when copy-pasting this, please use a git dependency or make sure that you
 # have copied the example as it was at the time of the release you use.
 matrix-sdk = { path = "../../crates/matrix-sdk" }

diff --git a/examples/image_bot/Cargo.toml b/examples/image_bot/Cargo.toml
@@ -13,7 +13,7 @@ anyhow = "1"
 mime = "0.3.16"
 tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
 tracing-subscriber = "0.3.15"
-url = "2.2.2"
+url = { workspace = true }
 # when copy-pasting this, please use a git dependency or make sure that you
 # have copied the example as it was at the time of the release you use.
 matrix-sdk = { path = "../../crates/matrix-sdk" }

diff --git a/examples/login/Cargo.toml b/examples/login/Cargo.toml
@@ -12,7 +12,7 @@ test = false
 anyhow = "1"
 tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
 tracing-subscriber = "0.3.15"
-url = "2.2.2"
+url = { workspace = true }
 # when copy-pasting this, please use a git dependency or make sure that you
 # have copied the example as it was at the time of the release you use.
 matrix-sdk = { path = "../../crates/matrix-sdk", features = ["sso-login"] }

diff --git a/examples/oidc_cli/Cargo.toml b/examples/oidc_cli/Cargo.toml
@@ -20,7 +20,7 @@ serde_json = { workspace = true }
 tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
 tower = { version = "0.4.13", features = ["make"] }
 tracing-subscriber = "0.3.15"
-url = "2.2.2"
+url = { workspace = true }
 
 [dependencies.matrix-sdk]
 path = "../../crates/matrix-sdk"

diff --git a/examples/secret_storage/Cargo.toml b/examples/secret_storage/Cargo.toml
@@ -14,7 +14,7 @@ tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
 clap = { version = "4.0.15", features = ["derive"] }
 futures-util = "0.3.24"
 tracing-subscriber = "0.3.16"
-url = "2.3.1"
+url = { workspace = true }
 # when copy-pasting this, please use a git dependency or make sure that you
 # have copied the example as it was at the time of the release you use.
 matrix-sdk = { path = "../../crates/matrix-sdk" }

diff --git a/examples/timeline/Cargo.toml b/examples/timeline/Cargo.toml
@@ -14,7 +14,7 @@ clap = { version = "4.0.16", features = ["derive"] }
 futures-util = "0.3"
 tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
 tracing-subscriber = "0.3.15"
-url = "2.2.2"
+url = { workspace = true }
 # when copy-pasting this, please use a git dependency or make sure that you
 # have copied the example as it was at the time of the release you use.
 matrix-sdk = { path = "../../crates/matrix-sdk" }

diff --git a/labs/multiverse/Cargo.toml b/labs/multiverse/Cargo.toml
@@ -23,7 +23,7 @@ tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
 tracing = { workspace = true }
 tracing-appender = { version = "0.2.2" }
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-url = "2.2.2"
+url = { workspace = true }
 
 [lints]
 workspace = true