Skip to content

Commit 5c13736

Browse files
chore: update to tauri alpha.16, api alpha.9 (#673)
Co-authored-by: Amr Bashir <[email protected]>
1 parent b7c5407 commit 5c13736

File tree

132 files changed

+1565
-1688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+1565
-1688
lines changed

.changes/alpha.16.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"log-plugin": patch
3+
---
4+
5+

.changes/api-alpha.9.md

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
"authenticator-js": patch
3+
"autostart-js": patch
4+
"barcode-scanner-js": patch
5+
"cli-js": patch
6+
"clipboard-manager-js": patch
7+
"deep-link-js": patch
8+
"dialog-js": patch
9+
"fs-js": patch
10+
"global-shortcut-js": patch
11+
"http-js": patch
12+
"log-js": patch
13+
"notification-js": patch
14+
"os-js": patch
15+
"positioner-js": patch
16+
"process-js": patch
17+
"shell-js": patch
18+
"sql-js": patch
19+
"store-js": patch
20+
"stronghold-js": patch
21+
"updater-js": patch
22+
"upload-js": patch
23+
"websocket-js": patch
24+
"window-state-js": patch
25+
---
26+
27+
Update to @tauri-apps/api v2.0.0-alpha.16.

.changes/msrv-1.70.md

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
"authenticator": patch
3+
"autostart": patch
4+
"barcode-scanner": patch
5+
"cli": patch
6+
"clipboard-manager": patch
7+
"deep-link": patch
8+
"dialog": patch
9+
"fs": patch
10+
"global-shortcut": patch
11+
"http": patch
12+
"localhost": patch
13+
"log-plugin": patch
14+
"notification": patch
15+
"os": patch
16+
"persisted-scope": patch
17+
"positioner": patch
18+
"process": patch
19+
"shell": patch
20+
"single-instance": patch
21+
"sql": patch
22+
"store": patch
23+
"stronghold": patch
24+
"updater": patch
25+
"upload": patch
26+
"websocket": patch
27+
"window-state": patch
28+
---
29+
30+
Update MSRV to 1.70.

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
target
22
node_modules
33
dist
4+
build/
45
dist-js
56
api-iife.js
7+
init-iife.js
68
init.js

.github/workflows/test-rust.yml

+14-30
Original file line numberDiff line numberDiff line change
@@ -130,31 +130,31 @@ jobs:
130130
- {
131131
target: x86_64-pc-windows-msvc,
132132
os: windows-latest,
133-
cross: false,
133+
runner: 'cargo',
134134
command: "test",
135135
}
136136
- {
137137
target: x86_64-unknown-linux-gnu,
138138
os: ubuntu-latest,
139-
cross: false,
139+
runner: 'cargo',
140140
command: "test",
141141
}
142142
- {
143143
target: x86_64-apple-darwin,
144144
os: macos-latest,
145-
cross: false,
145+
runner: 'cargo',
146146
command: "test",
147147
}
148148
- {
149149
target: aarch64-apple-ios,
150150
os: macos-latest,
151-
cross: false,
151+
runner: 'cargo',
152152
command: "build",
153153
}
154154
- {
155155
target: aarch64-linux-android,
156156
os: ubuntu-latest,
157-
cross: true,
157+
runner: 'cross',
158158
command: "build",
159159
}
160160

@@ -175,13 +175,13 @@ jobs:
175175
echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
176176
vcpkg install openssl:x64-windows-static-md
177177
178-
- uses: dtolnay/rust-toolchain@1.65.0
178+
- uses: dtolnay/rust-toolchain@1.70.0
179179
with:
180180
targets: ${{ matrix.platform.target }}
181181

182182
- uses: Swatinem/rust-cache@v2
183183
with:
184-
key: ${{ matrix.package }}
184+
key: cache-${{ matrix.package }}
185185

186186
- name: create dummy dist
187187
working-directory: examples/api
@@ -192,34 +192,18 @@ jobs:
192192
run: |
193193
cargo update -p [email protected] --precise 0.3.23
194194
195+
- name: install cross
196+
if: ${{ matrix.platform.runner == 'cross' }}
197+
run: cargo install cross --git https://github.com/cross-rs/cross
198+
195199
- name: test ${{ matrix.package }}
196200
if: matrix.package != 'tauri-plugin-sql'
197-
uses: actions-rs/cargo@v1
198-
with:
199-
use-cross: ${{ matrix.platform.cross }}
200-
command: ${{ matrix.platform.command }}
201-
args: --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets
202-
203-
- name: test ${{ matrix.package }} --all-features
204-
if: ${{ !contains(fromJSON('["tauri-plugin-http", "tauri-plugin-upload", "tauri-plugin-updater", "tauri-plugin-websocket", "tauri-plugin-sql"]'), matrix.package) }}
205-
uses: actions-rs/cargo@v1
206-
with:
207-
use-cross: ${{ matrix.platform.cross }}
208-
command: ${{ matrix.platform.command }}
209-
args: --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --all-features
201+
run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets
210202

211203
- name: test ${{ matrix.package }} mysql
212204
if: matrix.package == 'tauri-plugin-sql'
213-
uses: actions-rs/cargo@v1
214-
with:
215-
use-cross: ${{ matrix.platform.cross }}
216-
command: ${{ matrix.platform.command }}
217-
args: --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features mysql
205+
run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features mysql
218206

219207
- name: test ${{ matrix.package }} postgres
220208
if: matrix.package == 'tauri-plugin-sql'
221-
uses: actions-rs/cargo@v1
222-
with:
223-
use-cross: ${{ matrix.platform.cross }}
224-
command: ${{ matrix.platform.command }}
225-
args: --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features postgres
209+
run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features postgres

.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ Cargo.lock
77
.build
88
build
99
api-iife.js
10+
init-iife.js
1011
intermediates/

.scripts/ci/check-license-header.js

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const ignore = [
2121
"dist-js",
2222
".svelte-kit",
2323
"api-iife.js",
24+
"init-iife.js",
2425
".build",
2526
];
2627

0 commit comments

Comments
 (0)