bumps deps and cleanup

Cargo.toml

@@ -4,6 +4,7 @@ resolver = "2"
 
 [workspace.dependencies]
 <<<<<<< HEAD
+<<<<<<< HEAD
 hdi = "=0.4.1"
 hdk = "=0.3.1"
 serde = "=1.0.197"
@@ -12,14 +13,20 @@ hdi = "=0.3.6"
 hdk = "=0.2.6"
 serde = "1"
 >>>>>>> fc59da2 (refer to 2.6 for now)
+=======
+hdi = "=0.4.1"
+hdk = "=0.3.1"
+serde = "=1.0.197"
+>>>>>>> 3f31646 (bumps deps and cleanup)
 paste = "1.0"
 rand = "0.8.5"
-hc_prefix_index = "0.10.0"
+hc_prefix_index = "0.11.0"
 regex = "1.10.3"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 hc_zome_profiles_coordinator = { git = "https://github.com/holochain-open-dev/profiles.git", rev = "a1a487c8d6a8fd9910ba9b3f26e47df0bf0d09ae" }
 hc_zome_profiles_integrity = { git = "https://github.com/holochain-open-dev/profiles.git", rev = "a1a487c8d6a8fd9910ba9b3f26e47df0bf0d09ae" }
 =======
@@ -44,6 +51,11 @@ hc_zome_profiles_integrity = { git="https://github.com/holochain-open-dev/profil
 =======
 trust_atom_types = { git = "https://github.com/trustgraph/trustgraph-holochain.git", package = "trust_atom_types", branch = "tgmf-2.6"}
 >>>>>>> fc59da2 (refer to 2.6 for now)
+=======
+hc_zome_profiles_coordinator = { git="https://github.com/holochain-open-dev/profiles.git", branch="for-hdk-v0.3.1"}
+hc_zome_profiles_integrity = { git="https://github.com/holochain-open-dev/profiles.git", branch="for-hdk-v0.3.1"}
+trust_atom_types = { git = "https://github.com/trustgraph/trustgraph-holochain.git", package = "trust_atom_types", branch = "chore/hc3"}
+>>>>>>> 3f31646 (bumps deps and cleanup)
 
 [workspace.dependencies.agent_pins]
 path = "dnas/mewsfeed/zomes/coordinator/agent_pins"

crates/mews_types/src/lib.rs

@@ -2,7 +2,7 @@ use hc_link_pagination::Timestamped;
 use hdk::prelude::*;
 use std::collections::BTreeMap;
 
-pub const FOLLOW_TOPIC: &str = "__FOLLOW__";
+pub const FOLLOW_TOPIC: &str = "__DEFAULT__";
 
 #[derive(Serialize, Deserialize, SerializedBytes, Debug, Clone, PartialEq, Eq)]
 pub enum LinkTarget {

dnas/mewsfeed/zomes/coordinator/trust_atom/Cargo.toml

@@ -8,7 +8,7 @@ crate-type = ["cdylib", "rlib"]
 name = "trust_atom_zome"
 
 [dependencies]
-trust_atom = { git = "https://github.com/trustgraph/trustgraph-holochain.git", package = "trust_atom", branch = "tgmf-2.6" }
+trust_atom = { git = "https://github.com/trustgraph/trustgraph-holochain.git", package = "trust_atom", branch = "chore/hc3" }
 follows = { workspace = true }
 mews_types = { workspace = true }
 
@@ -17,7 +17,7 @@ serde = { workspace = true }
 rust_decimal = "1"
 
 [dev-dependencies]
-holochain = { version = "=0.2.2", default-features = false, features = [
+holochain = { version = "=0.3.1", default-features = false, features = [
     "test_utils",
 ] }
 tokio = { version = "1.3", features = ["full"] }

dnas/mewsfeed/zomes/integrity/mews/src/prefix_index_to_cashtags.rs

@@ -1,10 +1,13 @@
 use hc_prefix_index::PrefixIndex;
 use hdi::prelude::*;
+<<<<<<< HEAD
 use hdi::prelude::*;
 <<<<<<< HEAD
 =======
 use hc_prefix_index::PrefixIndex;
 >>>>>>> fd06e03 (build: bump deps to holochain 0.2.6)
+=======
+>>>>>>> 3f31646 (bumps deps and cleanup)
 
 pub fn validate_create_link_prefix_index_to_cashtags(
     _action: CreateLink,

dnas/mewsfeed/zomes/integrity/trust_atom/Cargo.toml

@@ -8,7 +8,7 @@ crate-type = ["cdylib", "rlib"]
 name = "trust_atom_integrity_zome"
 
 [dependencies]
-trust_atom_integrity = { git = "https://github.com/trustgraph/trustgraph-holochain.git", package = "trust_atom_integrity", branch = "tgmf-2.6" }
+trust_atom_integrity = { git = "https://github.com/trustgraph/trustgraph-holochain.git", package = "trust_atom_integrity", branch = "chore/hc3" }
 
 hdk = { workspace = true }
 serde = { workspace = true }