diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index ba7eabfb6..2baec425e 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: rust audit - uses: actions-rs/audit-check@v1 + uses: rustsec/audit-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 9e62ee04c..5c6b5c407 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -36,14 +36,13 @@ jobs: steps: - uses: actions/checkout@v4 - - name: install ${{ matrix.rust }} - uses: actions-rs/toolchain@v1 + + - name: install Rust ${{ matrix.rust }} + uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust }} - override: true - default: true components: rust-src - target: ${{ matrix.platform.target }} + targets: ${{ matrix.platform.target }} - name: setup python uses: actions/setup-python@v4 diff --git a/.github/workflows/check-change-tags.yml b/.github/workflows/check-change-tags.yml index 6d312c9ef..d37360957 100644 --- a/.github/workflows/check-change-tags.yml +++ b/.github/workflows/check-change-tags.yml @@ -17,7 +17,7 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dorny/paths-filter@v2 id: filter diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml index 69d0ba860..e6f2b780f 100644 --- a/.github/workflows/check-generated-files.yml +++ b/.github/workflows/check-generated-files.yml @@ -25,7 +25,7 @@ jobs: api: ${{ steps.filter.outputs.api }} schema: ${{ steps.filter.outputs.schema }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dorny/paths-filter@v2 id: filter with: @@ -43,7 +43,7 @@ jobs: needs: changes if: needs.changes.outputs.api == 'true' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build api working-directory: tooling/api @@ -56,13 +56,10 @@ jobs: needs: changes if: needs.changes.outputs.schema == 'true' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: install stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + uses: dtolnay/rust-toolchain@stable - name: install Linux dependencies run: | @@ -74,10 +71,7 @@ jobs: workspaces: core -> ../target - name: generate schema.json - uses: actions-rs/cargo@v1 - with: - command: build - args: --manifest-path ./core/tauri-config-schema/Cargo.toml + run: cargo build --manifest-path ./core/tauri-config-schema/Cargo.toml - name: check schema run: ./.scripts/ci/has-diff.sh diff --git a/.github/workflows/covector-version-or-publish-v1.yml b/.github/workflows/covector-version-or-publish-v1.yml deleted file mode 100644 index 4be13c600..000000000 --- a/.github/workflows/covector-version-or-publish-v1.yml +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 2019-2023 Tauri Programme within The Commons Conservancy -# SPDX-License-Identifier: Apache-2.0 -# SPDX-License-Identifier: MIT - -name: covector version or publish - -on: - push: - branches: - - 1.x - -jobs: - run-integration-tests: - runs-on: ${{ matrix.platform }} - - strategy: - fail-fast: false - matrix: - platform: [ubuntu-latest, macos-latest, windows-latest] - - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: install stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: install Linux dependencies - if: matrix.platform == 'ubuntu-latest' - run: | - sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libfuse2 - - - uses: Swatinem/rust-cache@v2 - with: - workspaces: | - core -> ../target - tooling/cli - - - name: build CLI - uses: actions-rs/cargo@v1 - with: - command: build - args: --manifest-path ./tooling/cli/Cargo.toml - - - name: run integration tests - run: cargo test --test '*' -- --ignored - - - name: run CLI tests - timeout-minutes: 30 - run: | - cd ./tooling/cli/node - yarn - yarn build - yarn test - - version-or-publish: - runs-on: ubuntu-latest - timeout-minutes: 65 - outputs: - change: ${{ steps.covector.outputs.change }} - commandRan: ${{ steps.covector.outputs.commandRan }} - successfulPublish: ${{ steps.covector.outputs.successfulPublish }} - needs: - - run-integration-tests - - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - uses: actions/setup-node@v2 - with: - node-version: 14 - registry-url: 'https://registry.npmjs.org' - cache: yarn - cache-dependency-path: tooling/*/yarn.lock - - - name: cargo login - run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }} - - name: git config - run: | - git config --global user.name "${{ github.event.pusher.name }}" - git config --global user.email "${{ github.event.pusher.email }}" - - - name: covector version or publish (publish when no change files present) - uses: jbolda/covector/packages/action@covector-v0 - id: covector - env: - NODE_AUTH_TOKEN: ${{ secrets.ORG_NPM_TOKEN }} - CARGO_AUDIT_OPTIONS: ${{ secrets.CARGO_AUDIT_OPTIONS }} - with: - token: ${{ secrets.GITHUB_TOKEN }} - command: 'version-or-publish' - createRelease: true - - - name: Create Pull Request With Versions Bumped - if: steps.covector.outputs.commandRan == 'version' - uses: tauri-apps/create-pull-request@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - branch: release/version-updates-v1 - title: Apply Version Updates From Current Changes (v1) - commit-message: 'apply version updates' - labels: 'version updates' - body: ${{ steps.covector.outputs.change }} - - - name: Trigger doc update - if: | - steps.covector.outputs.successfulPublish == 'true' && - steps.covector.outputs.packagesPublished != '' - uses: peter-evans/repository-dispatch@v1 - with: - token: ${{ secrets.ORG_TAURI_BOT_PAT }} - repository: tauri-apps/tauri-docs - event-type: update-docs - - - name: Get `@tauri-apps/cli` release id - id: cliReleaseId - if: | - steps.covector.outputs.successfulPublish == 'true' && - contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli') - run: | - echo '${{ steps.covector.outputs }}' > output.json - id=$(jq '.["-tauri-apps-cli-releaseId"]' < output.json) - rm output.json - echo "cliReleaseId=$id" >> "$GITHUB_OUTPUT" - - - name: Trigger `@tauri-apps/cli` publishing workflow - if: | - steps.covector.outputs.successfulPublish == 'true' && - contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli') - uses: peter-evans/repository-dispatch@v1 - with: - token: ${{ secrets.ORG_TAURI_BOT_PAT }} - repository: tauri-apps/tauri - event-type: publish-js-cli - client-payload: '{"releaseId": "${{ steps.cliReleaseId.outputs.cliReleaseId }}" }' - - - name: Trigger `tauri-cli` publishing workflow - if: | - steps.covector.outputs.successfulPublish == 'true' && - contains(steps.covector.outputs.packagesPublished, 'tauri-cli') - uses: peter-evans/repository-dispatch@v1 - with: - token: ${{ secrets.ORG_TAURI_BOT_PAT }} - repository: tauri-apps/tauri - event-type: publish-clirs diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml index 8bf43b139..025e97721 100644 --- a/.github/workflows/covector-version-or-publish.yml +++ b/.github/workflows/covector-version-or-publish.yml @@ -22,10 +22,10 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 + - name: install stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable + uses: dtolnay/rust-toolchain@stable + - name: install Linux dependencies if: matrix.platform == 'ubuntu-latest' run: | @@ -39,10 +39,7 @@ jobs: tooling/cli - name: build CLI - uses: actions-rs/cargo@v1 - with: - command: build - args: --manifest-path ./tooling/cli/Cargo.toml + run: cargo build --manifest-path ./tooling/cli/Cargo.toml - name: run integration tests run: cargo test --test '*' -- --ignored diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 54b114d9b..06e4fcbfd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -17,12 +17,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: install stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable + uses: dtolnay/rust-toolchain@stable - name: install Linux dependencies run: | @@ -40,10 +38,7 @@ jobs: if-no-files-found: error - name: build CLI - uses: actions-rs/cargo@v1 - with: - command: build - args: --manifest-path ./tooling/cli/Cargo.toml + run: cargo build --manifest-path ./tooling/cli/Cargo.toml - name: Upload CLI uses: actions/upload-artifact@v3 @@ -64,15 +59,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: install stable - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: - toolchain: stable - override: true - default: true - target: ${{ matrix.target.name }} + targets: ${{ matrix.target.name }} - name: Setup node uses: actions/setup-node@v3 diff --git a/.github/workflows/lint-cli.yml b/.github/workflows/lint-cli.yml index db8e26513..eee0d5ab4 100644 --- a/.github/workflows/lint-cli.yml +++ b/.github/workflows/lint-cli.yml @@ -29,17 +29,13 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 + - name: install Rust stable and rustfmt + uses: dtolnay/rust-toolchain@stable with: - profile: minimal - toolchain: stable - override: true components: rustfmt - - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --manifest-path ./tooling/cli/Cargo.toml --all -- --check + - name: Run cargo fmt + run: cargo fmt --manifest-path ./tooling/cli/Cargo.toml --all -- --check clippy: runs-on: ubuntu-latest @@ -47,11 +43,9 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 + - name: install Rust stable and clippy + uses: dtolnay/rust-toolchain@stable with: - profile: minimal - toolchain: stable - override: true components: clippy - name: install dependencies @@ -63,8 +57,5 @@ jobs: with: workspaces: tooling/cli - - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --manifest-path ./tooling/cli/Cargo.toml --all-targets --all-features -- -D warnings - name: cli + - name: run Clippy + run: cargo clippy --manifest-path ./tooling/cli/Cargo.toml --all-targets --all-features -- -D warnings diff --git a/.github/workflows/lint-core.yml b/.github/workflows/lint-core.yml index bb3bde3d6..f11543cfa 100644 --- a/.github/workflows/lint-core.yml +++ b/.github/workflows/lint-core.yml @@ -31,17 +31,13 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 + - name: install Rust stable and rustfmt + uses: dtolnay/rust-toolchain@stable with: - profile: minimal - toolchain: stable - override: true components: rustfmt - - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + - name: run cargo fmt + run: cargo fmt --all -- --check clippy: runs-on: ubuntu-latest @@ -60,11 +56,9 @@ jobs: sudo apt-get update sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev - - uses: actions-rs/toolchain@v1 + - name: install Rust stable with clippy + uses: dtolnay/rust-toolchain@stable with: - profile: minimal - toolchain: stable - override: true components: clippy - uses: Swatinem/rust-cache@v2 @@ -72,8 +66,5 @@ jobs: workspaces: core -> ../target save-if: ${{ matrix.clippy.key == 'all' }} - - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --manifest-path ./core/tauri/Cargo.toml --all-targets ${{ matrix.clippy.args }} -- -D warnings - name: ${{ matrix.clippy.key }} + - name: Run clippy - ${{ matrix.clippy.key }} + run: cargo clippy --manifest-path ./core/tauri/Cargo.toml --all-targets ${{ matrix.clippy.args }} -- -D warnings diff --git a/.github/workflows/publish-cli-js.yml b/.github/workflows/publish-cli-js.yml index d5e690706..48f7803cf 100644 --- a/.github/workflows/publish-cli-js.yml +++ b/.github/workflows/publish-cli-js.yml @@ -91,7 +91,7 @@ jobs: name: stable - ${{ matrix.settings.target }} - node@16 runs-on: ${{ matrix.settings.host }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 if: ${{ !matrix.settings.docker }} @@ -101,14 +101,11 @@ jobs: cache: yarn cache-dependency-path: 'tooling/cli/node/yarn.lock' architecture: ${{ matrix.settings.architecture }} - - name: Install - uses: actions-rs/toolchain@v1 + - name: Install Rust + uses: dtolnay/rust-toolchain@stable if: ${{ !matrix.settings.docker }} with: - profile: minimal - override: true - toolchain: stable - target: ${{ matrix.settings.target }} + targets: ${{ matrix.settings.target }} - uses: Swatinem/rust-cache@v1 with: key: ${{ matrix.settings.target }} @@ -144,7 +141,7 @@ jobs: # runs-on: macos-10.15 # name: Build FreeBSD # steps: - # - uses: actions/checkout@v3 + # - uses: actions/checkout@v4 # - name: Build # id: build # uses: vmactions/freebsd-vm@v0.1.6 @@ -207,7 +204,7 @@ jobs: - '18' runs-on: ${{ matrix.settings.host }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: @@ -240,7 +237,7 @@ jobs: - '18' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: @@ -279,7 +276,7 @@ jobs: container: image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: @@ -329,7 +326,7 @@ jobs: steps: - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset working-directory: ${{ github.workspace }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: List packages run: ls -R . shell: bash @@ -375,7 +372,7 @@ jobs: - test-linux-x64-musl-binding #- test-linux-arm-bindings steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: diff --git a/.github/workflows/publish-cli-rs.yml b/.github/workflows/publish-cli-rs.yml index 57b9a3764..906456ce3 100644 --- a/.github/workflows/publish-cli-rs.yml +++ b/.github/workflows/publish-cli-rs.yml @@ -40,7 +40,7 @@ jobs: args: '--no-default-features --features native-tls-vendored' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: 'Setup Rust' uses: dtolnay/rust-toolchain@stable @@ -58,10 +58,7 @@ jobs: sudo apt-get install -y libgtk-3-dev - name: Build CLI - uses: actions-rs/cargo@v1 - with: - command: build - args: --manifest-path ./tooling/cli/Cargo.toml --profile release-size-optimized ${{ matrix.config.args }} + run: cargo build --manifest-path ./tooling/cli/Cargo.toml --profile release-size-optimized ${{ matrix.config.args }} - name: Upload CLI uses: actions/upload-artifact@v3 @@ -76,7 +73,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download built CLIs uses: actions/download-artifact@v3 diff --git a/.github/workflows/test-android.yml b/.github/workflows/test-android.yml index 0971924f9..9f3ad098c 100644 --- a/.github/workflows/test-android.yml +++ b/.github/workflows/test-android.yml @@ -31,13 +31,10 @@ jobs: platform: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: install Rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + uses: dtolnay/rust-toolchain@stable - name: install Linux dependencies if: matrix.platform == 'ubuntu-latest' @@ -74,10 +71,7 @@ jobs: examples/api/src-tauri - name: build CLI - uses: actions-rs/cargo@v1 - with: - command: build - args: --manifest-path ./tooling/cli/Cargo.toml + run: cargo build --manifest-path ./tooling/cli/Cargo.toml - name: build Tauri API working-directory: ./tooling/api diff --git a/.github/workflows/test-cli-js.yml b/.github/workflows/test-cli-js.yml index 9a4cffc16..dc9e299ef 100644 --- a/.github/workflows/test-cli-js.yml +++ b/.github/workflows/test-cli-js.yml @@ -36,10 +36,8 @@ jobs: - uses: actions/checkout@v4 - name: install Rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true + uses: dtolnay/rust-toolchain@stable + - name: setup node uses: actions/setup-node@v2 with: diff --git a/.github/workflows/test-cli-rs.yml b/.github/workflows/test-cli-rs.yml index 8a80496cb..716645fa2 100644 --- a/.github/workflows/test-cli-rs.yml +++ b/.github/workflows/test-cli-rs.yml @@ -67,7 +67,4 @@ jobs: workspaces: tooling/cli - name: build CLI - uses: actions-rs/cargo@v1 - with: - command: build - args: --manifest-path ./tooling/cli/Cargo.toml ${{ matrix.platform.args }} + run: cargo build --manifest-path ./tooling/cli/Cargo.toml ${{ matrix.platform.args }} diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index e199af69c..df256d912 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -73,13 +73,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: install stable - uses: actions-rs/toolchain@v1 + - name: install Rust + uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.platform.toolchain }} - target: ${{ matrix.platform.target }} - override: true - default: true + targets: ${{ matrix.platform.target }} - name: install Linux dependencies if: contains(matrix.platform.target, 'unknown-linux') diff --git a/.github/workflows/test-lint-bundler.yml b/.github/workflows/test-lint-bundler.yml index bab4f195e..72379e120 100644 --- a/.github/workflows/test-lint-bundler.yml +++ b/.github/workflows/test-lint-bundler.yml @@ -35,9 +35,7 @@ jobs: - uses: actions/checkout@v4 - name: install stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable + uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 with: @@ -54,17 +52,13 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 + - name: install Rust stable and rustfmt + uses: dtolnay/rust-toolchain@stable with: - profile: minimal - toolchain: stable - override: true components: rustfmt - - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --manifest-path ./tooling/bundler/Cargo.toml --all -- --check + - name: Run cargo fmt + run: cargo fmt --manifest-path ./tooling/bundler/Cargo.toml --all -- --check clippy: runs-on: ubuntu-latest @@ -72,22 +66,14 @@ jobs: steps: - uses: actions/checkout@v4 - - name: install minimal stable with clippy and rustfmt - uses: actions-rs/toolchain@v1 + - name: install Rust stable and clippy + uses: dtolnay/rust-toolchain@stable with: - profile: minimal - toolchain: stable - override: true - default: true - components: rustfmt, clippy + components: clippy - uses: Swatinem/rust-cache@v2 with: workspaces: tooling/bundler - name: clippy check - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --manifest-path ./tooling/bundler/Cargo.toml --all-targets -- -D warnings - name: bundler + run: cargo clippy --manifest-path ./tooling/bundler/Cargo.toml --all-targets -- -D warnings diff --git a/.github/workflows/udeps.yml b/.github/workflows/udeps.yml index e856b1a16..ebb2e6076 100644 --- a/.github/workflows/udeps.yml +++ b/.github/workflows/udeps.yml @@ -74,16 +74,11 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true + - name: Install Rust nightly + uses: dtolnay/rust-toolchain@nightly - - uses: actions-rs/cargo@v1 - with: - command: install - args: cargo-udeps --locked --force + - name: Install udeps + run: cargo install cargo-udeps --locked --force - name: Upload udeps uses: actions/upload-artifact@v3 @@ -128,11 +123,8 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true + - name: Install Rust nightly + uses: dtolnay/rust-toolchain@nightly - name: install dependencies run: | @@ -159,7 +151,5 @@ jobs: sudo apt-get update sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev - - uses: actions-rs/cargo@v1 - with: - command: udeps - args: --manifest-path ${{ matrix.path }}/Cargo.toml --all-targets --all-features + - name: Run udeps + run: cargo udeps --manifest-path ${{ matrix.path }}/Cargo.toml --all-targets --all-features diff --git a/examples/api/src-tauri/Cargo.lock b/examples/api/src-tauri/Cargo.lock index 5f37c4b02..b66a9dd6b 100644 --- a/examples/api/src-tauri/Cargo.lock +++ b/examples/api/src-tauri/Cargo.lock @@ -3367,7 +3367,7 @@ dependencies = [ "url", "uuid", "windows 0.51.1", - "windows-implement 0.51.1", + "windows-implement", "x11-dl", "zbus", ] @@ -3435,9 +3435,9 @@ dependencies = [ "url", "uuid", "webkit2gtk", - "webview2-com 0.25.0", + "webview2-com", "window-vibrancy", - "windows 0.48.0", + "windows 0.51.1", ] [[package]] @@ -3534,7 +3534,7 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "windows 0.48.0", + "windows 0.51.1", ] [[package]] @@ -3550,8 +3550,8 @@ dependencies = [ "tauri-runtime", "tauri-utils", "webkit2gtk", - "webview2-com 0.25.0", - "windows 0.48.0", + "webview2-com", + "windows 0.51.1", "wry", ] @@ -4197,19 +4197,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "webview2-com" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e563ffe8e84d42e43ffacbace8780c0244fc8910346f334613559d92e203ad" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys 0.25.0", - "windows 0.48.0", - "windows-implement 0.48.0", - "windows-interface 0.48.0", -] - [[package]] name = "webview2-com" version = "0.27.0" @@ -4217,11 +4204,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd15556ff1d1d6bc850dbb362762bae86069773dd30177c90d3bfa917080dc73" dependencies = [ "webview2-com-macros", - "webview2-com-sys 0.27.0", + "webview2-com-sys", "windows 0.51.1", "windows-core", - "windows-implement 0.51.1", - "windows-interface 0.51.1", + "windows-implement", + "windows-interface", ] [[package]] @@ -4235,21 +4222,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "webview2-com-sys" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d39576804304cf9ead192467ef47f7859a1a12fec3bd459d5ba34b8cd65ed5" -dependencies = [ - "regex", - "serde", - "serde_json", - "thiserror", - "windows 0.48.0", - "windows-bindgen", - "windows-metadata", -] - [[package]] name = "webview2-com-sys" version = "0.27.0" @@ -4322,8 +4294,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-implement 0.48.0", - "windows-interface 0.48.0", "windows-targets 0.48.5", ] @@ -4334,21 +4304,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ "windows-core", - "windows-implement 0.51.1", - "windows-interface 0.51.1", + "windows-implement", + "windows-interface", "windows-targets 0.48.5", ] -[[package]] -name = "windows-bindgen" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe21a77bc54b7312dbd66f041605e098990c98be48cd52967b85b5e60e75ae6" -dependencies = [ - "windows-metadata", - "windows-tokens", -] - [[package]] name = "windows-core" version = "0.51.1" @@ -4358,17 +4318,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "windows-implement" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "windows-implement" version = "0.51.1" @@ -4380,17 +4329,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "windows-interface" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "windows-interface" version = "0.51.1" @@ -4402,12 +4340,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "windows-metadata" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0e5f0e2cc372bb6addbfff9a8add712155cd743df9c15f6ab000f31432d" - [[package]] name = "windows-sys" version = "0.45.0" @@ -4456,12 +4388,6 @@ dependencies = [ "windows_x86_64_msvc 0.48.5", ] -[[package]] -name = "windows-tokens" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34c9a3b28cb41db7385546f7f9a8179348dffc89923dde66857b1ba5312f6b4" - [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -4606,9 +4532,9 @@ dependencies = [ "url", "webkit2gtk", "webkit2gtk-sys", - "webview2-com 0.27.0", + "webview2-com", "windows 0.51.1", - "windows-implement 0.51.1", + "windows-implement", ] [[package]] diff --git a/examples/api/src-tauri/src/lib.rs b/examples/api/src-tauri/src/lib.rs index 9c08b55ec..5c21b0820 100644 --- a/examples/api/src-tauri/src/lib.rs +++ b/examples/api/src-tauri/src/lib.rs @@ -12,12 +12,11 @@ mod cmd; mod tray; use serde::Serialize; -use tauri::{ipc::Channel, window::WindowBuilder, App, AppHandle, RunEvent, Runtime, WindowUrl}; +use tauri::{ + ipc::Channel, window::WindowBuilder, App, AppHandle, Manager, RunEvent, Runtime, WindowUrl, +}; use tauri_plugin_sample::{PingRequest, SampleExt}; -#[cfg(desktop)] -use tauri::Manager; - pub type SetupHook = Box Result<(), Box> + Send>; pub type OnEvent = Box; diff --git a/examples/api/src-tauri/tauri-plugin-sample/ios/Sources/ExamplePlugin.swift b/examples/api/src-tauri/tauri-plugin-sample/ios/Sources/ExamplePlugin.swift index b68793867..390aa7f7d 100644 --- a/examples/api/src-tauri/tauri-plugin-sample/ios/Sources/ExamplePlugin.swift +++ b/examples/api/src-tauri/tauri-plugin-sample/ios/Sources/ExamplePlugin.swift @@ -15,7 +15,7 @@ class PingArgs: Decodable { class ExamplePlugin: Plugin { @objc public func ping(_ invoke: Invoke) throws { let args = try invoke.parseArgs(PingArgs.self) - args.onEvent?.send(["kind": "ping"]) + try args.onEvent?.send(["kind": "ping"]) invoke.resolve(["value": args.value ?? ""]) } }