Upgrade Tauri to latest version (#103)

* Upgrade Tauri to latest version * fix applescript * lock nightly version because ring crate problems Co-authored-by: Özgün Özerk <[email protected]>
autonomys · Mar 24, 2022 · 98465a8 · 98465a8
1 parent 94c7a17
commit 98465a8
Show file tree

Hide file tree

Showing 13 changed files with 909 additions and 2,400 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,3 @@
 PUBLIC_API_WS="wss://aries-farm-rpc-b.subspace.network"
 LOCAL_API_WS="ws://localhost:9944"
-CONTEXT_MENU="OFF"
 DEFAULT_APP_DIR=".subspace-desktop-farmer"
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -27,10 +27,12 @@ jobs:
         with:
           node-version: 16
 
+      # TODO: when https://github.com/rust-lang/rust/issues/95267 and https://github.com/briansmith/ring/issues/1469
+      # are resolved, revert back to `nightly`
       - name: install Rust nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2022-02-15
           target: wasm32-unknown-unknown
           override: true
           components: rustfmt, clippy
@@ -65,7 +67,7 @@ jobs:
         run: yarn install --network-timeout 1000000 && yarn build
 
       - name: tauri run
-        uses: tauri-apps/tauri-action@v0.2
+        uses: tauri-apps/tauri-action@v0.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,10 +21,12 @@ jobs:
         with:
           node-version: 16
 
+      # TODO: when https://github.com/rust-lang/rust/issues/95267 and https://github.com/briansmith/ring/issues/1469
+      # are resolved, revert back to `nightly`
       - name: install Rust nightly
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2022-02-15
           override: true
 
         # Workaround to resolve link error with C:\msys64\mingw64\bin\libclang.dll
@@ -56,7 +58,7 @@ jobs:
         run: yarn install --network-timeout 1000000 && yarn build
 
       - name: tauri run
-        uses: tauri-apps/tauri-action@v0.2
+        uses: tauri-apps/tauri-action@v0.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ENABLE_CODE_SIGNING: ${{ secrets.MACOS_CERTIFICATE }}

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@polkadot/api": "^7.2.1",
     "@quasar/extras": "^1.0.0",
-    "@tauri-apps/api": "^1.0.0-beta.8",
+    "@tauri-apps/api": "^1.0.0-rc.2",
     "@tsmx/human-readable": "^1.0.6",
     "@vueuse/core": "^6.0.0",
     "apexcharts": "^3.27.3",
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@quasar/app": "^3.0.0",
-    "@tauri-apps/cli": "^1.0.0-beta.10",
+    "@tauri-apps/cli": "^1.0.0-rc.7",
     "@types/": "tsmx/human-readable",
     "@types/bcryptjs": "^2.4.2",
     "@types/javascript-time-ago": "^2.0.3",