From ca060348e5887e99bee3ff37ebeb43512278a4ea Mon Sep 17 00:00:00 2001 From: lucasfernog Date: Wed, 6 Sep 2023 15:08:18 +0000 Subject: [PATCH 1/2] publish new versions --- .changes/custom-protocol-responder.md | 5 ----- .changes/fix-endless-loop-handle-request.md | 5 ----- .changes/windows-http.md | 5 ----- .changes/windows-with-https-scheme.md | 5 ----- .changes/winit.md | 5 ----- .changes/with-custom-protocol-rturn-value.md | 5 ----- .changes/with_focused.md | 5 ----- CHANGELOG.md | 10 ++++++++++ Cargo.toml | 4 ++-- 9 files changed, 12 insertions(+), 37 deletions(-) delete mode 100644 .changes/custom-protocol-responder.md delete mode 100644 .changes/fix-endless-loop-handle-request.md delete mode 100644 .changes/windows-http.md delete mode 100644 .changes/windows-with-https-scheme.md delete mode 100644 .changes/winit.md delete mode 100644 .changes/with-custom-protocol-rturn-value.md delete mode 100644 .changes/with_focused.md diff --git a/.changes/custom-protocol-responder.md b/.changes/custom-protocol-responder.md deleted file mode 100644 index 57fdf24bc..000000000 --- a/.changes/custom-protocol-responder.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"wry": minor ---- - -Added `WebViewBuilder::with_asynchronous_custom_protocol` to allow implementing a protocol handler that resolves asynchronously. diff --git a/.changes/fix-endless-loop-handle-request.md b/.changes/fix-endless-loop-handle-request.md deleted file mode 100644 index 62117d42e..000000000 --- a/.changes/fix-endless-loop-handle-request.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"wry": patch ---- - -Fixes Android freezing when handling request due to endless iteration when reading request headers. diff --git a/.changes/windows-http.md b/.changes/windows-http.md deleted file mode 100644 index 402381bc7..000000000 --- a/.changes/windows-http.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"wry": "minor" ---- - -**Breaking change** Wry now defaults to `http://.localhost/` for custom protocols on Windows. diff --git a/.changes/windows-with-https-scheme.md b/.changes/windows-with-https-scheme.md deleted file mode 100644 index 0565f6e95..000000000 --- a/.changes/windows-with-https-scheme.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"wry": "minor" ---- - -Add `WebViewBuilderExtWindows::with_https_scheme` to be able to choose between `http` and `https` for custom protocols on Windows. diff --git a/.changes/winit.md b/.changes/winit.md deleted file mode 100644 index 4df27f9fd..000000000 --- a/.changes/winit.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"wry": minor ---- - -Add `winit` and `tao` feature flag with `tao` as default. diff --git a/.changes/with-custom-protocol-rturn-value.md b/.changes/with-custom-protocol-rturn-value.md deleted file mode 100644 index 2ee991d77..000000000 --- a/.changes/with-custom-protocol-rturn-value.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"wry": minor ---- - -**Breaking change:** `WebViewBuidler::with_custom_protocol` closure now returns `http::Response` instead of `Result`. \ No newline at end of file diff --git a/.changes/with_focused.md b/.changes/with_focused.md deleted file mode 100644 index 4037487e6..000000000 --- a/.changes/with_focused.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"wry": "patch" ---- - -Add `WebViewAtrributes.focused` and `WebViewBuilder::with_focused` to control whether to focus the webview upon creation or not. Supported on Windows and Linux only. diff --git a/CHANGELOG.md b/CHANGELOG.md index 482d6d547..7f0c1054e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## \[0.32.0] + +- [`4bdf1c3`](https://github.com/tauri-apps/wry/commit/4bdf1c366de5708b7626ca63eb39e134869c5bd4)([#1017](https://github.com/tauri-apps/wry/pull/1017)) Added `WebViewBuilder::with_asynchronous_custom_protocol` to allow implementing a protocol handler that resolves asynchronously. +- [`70d8ae0`](https://github.com/tauri-apps/wry/commit/70d8ae057c5e8b81db4aac28e5fa2dd3424b3307)([#1009](https://github.com/tauri-apps/wry/pull/1009)) Fixes Android freezing when handling request due to endless iteration when reading request headers. +- [`b5e1875`](https://github.com/tauri-apps/wry/commit/b5e1875230794502a8e74c74abe79ca63488e421)([#994](https://github.com/tauri-apps/wry/pull/994)) **Breaking change** Wry now defaults to `http://.localhost/` for custom protocols on Windows. +- [`b5e1875`](https://github.com/tauri-apps/wry/commit/b5e1875230794502a8e74c74abe79ca63488e421)([#994](https://github.com/tauri-apps/wry/pull/994)) Add `WebViewBuilderExtWindows::with_https_scheme` to be able to choose between `http` and `https` for custom protocols on Windows. +- [`fa15076`](https://github.com/tauri-apps/wry/commit/fa15076207d9e678db4149210aba929044d0ff45)([#163](https://github.com/tauri-apps/wry/pull/163)) Add `winit` and `tao` feature flag with `tao` as default. +- [`4bdf1c3`](https://github.com/tauri-apps/wry/commit/4bdf1c366de5708b7626ca63eb39e134869c5bd4)([#1017](https://github.com/tauri-apps/wry/pull/1017)) **Breaking change:** `WebViewBuidler::with_custom_protocol` closure now returns `http::Response` instead of `Result`. +- [`ebc4a20`](https://github.com/tauri-apps/wry/commit/ebc4a20d218036b29b186aca1853d28d870fa2ef)([#1015](https://github.com/tauri-apps/wry/pull/1015)) Add `WebViewAtrributes.focused` and `WebViewBuilder::with_focused` to control whether to focus the webview upon creation or not. Supported on Windows and Linux only. + ## \[0.31.0] - [`e47562f`](https://github.com/tauri-apps/wry/commit/e47562f71284457ff77e4c8b6bf02fdbe19ab880)([#993](https://github.com/tauri-apps/wry/pull/993)) Update the unmaintained `kuchiki` crate to the maintained `kuchikiki` crate. diff --git a/Cargo.toml b/Cargo.toml index 5d5d878bf..2b82724b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ workspace = { } [package] name = "wry" -version = "0.31.0" +version = "0.32.0" authors = [ "Tauri Programme within The Commons Conservancy" ] edition = "2021" license = "Apache-2.0 OR MIT" @@ -41,7 +41,7 @@ serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" thiserror = "1.0" url = "2.4" -tao = { version = "0.22", default-features = false, features = [ "serde" ], optional = true} +tao = { version = "0.22", default-features = false, features = [ "serde" ], optional = true } winit = { version = "0.28", features = [ "serde" ], optional = true } http = "0.2.9" From b92786fef7970ea929dc3af4e12b618e9b0c4ef9 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Wed, 6 Sep 2023 12:30:03 -0300 Subject: [PATCH 2/2] change cache & toolchain install --- .github/workflows/build.yml | 42 +++---------------------------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b858a409b..e771ac591 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: install stable - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: - toolchain: stable - target: ${{ matrix.platform.target }} + targets: ${{ matrix.platform.target }} - name: install webkit2gtk (ubuntu only) if: contains(matrix.platform.target, 'gnu') @@ -38,41 +37,7 @@ jobs: Invoke-WebRequest https://go.microsoft.com/fwlink/p/?LinkId=2124703 -OutFile installwebview.exe -UseBasicParsing cmd /C start /wait installwebview.exe /silent /install - - name: Get current date - run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV - - - name: Cache cargo registry - uses: actions/cache@v2.1.4 - with: - path: ~/.cargo/registry - # Add date to the cache to keep it up to date - key: ${{ matrix.platform }}-stable-cargo-registry-${{ hashFiles('Cargo.toml') }}-${{ env.CURRENT_DATE }} - # Restore from outdated cache for speed - restore-keys: | - ${{ matrix.platform }}-stable-cargo-registry-${{ hashFiles('Cargo.toml') }} - ${{ matrix.platform }}-stable-cargo-registry- - - - name: Cache cargo index - uses: actions/cache@v2.1.4 - with: - path: ~/.cargo/git - # Add date to the cache to keep it up to date - key: ${{ matrix.platform }}-stable-cargo-index-${{ hashFiles('Cargo.toml') }}-${{ env.CURRENT_DATE }} - # Restore from outdated cache for speed - restore-keys: | - ${{ matrix.platform }}-stable-cargo-index-${{ hashFiles('Cargo.toml') }} - ${{ matrix.platform }}-stable-cargo-index- - - - name: Cache cargo target - uses: actions/cache@v2 - with: - path: target - # Add date to the cache to keep it up to date - key: ${{ matrix.platform }}-stable-cargo-core-${{ hashFiles('Cargo.toml') }}-${{ env.CURRENT_DATE }} - # Restore from outdated cache for speed - restore-keys: | - ${{ matrix.platform }}-stable-cargo-core-${{ hashFiles('Cargo.toml') }} - ${{ matrix.platform }}-stable-cargo-core- + - uses: Swatinem/rust-cache@v2 - name: build wry run: cargo build --target ${{ matrix.platform.target }} @@ -95,4 +60,3 @@ jobs: contains(matrix.platform.target, 'windows') || contains(matrix.platform.target, 'apple')) run: cargo build --no-default-features --features winit --target ${{ matrix.platform.target }} -