Skip to content

Commit e1e85dc

Browse files
chore: fix ci and cleanup leftovers (tauri-apps#6925)
* chore: fix ci and cleanup leftovers 1. removed leftover feature flags 2. remove zip/extract apis which are not used anymore 3. removed leftoever scopes 4. removed leftover allowlist and updater options 5. updated the example api * remove leftover updater structs * move updater under bundle and remove uneeded options * fix cli on linux * remove create_proxy * clippy * more clippy * clippppy * readd path api * fix api example * remove window allowlist * remove window from allowlist config * remove `all` allowlist option * remove file_move * lint * fix windows build * remvoe unused deps * remvoe allowlist config option, move protocol to `security > asset_protocol` * fix diffing features * fmt and test * fix scope alias * change files * android lint * simplify allow_file impl * Revert "simplify allow_file impl" This reverts commit b8882f2. * expose scopes * remove unused error variants * protocol-asset on docs.rs * ignore reqwest on udeps --------- Co-authored-by: Lucas Nogueira <[email protected]> Co-authored-by: Lucas Nogueira <[email protected]>
1 parent 9a79dc0 commit e1e85dc

File tree

80 files changed

+698
-9689
lines changed

Some content is hidden

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

80 files changed

+698
-9689
lines changed

.changes/move-protocol-asset.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"tauri": patch
3+
"tauri-utils": patch
4+
---
5+
6+
Moved the `protocol` scope configuration to the `asset_protocol` field in `SecurityConfig`.

.changes/move-updater-config.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"tauri": patch
3+
"tauri-utils": patch
4+
"cli.rs": patch
5+
"cli.js": patch
6+
---
7+
8+
Moved the updater configuration to the `BundleConfig`.

.changes/remove-allowlist.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"tauri": patch
3+
"tauri-utils": patch
4+
"cli.rs": patch
5+
"cli.js": patch
6+
---
7+
8+
Removed the allowlist configuration.

.changes/remove-fs-apis.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"tauri": patch
3+
---
4+
5+
Removed extract and move APIs from `tauri::api::file`.

.changes/remove-updater-event.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"tauri": patch
3+
---
4+
5+
Removed `UpdaterEvent`. See `tauri-plugin-updater` for new usage.
6+

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ The code for the bundler is located in `[Tauri repo root]/tooling/bundler`, and
7171

7272
### Developing Tauri Core and Related Components (Rust API, Macros, Codegen, and Utils)
7373

74-
The code for Tauri Core is located in `[Tauri repo root]/core/tauri`, and the Rust API, Macros, and Utils are in `[Tauri repo root]/core/tauri-(api/macros/utils)`. The easiest way to test your changes is to use the `[Tauri repo root]/examples/helloworld` app. It automatically rebuilds and uses your local copy of the Tauri core packages. Just run `yarn tauri build` or `yarn tauri dev` in the helloworld app directory after making changes to test them out. To use your local changes in another project, edit its `src-tauri/Cargo.toml` file so that the `tauri` key looks like `tauri = { path = "PATH", features = [ "api-all" ] }`, where `PATH` is the relative path to `[Tauri repo root]/core/tauri`. Then, your local copy of the Tauri core packages will be rebuilt and used whenever you build that project.
74+
The code for Tauri Core is located in `[Tauri repo root]/core/tauri`, and the Rust API, Macros, and Utils are in `[Tauri repo root]/core/tauri-(api/macros/utils)`. The easiest way to test your changes is to use the `[Tauri repo root]/examples/helloworld` app. It automatically rebuilds and uses your local copy of the Tauri core packages. Just run `yarn tauri build` or `yarn tauri dev` in the helloworld app directory after making changes to test them out. To use your local changes in another project, edit its `src-tauri/Cargo.toml` file so that the `tauri` key looks like `tauri = { path = "PATH" }`, where `PATH` is the relative path to `[Tauri repo root]/core/tauri`. Then, your local copy of the Tauri core packages will be rebuilt and used whenever you build that project.
7575

7676
#### Building the documentation locally
7777

.github/workflows/lint-fmt-core.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@ jobs:
5050
clippy:
5151
- { args: '', key: 'empty' }
5252
- {
53-
args: '--features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,updater,system-tray',
53+
args: '--features compression,wry,linux-protocol-headers,isolation,custom-protocol,system-tray',
5454
key: 'all'
5555
}
5656
- { args: '--features custom-protocol', key: 'custom-protocol' }
57-
- { args: '--features api-all', key: 'api-all' }
5857

5958
steps:
6059
- uses: actions/checkout@v2

.github/workflows/test-core.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,7 @@ jobs:
7272
key: no-default
7373
}
7474
- {
75-
args: --features api-all,
76-
key: api-all
77-
}
78-
- {
79-
args: --features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,updater,system-tray,
75+
args: --features compression,wry,linux-protocol-headers,isolation,custom-protocol,system-tray,
8076
key: all
8177
}
8278

core/tauri-build/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ serde_json = "1"
2727
heck = "0.4"
2828
json-patch = "1.0"
2929
walkdir = "2"
30-
filetime = "0.2"
3130
tauri-winres = "0.1"
3231
semver = "1"
3332

core/tauri-build/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ dependencies {"
349349

350350
if !error_message.is_empty() {
351351
return Err(anyhow!("
352-
The `tauri` dependency features on the `Cargo.toml` file does not match the allowlist defined under `tauri.conf.json`.
352+
The `tauri` dependency features on the `Cargo.toml` file does not match the `tauri.conf.json` config.
353353
Please run `tauri dev` or `tauri build` or {}.
354354
", error_message));
355355
}

0 commit comments

Comments
 (0)