Merge branch 'develop' into ubuntu

holochain · Sep 29, 2021 · 6b71bab · 6b71bab
2 parents dfbccfe + bb98bab
commit 6b71bab
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [macos-latest, ubuntu-18.04, windows-latest]
+        platform: [macos-latest, windows-latest]
     env:
       MACOSX_DEPLOYMENT_TARGET: 10.9
 

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ If you already have a `.webhapp`
 
 Requirements:
 
-- On the zome side, target `hdk v0.0.107`.
+- On the zome side, target `hdk v0.0.108`.
 - On the UI side, target `@holochain/conductor-api v0.2.1` (v0.2.0 is not going to work).
 
 When your UI is served from the launcher and `AppWebsocket.connect()` or `AdminWebsocket.connect()` are called, the call will be redirected to the actual port in which Holochain is running its interfaces. Also, when the `appWebsocket.appInfo({ installed_app_info: <APP_ID> })` is called, the `APP_ID` parameter is going to be replaced with the actual application ID that is installed in the Launcher.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "launcher",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "private": true,
   "scripts": {
     "dev": "npm run build:ui && npm run tauri dev",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 license = ""
 name = "holochain-launcher"
 repository = ""
-version = "0.3.1"
+version = "0.3.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/src-tauri/src/launch.rs b/src-tauri/src/launch.rs
@@ -37,7 +37,7 @@ pub async fn launch_children_processes(admin_port: u16) -> Result<(), String> {
 
   log::info!("Launched lair-keystore");
 
-  thread::sleep(Duration::from_millis(300));
+  thread::sleep(Duration::from_millis(1000));
 
   let (mut holochain_rx, _) = Command::new_sidecar("holochain")
     .or(Err(String::from("Can't find holochain binary")))?

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "Holochain Launcher",
-    "version": "0.3.1"
+    "version": "0.3.2"
   },
   "build": {
     "distDir": "target/webpack_dist",

diff --git a/src/components/About.vue b/src/components/About.vue
@@ -1,7 +1,7 @@
 <template>
   <mwc-dialog heading="About" ref="dialog">
     <div class="column">
-      <span> Holochain Launcher v0.3.1 </span>
+      <span> Holochain Launcher v0.3.2 </span>
       <span style="margin-top: 8px"> Holochain v0.0.108 </span>
       <span style="margin-top: 8px"> Lair Keystore v0.0.4 </span>
     </div>