fix: use git dependency on radicle, drop features

With this, importing radicle::prelude::RepoId works for me again.

Signed-off-by: Lars Wirzenius <liw@liw.fi>

4 files changed, 8 insertions, 21 deletions

diff --git a/Cargo.lock b/Cargo.lock
index e04b523..9cae40a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1063,15 +1063,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "qcheck"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b439bd4242da51d62d18c95e6a6add749346756b0d1a587dfd0cc22fa6b5f3f0"
-dependencies = [
- "rand",
-]
-
-[[package]]
 name = "quote"
 version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1083,7 +1074,7 @@ dependencies = [
 [[package]]
 name = "radicle"
 version = "0.2.0"
-source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#e12bff0871a57116f057fd1a93f7ddede8c574bc"
+source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#137961c1f72a6850325b05e65a232cd202cbd12c"
 dependencies = [
  "amplify",
  "base64 0.21.7",
@@ -1097,7 +1088,6 @@ dependencies = [
  "multibase",
  "nonempty 0.9.0",
  "once_cell",
- "qcheck",
  "radicle-cob",
  "radicle-crypto",
  "radicle-git-ext",
@@ -1131,7 +1121,7 @@ dependencies = [
 [[package]]
 name = "radicle-cob"
 version = "0.2.0"
-source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#e12bff0871a57116f057fd1a93f7ddede8c574bc"
+source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#137961c1f72a6850325b05e65a232cd202cbd12c"
 dependencies = [
  "fastrand",
  "git2",
@@ -1149,14 +1139,12 @@ dependencies = [
 [[package]]
 name = "radicle-crypto"
 version = "0.2.0"
-source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#e12bff0871a57116f057fd1a93f7ddede8c574bc"
+source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#137961c1f72a6850325b05e65a232cd202cbd12c"
 dependencies = [
  "amplify",
  "cyphernet",
  "ec25519",
- "fastrand",
  "multibase",
- "qcheck",
  "radicle-git-ext",
  "radicle-ssh",
  "serde",
@@ -1169,7 +1157,7 @@ dependencies = [
 [[package]]
 name = "radicle-dag"
 version = "0.2.0"
-source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#e12bff0871a57116f057fd1a93f7ddede8c574bc"
+source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#137961c1f72a6850325b05e65a232cd202cbd12c"
 dependencies = [
  "fastrand",
 ]
@@ -1191,7 +1179,7 @@ dependencies = [
 [[package]]
 name = "radicle-ssh"
 version = "0.2.0"
-source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#e12bff0871a57116f057fd1a93f7ddede8c574bc"
+source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#137961c1f72a6850325b05e65a232cd202cbd12c"
 dependencies = [
  "byteorder",
  "log",
diff --git a/Cargo.toml b/Cargo.toml
index 07ce2cf..f25d1dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
 name = "radicle-ci-broker"
 version = "0.1.0"
 edition = "2021"
+rust-version = "1.74"
 
 [dependencies]
 log = "0.4.20"
@@ -17,8 +18,6 @@ uuid = { version = "1.7.0", features = ["v4"] }
 [dependencies.radicle]
 git = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"
 branch = "master"
-#path = "../heartwood/radicle"
-features = ["default", "test"]
 
 [dev-dependencies]
 tempfile = { version = "3.9.0" }
diff --git a/src/broker.rs b/src/broker.rs
index 5058a7f..3676f2e 100644
--- a/src/broker.rs
+++ b/src/broker.rs
@@ -5,7 +5,7 @@
 
 use std::collections::HashMap;
 
-use radicle::identity::RepoId;
+use radicle::prelude::RepoId;
 
 use crate::{adapter::Adapter, error::BrokerError, msg::Request, run::Run};
 
diff --git a/src/error.rs b/src/error.rs
index 74c303d..c70bc1d 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -6,7 +6,7 @@
 
 use std::path::PathBuf;
 
-use radicle::identity::RepoId;
+use radicle::prelude::RepoId;
 
 use crate::{
     adapter::AdapterError,