Merge pull request #19 from darksoil-studio/develop

Updated client to 0.5
darksoil-studio · Jul 19, 2024 · 7726bfb · 7726bfb
2 parents c8516b7 + 9166f59
commit 7726bfb
Show file tree

Hide file tree

Showing 15 changed files with 533 additions and 773 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/hc-pilot/Cargo.toml b/crates/hc-pilot/Cargo.toml
@@ -11,7 +11,7 @@ tauri-plugin-log = "2.0.0-beta"
 
 tauri-plugin-holochain = { path = "../tauri-plugin-holochain" }
 holochain_types = "0.3.1"
-holochain_client = "0.5.0-rc"
+holochain_client = "0.5.0"
 
 clap = { version = "4.5.4", features = ["derive"] }
 log = "0.4"

diff --git a/crates/scaffold-holochain-runtime/templates/holochain-runtime/flake.nix.hbs b/crates/scaffold-holochain-runtime/templates/holochain-runtime/flake.nix.hbs
@@ -2,7 +2,7 @@
   description = "Template for Holochain app development";
 
   inputs = {
-    versions.url = "github:holochain/holochain?dir=versions/0_3_rc";
+    versions.url = "github:holochain/holochain?dir=versions/0_3";
 
     holochain.url = "github:holochain/holochain";
     holochain.inputs.versions.follows = "versions";

diff --git a/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/Cargo.toml.hbs b/crates/scaffold-holochain-runtime/templates/holochain-runtime/src-tauri/Cargo.toml.hbs
@@ -21,8 +21,8 @@ tauri-build = { version = "2.0.0-beta.17", default-features = false , features =
 tauri = { version = "2.0.0-beta.22", features = [] }
 tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/p2p-shipyard", branch = "main" }
 holochain_types = { version = "0.3.1" }
-lair_keystore = { version = "0.4.0" }
-holochain_client = { version = "0.5.0-rc" }
+lair_keystore = { version = "0.4" }
+holochain_client = { version = "0.5" }
 log = "0.4"
 tauri-plugin-log = "2.0.0-beta"
 url2 = "0.0.6"

diff --git a/crates/scaffold-tauri-happ/fixture/flake.nix b/crates/scaffold-tauri-happ/fixture/flake.nix
@@ -2,7 +2,7 @@
   description = "Template for Holochain app development";
 
   inputs = {
-    versions.url = "github:holochain/holochain?dir=versions/0_3_rc";
+    versions.url = "github:holochain/holochain?dir=versions/0_3";
 
     holochain.url = "github:holochain/holochain";
     holochain.inputs.versions.follows = "versions";

diff --git a/crates/scaffold-tauri-happ/run_test.sh b/crates/scaffold-tauri-happ/run_test.sh
@@ -3,11 +3,11 @@ set -e
 
 DIR=$(pwd)
 
-nix shell --override-input versions "github:holochain/holochain?dir=versions/0_3_rc" github:holochain/holochain#hc-scaffold --command bash -c "
+nix shell --override-input versions "github:holochain/holochain?dir=versions/0_3" github:holochain/holochain#hc-scaffold --command bash -c "
 cd /tmp
 rm -rf forum-scaffold-tauri-happ
 
-hc-scaffold --template lit web-app forum-scaffold-tauri-happ --setup-nix true -F
+hc-scaffold --template lit web-app forum-scaffold-tauri-happ --setup-nix true -F --package-manager npm
 cd /tmp/forum-scaffold-tauri-happ
 nix flake update
 nix develop --command bash -c \"npm i && hc scaffold dna forum && hc scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/\"

diff --git a/crates/scaffold-tauri-happ/templates/end-user-happ/src-tauri/Cargo.toml.hbs b/crates/scaffold-tauri-happ/templates/end-user-happ/src-tauri/Cargo.toml.hbs
@@ -21,9 +21,9 @@ tauri-build = { version = "2.0.0-beta.17", default-features = false , features =
 tauri = { version = "2.0.0-beta.22", features = [] }
 tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/p2p-shipyard", branch = "main" }
 holochain_types = { version = "0.3.1" }
-lair_keystore = { version = "0.4.0" }
+lair_keystore = { version = "0.4" }
 
-holochain_client = { version = "0.5.0-rc" }
+holochain_client = { version = "0.5" }
 
 log = "0.4"
 tauri-plugin-log = "2.0.0-beta"

diff --git a/crates/tauri-plugin-holochain/Cargo.toml b/crates/tauri-plugin-holochain/Cargo.toml
@@ -32,7 +32,7 @@ lair_keystore = "0.4.0"
 lair_keystore_api = "0.4.0"
 
 # Holochain client
-holochain_client = { git = "https://github.com/guillemcordoba/holochain-client-rust", branch = "main" }
+holochain_client = "0.5"
 
 local-ip-address = "0.6"
 serde_json = "1"