Skip to content

Commit 5589307

Browse files
feat: Tauri 2.0 (#1054)
Updates Tauri to version 2.0 and updates code and other dependencies with it. Loses some functionality in the process. See pull request description for full info.
1 parent 56b11ed commit 5589307

35 files changed

+3495
-2692
lines changed

.github/workflows/push-test.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
if: matrix.platform == 'ubuntu-22.04'
5050
run: |
5151
sudo apt-get update
52-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
52+
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev
5353
- name: Create dist folder (Ubuntu only)
5454
if: matrix.platform == 'ubuntu-22.04'
5555
run: mkdir --parent src-vue/dist
@@ -70,7 +70,7 @@ jobs:
7070
- name: install dependencies (ubuntu only)
7171
run: |
7272
sudo apt-get update
73-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
73+
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev
7474
7575
- name: Move original TypeScript bindings
7676
run: |
@@ -112,28 +112,28 @@ jobs:
112112
if: matrix.platform == 'ubuntu-22.04'
113113
run: |
114114
sudo apt-get update
115-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
116-
- name: Disable self-updater
117-
shell: bash
118-
run: |
119-
jq '.tauri.updater.active = false' src-tauri/tauri.conf.json > src-tauri/tauri.conf.json.new
120-
rm src-tauri/tauri.conf.json
121-
mv src-tauri/tauri.conf.json.new src-tauri/tauri.conf.json
115+
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev
116+
# - name: Disable self-updater
117+
# shell: bash
118+
# run: |
119+
# jq '.tauri.updater.active = false' src-tauri/tauri.conf.json > src-tauri/tauri.conf.json.new
120+
# rm src-tauri/tauri.conf.json
121+
# mv src-tauri/tauri.conf.json.new src-tauri/tauri.conf.json
122122
- uses: Swatinem/rust-cache@v2 # Cache Rust build artifacts
123123
with:
124124
workspaces: |
125125
src-tauri
126126
- name: install app dependencies and build it
127127
env:
128-
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
128+
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
129129
run: |
130130
npm clean-install
131131
cd src-vue && npm clean-install && cd ..
132132
npm run tauri build
133133
- uses: tauri-apps/tauri-action@v0
134134
env:
135135
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
136-
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
136+
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
137137
- name: Upload Linux artifact
138138
if: matrix.platform == 'ubuntu-22.04'
139139
uses: actions/upload-artifact@v4

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ jobs:
4949
src-tauri
5050
- name: install app dependencies and build it
5151
env:
52-
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
52+
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
5353
run: |
5454
npm clean-install
5555
cd src-vue && npm clean-install && cd ..
5656
npm run tauri build
5757
- uses: tauri-apps/tauri-action@v0
5858
env:
5959
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60-
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
60+
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
6161
- name: upload build artifact
6262
uses: actions/upload-artifact@v4
6363
with:

package-lock.json

+70-53
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
"tauri": "tauri"
55
},
66
"dependencies": {
7-
"@tauri-apps/api": "^1.6.0"
7+
"@tauri-apps/api": "^2",
8+
"@tauri-apps/plugin-opener": "^2"
89
},
910
"devDependencies": {
10-
"@tauri-apps/cli": "^1.6.0"
11+
"@tauri-apps/cli": "^2"
1112
}
1213
}

scripts/check_version_numbers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
with open("src-tauri/Cargo.toml", "rt") as f:
1111
Cargo_toml = toml.load(f)
1212

13-
tauri_conf_json_version = tauri_conf_json["package"]["version"]
13+
tauri_conf_json_version = tauri_conf_json["version"]
1414
Cargo_toml_version = Cargo_toml["package"]["version"]
1515

1616
# Ensure same

src-tauri/.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
# Generated by Cargo
22
# will have compiled files and executables
33
/target/
4+
5+
# Generated by Tauri
6+
# will have schema files for capabilities auto-completion
7+
/gen/schemas

0 commit comments

Comments
 (0)