diff --git a/.gitattributes b/.gitattributes index e4c58cf..ac379f3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -assets/** filter=lfs diff=lfs merge=lfs -text -frontend/assets/** filter=lfs diff=lfs merge=lfs -text +assets/**/* filter=lfs diff=lfs merge=lfs -text +frontend/assets/**/* filter=lfs diff=lfs merge=lfs -text diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 381cb1d..71b0093 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -13,32 +13,31 @@ on: - ".github/workflows/check.yml" jobs: - # TODO: weird issue with icon invalid PNG signature - # lint: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 - - # - uses: dtolnay/rust-toolchain@stable - # with: - # components: clippy - - # - uses: Swatinem/rust-cache@v2 - - # - name: install dependencies (ubuntu only) - # run: | - # sudo apt-get update - # sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf - - # - name: install frontend dependencies - # run: | - # cd frontend - # npm install - - # - name: clippy - # run: cargo clippy - # env: - # RUSTFLAGS: "-Dwarnings" + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - uses: dtolnay/rust-toolchain@stable + with: + components: clippy + + - uses: Swatinem/rust-cache@v2 + + - name: install dependencies + run: | + sudo apt-get update + sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf + + - name: install frontend dependencies + run: | + cd frontend + npm install + + - name: clippy + run: cargo clippy + env: + RUSTFLAGS: "-Dwarnings" format: runs-on: ubuntu-latest diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0af7084..d3af24d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,11 +14,12 @@ jobs: fail-fast: false matrix: settings: + # TODO: for some reason aarch64 builds are corrupt - platform: 'macos-latest' args: '--target aarch64-apple-darwin' - platform: 'macos-latest' args: '--target x86_64-apple-darwin' - - platform: 'ubuntu-latest' + - platform: 'ubuntu-20.04' args: '' - platform: 'windows-latest' args: '' @@ -40,7 +41,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - name: install dependencies (ubuntu only) - if: matrix.settings.platform == 'ubuntu-latest' + if: matrix.settings.platform == 'ubuntu-20.04' run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf @@ -54,8 +55,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tagName: app-v__VERSION__ - releaseName: 'App v__VERSION__' + tagName: v__VERSION__ + releaseName: 'v__VERSION__' releaseBody: 'See the assets to download this version and install.' releaseDraft: true prerelease: false diff --git a/Cargo.lock b/Cargo.lock index b467f1a..51a9c54 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1187,6 +1187,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2777,9 +2783,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f078117725e36d55d29fafcbb4b1e909073807ca328ae8deb8c0b3843aac0fed" +checksum = "047aefcc7721bfb8024a9bc39d4719112262610502de7a224fa62c4570cd78d4" dependencies = [ "anyhow", "clap", @@ -2793,7 +2799,7 @@ dependencies = [ "glib", "glob", "gtk", - "heck 0.4.1", + "heck 0.5.0", "http", "ignore", "objc", diff --git a/Cargo.toml b/Cargo.toml index 259f006..b807355 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" tauri-build = { version = "1.5.1", features = [] } [dependencies] -tauri = { version = "1.6.1", features = [ +tauri = { version = "1.6.2", features = [ "dialog-open", "shell-open", "fs-read-file", diff --git a/assets/icons/128x128.png b/assets/icons/128x128.png index 2697dc8..a8684fd 100644 Binary files a/assets/icons/128x128.png and b/assets/icons/128x128.png differ diff --git a/assets/icons/128x128@2x.png b/assets/icons/128x128@2x.png index ce3a03a..5e68af0 100644 Binary files a/assets/icons/128x128@2x.png and b/assets/icons/128x128@2x.png differ diff --git a/assets/icons/32x32.png b/assets/icons/32x32.png index 89ceae1..0519679 100644 Binary files a/assets/icons/32x32.png and b/assets/icons/32x32.png differ diff --git a/assets/icons/Square107x107Logo.png b/assets/icons/Square107x107Logo.png index 0e266d6..70207d7 100644 Binary files a/assets/icons/Square107x107Logo.png and b/assets/icons/Square107x107Logo.png differ diff --git a/assets/icons/Square142x142Logo.png b/assets/icons/Square142x142Logo.png index 319ff3c..c2d91cd 100644 Binary files a/assets/icons/Square142x142Logo.png and b/assets/icons/Square142x142Logo.png differ diff --git a/assets/icons/Square150x150Logo.png b/assets/icons/Square150x150Logo.png index 97337f6..9cc93ce 100644 Binary files a/assets/icons/Square150x150Logo.png and b/assets/icons/Square150x150Logo.png differ diff --git a/assets/icons/Square284x284Logo.png b/assets/icons/Square284x284Logo.png index 8883eae..b8cfe3f 100644 Binary files a/assets/icons/Square284x284Logo.png and b/assets/icons/Square284x284Logo.png differ diff --git a/assets/icons/Square30x30Logo.png b/assets/icons/Square30x30Logo.png index 8f59b04..c64a5b9 100644 Binary files a/assets/icons/Square30x30Logo.png and b/assets/icons/Square30x30Logo.png differ diff --git a/assets/icons/Square310x310Logo.png b/assets/icons/Square310x310Logo.png index da1db00..2e29b78 100644 Binary files a/assets/icons/Square310x310Logo.png and b/assets/icons/Square310x310Logo.png differ diff --git a/assets/icons/Square44x44Logo.png b/assets/icons/Square44x44Logo.png index d851df4..88c6db2 100644 Binary files a/assets/icons/Square44x44Logo.png and b/assets/icons/Square44x44Logo.png differ diff --git a/assets/icons/Square71x71Logo.png b/assets/icons/Square71x71Logo.png index fae9bba..6b035fb 100644 Binary files a/assets/icons/Square71x71Logo.png and b/assets/icons/Square71x71Logo.png differ diff --git a/assets/icons/Square89x89Logo.png b/assets/icons/Square89x89Logo.png index 6bd3a1a..157700b 100644 Binary files a/assets/icons/Square89x89Logo.png and b/assets/icons/Square89x89Logo.png differ diff --git a/assets/icons/StoreLogo.png b/assets/icons/StoreLogo.png index f1ddc6f..4f40419 100644 Binary files a/assets/icons/StoreLogo.png and b/assets/icons/StoreLogo.png differ diff --git a/assets/icons/icon.icns b/assets/icons/icon.icns index 52d2f2d..d62e640 100644 Binary files a/assets/icons/icon.icns and b/assets/icons/icon.icns differ diff --git a/assets/icons/icon.ico b/assets/icons/icon.ico index fc77af1..9d0d36a 100644 Binary files a/assets/icons/icon.ico and b/assets/icons/icon.ico differ diff --git a/assets/icons/icon.png b/assets/icons/icon.png index 11a1800..5f176ba 100644 Binary files a/assets/icons/icon.png and b/assets/icons/icon.png differ diff --git a/assets/screenshots/home.png b/assets/screenshots/home.png index ca4e335..fccb08b 100644 --- a/assets/screenshots/home.png +++ b/assets/screenshots/home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9a2260370402011fc0b15e83fdc3cf4a24a3a37c371a66d8a4fbb09fee6fe64 -size 209606 +oid sha256:8bc17cb46ad502ae9b8ea30568dde1a68b8077c1d7e54a43c3f3758478063001 +size 216063 diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 9d216ae..a9876f8 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -8,13 +8,13 @@ "name": "c2pa-preview", "version": "0.1.0", "dependencies": { - "@tauri-apps/api": "^1", + "@tauri-apps/api": "^1.5.4", "c2pa": "^0.20.0", "c2pa-wc": "^0.11.18", "mime": "^4.0.1" }, "devDependencies": { - "@tauri-apps/cli": "^1", + "@tauri-apps/cli": "^1.5.11", "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@typescript-eslint/eslint-plugin": "^7.3.0", "@typescript-eslint/parser": "^7.3.0", @@ -1001,9 +1001,9 @@ ] }, "node_modules/@tauri-apps/api": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.5.3.tgz", - "integrity": "sha512-zxnDjHHKjOsrIzZm6nO5Xapb/BxqUq1tc7cGkFXsFkGTsSWgCPH1D8mm0XS9weJY2OaR73I3k3S+b7eSzJDfqA==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.5.4.tgz", + "integrity": "sha512-LKYae9URbdEdbHrOXBeXb/lZgVyWTX0E98rSFBuQlmkLr8OeG+akuE41PfLjBVyk1Q+fq7wxo4ieenLSMUAUhA==", "engines": { "node": ">= 14.6.0", "npm": ">= 6.6.0", diff --git a/frontend/package.json b/frontend/package.json index 5498c38..dee5c6a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,13 +10,13 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^1", + "@tauri-apps/api": "^1.5.4", "c2pa": "^0.20.0", "c2pa-wc": "^0.11.18", "mime": "^4.0.1" }, "devDependencies": { - "@tauri-apps/cli": "^1", + "@tauri-apps/cli": "^1.5.11", "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@typescript-eslint/eslint-plugin": "^7.3.0", "@typescript-eslint/parser": "^7.3.0", diff --git a/tauri.conf.json b/tauri.conf.json index 9deed14..eaa75d4 100644 --- a/tauri.conf.json +++ b/tauri.conf.json @@ -2,7 +2,7 @@ "build": { "beforeDevCommand": "npm run dev", "beforeBuildCommand": "npm run build", - "devPath": "http://localhost:1420", + "devPath": "http://localhost:3000", "distDir": "frontend/dist", "withGlobalTauri": true }, @@ -44,18 +44,7 @@ "assets/icons/128x128.png", "assets/icons/128x128@2x.png", "assets/icons/icon.icns", - "assets/icons/icon.ico", - "assets/icons/icon.png", - "assets/icons/Square30x30Logo.png", - "assets/icons/Square44x44Logo.png", - "assets/icons/Square71x71Logo.png", - "assets/icons/Square89x89Logo.png", - "assets/icons/Square107x107Logo.png", - "assets/icons/Square142x142Logo.png", - "assets/icons/Square150x150Logo.png", - "assets/icons/Square284x284Logo.png", - "assets/icons/Square310x310Logo.png", - "assets/icons/StoreLogo.png" + "assets/icons/icon.ico" ] }, "cli": {