Radish alpha
h
heartwood
rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5
Radicle Heartwood Protocol & Stack
Radicle
Git
Patches › bb23abed
Update `git2` and `radicle-surf` dependencies
Merged did:key:z6MkkfM3...sVz5 opened 1 year ago
  • Update git2 to 0.19.0
  • Update radicle-git-ext to 0.8.0
  • Update radicle-surf to 0.22.0
  • Relax version requirement for radicle dependencies

Since a few crates rely on the radicle crate, dependency updates that affect multiple crates like git2 are not able to resolve the dependencies and fail, if the version is fixed to e.g. 0.12.0

Activity Changes +24 -24
12 files changed +24 -24 eb432b9b → c0aecbac
modified Cargo.lock
@@ -795,9 +795,9 @@ dependencies = [


[[package]]

name = "git2"
- 
version = "0.18.3"
+ 
version = "0.19.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
+ 
checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"

dependencies = [

 "bitflags 2.5.0",

 "libc",
@@ -1371,9 +1371,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"


[[package]]

name = "libgit2-sys"
- 
version = "0.16.2+1.7.2"
+ 
version = "0.17.0+1.8.1"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
+ 
checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"

dependencies = [

 "cc",

 "libc",
@@ -2040,9 +2040,9 @@ dependencies = [


[[package]]

name = "radicle-git-ext"
- 
version = "0.7.0"
+ 
version = "0.8.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "7ba40f0288f73b9464c0f52c09261593777ed6f195ef3be6a12d8f8e920d7885"
+ 
checksum = "16d2e8a6292811e44388e6068fcaf1040401e1f6a7a58cf48cc121cf7453c19d"

dependencies = [

 "git-ref-format",

 "git2",
@@ -2129,9 +2129,9 @@ checksum = "db20136bbc9ae63f3fec8e5a6c369f4902fac2244501b5dfc6d668e43475aaa4"


[[package]]

name = "radicle-surf"
- 
version = "0.21.0"
+ 
version = "0.22.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "5fae23233ff8be809a822d923e93e56e5282179039b19f345f39f592c1ca0765"
+ 
checksum = "fb308c3989087f71e43d8c7a2737273fdc7fbcd3e6628af81a42f601ae64f314"

dependencies = [

 "anyhow",

 "base64 0.13.1",
modified radicle-cli-test/Cargo.toml
@@ -20,5 +20,5 @@ thiserror = { version = "1" }


[dependencies.radicle]

path = "../radicle"
- 
version = "0.12.0"
+ 
version = "0"

features = ["logger", "test"]
modified radicle-cli/Cargo.toml
@@ -22,8 +22,8 @@ log = { version = "0.4", features = ["std"] }
nonempty = { version = "0.9.0" }

# N.b. this is required to use macros, even though it's re-exported

# through radicle
- 
radicle-git-ext = { version = "0.7.0", features = ["serde"] }
- 
radicle-surf = { version = "0.21.0" }
+ 
radicle-git-ext = { version = "0.8.0", features = ["serde"] }
+ 
radicle-surf = { version = "0.22.0" }

serde = { version = "1.0" }

serde_json = { version = "1" }

shlex = { version = "1.1.0" }
@@ -47,7 +47,7 @@ tree-sitter-md = { version = "0.1.5" }
zeroize = { version = "1.1" }



[dependencies.radicle]
- 
version = "0.12.0"
+ 
version = "0"

path = "../radicle"

features = ["logger"]
@@ -69,7 +69,7 @@ path = "../radicle-term"


[dev-dependencies]

pretty_assertions = { version = "1.3.0" }
- 
radicle = { version = "0.12.0", path = "../radicle", features = ["test"] }
+ 
radicle = { version = "0", path = "../radicle", features = ["test"] }

radicle-node = { path = "../radicle-node", features = ["test"] }



[lints]
modified radicle-cob/Cargo.toml
@@ -22,12 +22,12 @@ fastrand = { version = "2.0.0" }
log = { version = "0.4.17" }

nonempty = { version = "0.9.0", features = ["serialize"] }

once_cell = { version = "1.13" }
- 
radicle-git-ext = { version = "0.7.0", features = ["serde"] }
+ 
radicle-git-ext = { version = "0.8.0", features = ["serde"] }

serde_json = { version = "1.0" }

thiserror = { version = "1.0" }



[dependencies.git2]
- 
version = "0.18.1"
+ 
version = "0.19.0"

default-features = false

features = ["vendored-libgit2"]
modified radicle-cob/src/backend/git/change.rs
@@ -197,7 +197,7 @@ impl change::Storage for git2::Repository {
            return Err(error::Load::TooManyResources(id));

        };
- 
        let tree = self.find_tree(commit.tree())?;
+ 
        let tree = self.find_tree(*commit.tree())?;

        let manifest = load_manifest(self, &tree)?;

        let contents = load_contents(self, &tree)?;
modified radicle-crypto/Cargo.toml
@@ -27,7 +27,7 @@ thiserror = { version = "1" }
zeroize = { version = "1.5.7" }



[dependencies.radicle-git-ext]
- 
version = "0.7.0"
+ 
version = "0.8.0"

default-features = false

optional = true
modified radicle-fetch/Cargo.toml
@@ -19,7 +19,7 @@ gix-protocol = { version = "0.45", features = ["blocking-client"] }
gix-transport = { version = "0.42", features = ["blocking-client"] }

log = { version = "0.4.17", features = ["std"] }

nonempty = { version = "0.9.0" }
- 
radicle-git-ext = { version = "0.7.0", features = ["bstr"] }
+ 
radicle-git-ext = { version = "0.8.0", features = ["bstr"] }

thiserror = { version = "1" }



[dependencies.radicle]
modified radicle-node/Cargo.toml
@@ -34,7 +34,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.7.0", features = ["serde"] }
+ 
radicle-git-ext = { version = "0.8.0", features = ["serde"] }

sqlite = { version = "0.32.0", features = ["bundled"] }

scrypt = { version = "0.11.0", default-features = false }

serde = { version = "1", features = ["derive"] }
modified radicle-remote-helper/Cargo.toml
@@ -11,7 +11,7 @@ build = "build.rs"
[dependencies]

thiserror = { version = "1" }

log = { version = "0.4.17" }
- 
radicle-git-ext = { version = "0.7.0" }
+ 
radicle-git-ext = { version = "0.8.0" }



[dependencies.radicle]

path = "../radicle"
modified radicle-term/Cargo.toml
@@ -26,7 +26,7 @@ unicode-segmentation = { version = "1.7.1" }
zeroize = { version = "1.1" }



[dependencies.git2]
- 
version = "0.18.1"
+ 
version = "0.19.0"

default-features = false

features = ["vendored-libgit2"]

optional = true
modified 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.7.0", features = ["serde"] }
+ 
radicle-git-ext = { version = "0.8.0", features = ["serde"] }



[dependencies.radicle]

version = "0"
modified radicle/Cargo.toml
@@ -28,7 +28,7 @@ once_cell = { version = "1.13" }
serde = { version = "1", features = ["derive"] }

serde_json = { version = "1", features = ["preserve_order"] }

siphasher = { version = "1.0.0" }
- 
radicle-git-ext = { version = "0.7.0", features = ["serde"] }
+ 
radicle-git-ext = { version = "0.8.0", features = ["serde"] }

sqlite = { version = "0.32.0", features = ["bundled"] }

tempfile = { version = "3.3.0" }

thiserror = { version = "1" }
@@ -45,7 +45,7 @@ version = "2.1.0"
optional = true



[dependencies.git2]
- 
version = "0.18.1"
+ 
version = "0.19.0"

default-features = false

features = ["vendored-libgit2"]