From 924a2624a43e1497b48bee25cc8f12cb6bd6e102 Mon Sep 17 00:00:00 2001 From: Fintan Halpenny Date: Mon, 4 Dec 2023 11:11:36 +0000 Subject: [PATCH] git: update git2-0.18.1 Update to git2-0.18.1, which also requires updating radicle-git-ext and radicle-surf. Signed-off-by: Fintan Halpenny X-Clacks-Overhead: GNU Terry Pratchett --- Cargo.lock | 18 +++++++++--------- radicle-cli/Cargo.toml | 4 ++-- radicle-cob/Cargo.toml | 4 ++-- radicle-crypto/Cargo.toml | 2 +- radicle-fetch/Cargo.toml | 2 +- radicle-httpd/Cargo.toml | 2 +- radicle-node/Cargo.toml | 2 +- radicle-remote-helper/Cargo.toml | 2 +- radicle-term/Cargo.toml | 2 +- radicle-tools/Cargo.toml | 2 +- radicle/Cargo.toml | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae9b40e9..349d69a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1000,11 +1000,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.17.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "libc", "libgit2-sys", "log", @@ -1700,9 +1700,9 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.16.1+1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" dependencies = [ "cc", "libc", @@ -2420,9 +2420,9 @@ dependencies = [ [[package]] name = "radicle-git-ext" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc5efea239afa1fb374923be50c3a5f98cec92d53b5fa55bdf57ac76b16433" +checksum = "7ba40f0288f73b9464c0f52c09261593777ed6f195ef3be6a12d8f8e920d7885" dependencies = [ "git-ref-format", "git2", @@ -2533,9 +2533,9 @@ checksum = "db20136bbc9ae63f3fec8e5a6c369f4902fac2244501b5dfc6d668e43475aaa4" [[package]] name = "radicle-surf" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4c942246ed4db15d26de46dfc86ee35af6f31af0d3e1fe14a36990c95cb129" +checksum = "9403736ddf2be5e7de42928f94a5f68ef0785916171d009809d19b4202b58d83" dependencies = [ "anyhow", "base64 0.13.1", diff --git a/radicle-cli/Cargo.toml b/radicle-cli/Cargo.toml index 53047743..a577e6c7 100644 --- a/radicle-cli/Cargo.toml +++ b/radicle-cli/Cargo.toml @@ -20,8 +20,8 @@ log = { version = "0.4", features = ["std"] } nonempty = { version = "0.8" } # N.b. this is required to use macros, even though it's re-exported # through radicle -radicle-git-ext = { version = "0.6.0", features = ["serde"] } -radicle-surf = { version = "0.17.1" } +radicle-git-ext = { version = "0.7.0", features = ["serde"] } +radicle-surf = { version = "0.18.0" } serde = { version = "1.0" } serde_json = { version = "1" } serde_yaml = { version = "0.8" } diff --git a/radicle-cob/Cargo.toml b/radicle-cob/Cargo.toml index 3ae20686..b20028ff 100644 --- a/radicle-cob/Cargo.toml +++ b/radicle-cob/Cargo.toml @@ -22,12 +22,12 @@ fastrand = { version = "2.0.0" } log = { version = "0.4.17" } nonempty = { version = "0.8.1", features = ["serialize"] } once_cell = { version = "1.13" } -radicle-git-ext = { version = "0.6.0", features = ["serde"] } +radicle-git-ext = { version = "0.7.0", features = ["serde"] } serde_json = { version = "1.0" } thiserror = { version = "1.0" } [dependencies.git2] -version = "0.17.0" +version = "0.18.1" default-features = false features = ["vendored-libgit2"] diff --git a/radicle-crypto/Cargo.toml b/radicle-crypto/Cargo.toml index edd3f60a..b6dde86a 100644 --- a/radicle-crypto/Cargo.toml +++ b/radicle-crypto/Cargo.toml @@ -27,7 +27,7 @@ thiserror = { version = "1" } zeroize = { version = "1.5.7" } [dependencies.radicle-git-ext] -version = "0.6.0" +version = "0.7.0" default-features = false optional = true diff --git a/radicle-fetch/Cargo.toml b/radicle-fetch/Cargo.toml index 044cb252..478db54b 100644 --- a/radicle-fetch/Cargo.toml +++ b/radicle-fetch/Cargo.toml @@ -17,7 +17,7 @@ gix-protocol = { version = "0.41.1", features = ["blocking-client"] } gix-transport = { version = "0.38", features = ["blocking-client"] } log = { version = "0.4.17", features = ["std"] } nonempty = { version = "0.8.1" } -radicle-git-ext = { version = "0.6.0", features = ["bstr"] } +radicle-git-ext = { version = "0.7.0", features = ["bstr"] } thiserror = { version = "1" } [dependencies.radicle] diff --git a/radicle-httpd/Cargo.toml b/radicle-httpd/Cargo.toml index e539aacc..2c50bfb5 100644 --- a/radicle-httpd/Cargo.toml +++ b/radicle-httpd/Cargo.toml @@ -27,7 +27,7 @@ hyper = { version = "0.14.17", default-features = false } lexopt = { version = "0.2.1" } lru = { version = "0.11.0" } nonempty = { version = "0.8.1", features = ["serialize"] } -radicle-surf = { version = "0.17.1", default-features = false, features = ["serde"] } +radicle-surf = { version = "0.18.0", default-features = false, features = ["serde"] } serde = { version = "1", features = ["derive"] } serde_json = { version = "1", features = ["preserve_order"] } thiserror = { version = "1" } diff --git a/radicle-node/Cargo.toml b/radicle-node/Cargo.toml index 4a5da1d7..42071c62 100644 --- a/radicle-node/Cargo.toml +++ b/radicle-node/Cargo.toml @@ -30,7 +30,7 @@ once_cell = { version = "1.13" } qcheck = { version = "1", default-features = false, optional = true } # N.b. this is required to use macros, even though it's re-exported # through radicle -radicle-git-ext = { version = "0.6.0", features = ["serde"] } +radicle-git-ext = { version = "0.7.0", features = ["serde"] } sqlite = { version = "0.32.0" } scrypt = { version = "0.10.0", default-features = false } serde = { version = "1", features = ["derive"] } diff --git a/radicle-remote-helper/Cargo.toml b/radicle-remote-helper/Cargo.toml index ed1b29fa..a52965b4 100644 --- a/radicle-remote-helper/Cargo.toml +++ b/radicle-remote-helper/Cargo.toml @@ -8,7 +8,7 @@ build = "../build.rs" [dependencies] thiserror = "1" -radicle-git-ext = { version = "0.6.0" } +radicle-git-ext = { version = "0.7.0" } [dependencies.radicle] path = "../radicle" diff --git a/radicle-term/Cargo.toml b/radicle-term/Cargo.toml index 8af409c0..5ec1d1a9 100644 --- a/radicle-term/Cargo.toml +++ b/radicle-term/Cargo.toml @@ -23,7 +23,7 @@ unicode-segmentation = { version = "1.7.1" } zeroize = { version = "1.1" } [dependencies.git2] -version = "0.17.0" +version = "0.18.1" default-features = false features = ["vendored-libgit2"] optional = true diff --git a/radicle-tools/Cargo.toml b/radicle-tools/Cargo.toml index 447b3bbf..aadb8a24 100644 --- a/radicle-tools/Cargo.toml +++ b/radicle-tools/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" anyhow = { version = "1" } # N.b. this is required to use macros, even though it's re-exported # through radicle -radicle-git-ext = { version = "0.6.0", features = ["serde"] } +radicle-git-ext = { version = "0.7.0", features = ["serde"] } [dependencies.radicle] version = "0" diff --git a/radicle/Cargo.toml b/radicle/Cargo.toml index 32514283..21bff494 100644 --- a/radicle/Cargo.toml +++ b/radicle/Cargo.toml @@ -25,14 +25,14 @@ once_cell = { version = "1.13" } serde = { version = "1", features = ["derive"] } serde_json = { version = "1", features = ["preserve_order"] } siphasher = { version = "0.3.10" } -radicle-git-ext = { version = "0.6.0", features = ["serde"] } +radicle-git-ext = { version = "0.7.0", features = ["serde"] } sqlite = { version = "0.32.0", features = ["bundled"] } tempfile = { version = "3.3.0" } thiserror = { version = "1" } unicode-normalization = { version = "0.1" } [dependencies.git2] -version = "0.17.0" +version = "0.18.1" default-features = false features = ["vendored-libgit2"]