diff --git a/.github/workflows/pake-cli.yaml b/.github/workflows/pake-cli.yaml index db00064..6dbf18c 100644 --- a/.github/workflows/pake-cli.yaml +++ b/.github/workflows/pake-cli.yaml @@ -89,7 +89,7 @@ jobs: if: inputs.platform == 'ubuntu-20.04' uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra + packages: libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra version: 1.1 - name: Install pake-cli local diff --git a/.github/workflows/pake_build_single_app.yaml b/.github/workflows/pake_build_single_app.yaml index 14aad73..27efe8a 100644 --- a/.github/workflows/pake_build_single_app.yaml +++ b/.github/workflows/pake_build_single_app.yaml @@ -75,7 +75,7 @@ jobs: if: matrix.os == 'ubuntu-latest' uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra + packages: libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra version: 1.1 - name: Rust cache restore diff --git a/.github/workflows/rust-code-quality-check.yml b/.github/workflows/rust-code-quality-check.yml index 7af1d38..8681b3e 100644 --- a/.github/workflows/rust-code-quality-check.yml +++ b/.github/workflows/rust-code-quality-check.yml @@ -40,7 +40,7 @@ jobs: if: matrix.os == 'ubuntu-latest' uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra + packages: libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra version: 1.0 - name: Run unit & integration tests with nextest run: cargo hack --feature-powerset --exclude-features cli-build nextest run @@ -67,7 +67,7 @@ jobs: if: matrix.os == 'ubuntu-latest' uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra + packages: pkg-config libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra libsoup-3.0-dev version: 1.0 - name: Run all-features code quality checks run: cargo hack --feature-powerset --exclude-features cli-build --no-dev-deps clippy diff --git a/Dockerfile b/Dockerfile index 71eb285..9c0b650 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ mkdir -p /cargo-cache && \ cp -R /usr/local/cargo/registry /cargo-cache/ && \ cp -R /usr/local/cargo/git /cargo-cache/ - + # Verify the content of /cargo-cache && clean unnecessary files RUN ls -la /cargo-cache/registry && ls -la /cargo-cache/git && rm -rfd /cargo-cache/registry/src @@ -28,8 +28,8 @@ FROM rust:1.80-slim AS builder RUN --mount=type=cache,target=/var/cache/apt \ --mount=type=cache,target=/usr/local/cargo/registry \ apt-get update && apt-get install -y --no-install-recommends \ - libdbus-1-dev libsoup2.4-dev libjavascriptcoregtk-4.0-dev \ - libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev \ + libdbus-1-dev libsoup2.4-dev libjavascriptcoregtk-4.1-dev \ + libwebkit2gtk-4.1-dev build-essential curl wget libssl-dev \ libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev \ gnome-video-effects diff --git a/bin/README.md b/bin/README.md index 529845e..d0da975 100644 --- a/bin/README.md +++ b/bin/README.md @@ -25,8 +25,8 @@ npm install pake-cli -g ```bash sudo apt install libdbus-1-dev \ libsoup2.4-dev \ - libjavascriptcoregtk-4.0-dev \ - libwebkit2gtk-4.0-dev \ + libjavascriptcoregtk-4.1-dev \ + libwebkit2gtk-4.1-dev \ build-essential \ curl \ wget \ diff --git a/bin/README_CN.md b/bin/README_CN.md index 45b0d5b..592f66d 100644 --- a/bin/README_CN.md +++ b/bin/README_CN.md @@ -25,8 +25,8 @@ npm install pake-cli -g ```bash sudo apt install libdbus-1-dev \ libsoup2.4-dev \ - libjavascriptcoregtk-4.0-dev \ - libwebkit2gtk-4.0-dev \ + libjavascriptcoregtk-4.1-dev \ + libwebkit2gtk-4.1-dev \ build-essential \ curl \ wget \ diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 0ec129b..279ec63 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -124,12 +124,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "binfarce" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18464ccbb85e5dede30d70cc7676dc9950a0fb7dbf595a43d765be9123c616a2" - [[package]] name = "bitflags" version = "1.3.2" @@ -257,22 +251,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cargo-bloat" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e2c483ab55e38021c2c701061e078cc6c28d563932cbdf6bc4efaa28ab117e" -dependencies = [ - "binfarce", - "json", - "memmap2", - "multimap", - "pdb", - "pico-args", - "regex", - "term_size", -] - [[package]] name = "cargo-platform" version = "0.1.9" @@ -797,12 +775,6 @@ dependencies = [ "typeid", ] -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - [[package]] name = "fdeflate" version = "0.3.6" @@ -1751,12 +1723,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "json" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" - [[package]] name = "json-patch" version = "3.0.1" @@ -1928,15 +1894,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" -dependencies = [ - "libc", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -1993,12 +1950,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "multimap" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" - [[package]] name = "ndk" version = "0.9.0" @@ -2350,7 +2301,6 @@ dependencies = [ name = "pake" version = "3.0.0" dependencies = [ - "cargo-bloat", "serde", "serde_json", "tauri", @@ -2417,17 +2367,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" -[[package]] -name = "pdb" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82040a392923abe6279c00ab4aff62d5250d1c8555dc780e4b02783a7aa74863" -dependencies = [ - "fallible-iterator", - "scroll", - "uuid", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -2568,12 +2507,6 @@ dependencies = [ "siphasher", ] -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - [[package]] name = "pin-project-lite" version = "0.2.15" @@ -3096,12 +3029,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "scroll" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" - [[package]] name = "selectors" version = "0.22.0" @@ -3938,16 +3865,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "thin-slice" version = "0.1.1" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index d2fa2c8..42d1d26 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -29,9 +29,6 @@ tauri-plugin-global-shortcut = { version = "2.2.0" } tauri-plugin-shell = "2.2.0" tokio = { version = "1", features = ["full"] } -[dev-dependencies] -cargo-bloat = "0.12.1" - [features] # this feature is used for development builds from development cli cli-build = []