Fixed compilation

.github/workflows/release.yaml

@@ -94,7 +94,7 @@ jobs:
         if: matrix.platform == 'ubuntu-18.04'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libcanberra-gtk-module libcanberra-gtk3-module build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools libgtksourceview-3.0-dev libappindicator3-dev patchelf librsvg2-dev
+          sudo apt-get install -y libwebkit2gtk-4.0-dev libcanberra-gtk-module libcanberra-gtk3-module build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools libgtksourceview-3.0-dev libappindicator3-dev patchelf librsvg2-dev ayatana-indicator-application
 
       - name: install Caddy (ubuntu)
         if: matrix.platform == 'ubuntu-18.04'

crates/holochain_manager/Cargo.toml

@@ -33,6 +33,6 @@ portpicker = "0.1.1"
 serde = {version = "1", features = ["derive"]}
 serde-enum-str = "0.2"
 serde_yaml = "0.8"
-tauri = {version = "=1.0.0-rc.7", features = ["api-all", "system-tray"]}
+tauri = {version = "=1.0.0-rc.7", features = ["api-all", "gtk-tray", "system-tray", "wry"], default-features = false}
 thiserror = "1.0.30"
 url2 = "0.0.6"

crates/holochain_web_app_manager/Cargo.toml

@@ -15,7 +15,7 @@ log = "0.4.14"
 portpicker = "0.1.1"
 serde = {version = "1", features = ["derive"]}
 serde_yaml = "0.8"
-tauri = {version = "=1.0.0-rc.7", features = ["api-all", "system-tray"]}
+tauri = {version = "=1.0.0-rc.7", features = ["api-all", "gtk-tray", "system-tray", "wry"], default-features = false}
 thiserror = "1.0.30"
 url2 = "0.0.6"
 zip = "0.5.0"

crates/holochain_web_app_manager/src/web_app_manager.rs

@@ -17,7 +17,6 @@ use std::{
   fs::{self, File},
   path::{Path, PathBuf},
 };
-use tauri::{AppHandle, Manager};
 
 use crate::{
   caddy::manager::CaddyManager,
@@ -31,15 +30,13 @@ pub struct WebAppManager {
   holochain_manager: HolochainManager,
   caddy_manager: CaddyManager,
   allocated_ports: HashMap<String, u16>,
-  app_handle: AppHandle,
 }
 
 impl WebAppManager {
   pub async fn launch(
     version: HolochainVersion,
     mut config: LaunchHolochainConfig,
     password: String,
-    app_handle: AppHandle,
   ) -> Result<Self, LaunchWebAppManagerError> {
     let environment_path = config.environment_path.clone();
 
@@ -70,7 +67,6 @@ impl WebAppManager {
       environment_path,
       caddy_manager,
       allocated_ports: HashMap::new(),
-      app_handle,
     };
     manager
       .on_running_apps_changed()
@@ -163,11 +159,6 @@ impl WebAppManager {
       .update_running_apps(&installed_apps)
       .map_err(|err| format!("Error reloading caddy {:?}", err))?;
 
-    self
-      .app_handle
-      .emit_all("running_apps_changed", ())
-      .map_err(|err| format!("Error sending running_apps_changed event {:?}", err))?;
-
     Ok(())
   }
 

crates/lair_keystore_manager/Cargo.toml

@@ -12,6 +12,6 @@ async-trait = "0.1.52"
 log = "0.4.14"
 serde = {version = "1", features = ["derive"]}
 serde-enum-str = "0.2"
-tauri = {version = "=1.0.0-rc.7", features = ["api-all", "system-tray"]}
+tauri = {version = "=1.0.0-rc.7", features = ["api-all", "gtk-tray", "system-tray", "wry"], default-features = false}
 thiserror = "1.0.30"
 url2 = "0.0.6"

src-tauri/Cargo.toml

@@ -35,7 +35,7 @@ serde = {version = "1", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.8"
 sysinfo = "0.23.5"
-tauri = {version = "=1.0.0-rc.7", features = ["api-all", "system-tray"] }
+tauri = {version = "=1.0.0-rc.7", features = ["api-all", "gtk-tray", "system-tray", "wry"], default-features = false}
 thiserror = "1.0.30"
 url = "2.2.2"
 url2 = "0.0.6"

src-tauri/src/launcher/default_apps.rs

@@ -14,7 +14,7 @@ pub async fn install_default_apps_if_necessary(manager: &mut WebAppManager) -> R
       .install_web_app(
         String::from("DevHub"),
         dev_hub_bundle,
-        Some(String::from("0002")),
+        Some(String::from("0001")),
         HashMap::new(),
         None,
       )

src-tauri/src/launcher/manager.rs

@@ -186,7 +186,7 @@ impl LauncherManager {
     let version_str: String = version.into();
 
     let state =
-      match WebAppManager::launch(version, config, password, self.app_handle.clone()).await {
+      match WebAppManager::launch(version, config, password).await {
         Ok(mut manager) => match version.eq(&self.config.default_version) {
           true => match install_default_apps_if_necessary(&mut manager).await {
             Ok(()) => {