diff --git a/.github/workflows/release-assets.yml b/.github/workflows/release-assets.yml index be62a40..45aba68 100644 --- a/.github/workflows/release-assets.yml +++ b/.github/workflows/release-assets.yml @@ -13,7 +13,7 @@ jobs: matrix: include: - os: ubuntu-latest - arch: amd64 + arch: [arm64, amd64] - os: macos-latest arch: [arm64, amd64] - os: windows-latest diff --git a/electron-builder.json b/electron-builder.json index f4ac023..9a5cdb1 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -14,41 +14,6 @@ "repo": "escrcpy", "updaterCacheDirName": "escrcpy-updater" }, - "mac": { - "icon": "logo.icns", - "target": [ - { - "target": "dmg", - "arch": ["universal", "arm64", "x64"] - } - ], - "artifactName": "${productName}-${version}-mac-installer.${ext}", - "entitlementsInherit": "electron/resources/build/entitlements.mac.plist", - "extendInfo": { - "NSDocumentsFolderUsageDescription": "Application requests access to the user's Documents folder.", - "NSDownloadsFolderUsageDescription": "Application requests access to the user's Downloads folder." - }, - "notarize": false - }, - "win": { - "icon": "logo.ico", - "target": [ - { - "target": "nsis", - "arch": ["x64"] - }, - { - "target": "zip" - }, - { - "target": "portable" - } - ], - "extraResources": { - "from": "electron/resources/extra", - "to": "extra" - } - }, "nsis": { "artifactName": "${productName}-${version}-win-setup.${ext}", "shortcutName": "${productName}", @@ -62,9 +27,71 @@ "artifactName": "${productName}-${version}-win-portable.${ext}", "requestExecutionLevel": "user" }, + "win": { + "icon": "logo.ico", + "target": [ + { + "target": "nsis", + "arch": ["x64"] + }, + { + "target": "zip", + "arch": ["x64"] + }, + { + "target": "portable", + "arch": ["x64"] + } + ], + "extraResources": { + "from": "electron/resources/extra", + "to": "extra" + } + }, + "mac": { + "icon": "logo.icns", + "target": [ + { + "target": "dmg", + "arch": ["universal", "x64", "arm64"] + }, + { + "target": "zip", + "arch": ["universal", "x64", "arm64"] + } + ], + "artifactName": "${productName}-${version}-mac-${arch}.${ext}", + "entitlementsInherit": "electron/resources/build/entitlements.mac.plist", + "extendInfo": { + "NSDocumentsFolderUsageDescription": "Application requests access to the user's Documents folder.", + "NSDownloadsFolderUsageDescription": "Application requests access to the user's Downloads folder." + }, + "type": "development", + "notarize": false, + "darkModeSupport": true, + "hardenedRuntime": false + }, "linux": { + "category": "Utility", "icon": "logo.png", - "target": ["AppImage"], + "target": [ + { + "target": "AppImage", + "arch": ["x64", "arm64"] + }, + { + "target": "deb", + "arch": ["x64", "arm64"] + }, + { + "target": "rpm", + "arch": ["x64"] + }, + { + "target": "snap", + "arch": ["x64"] + } + ], "artifactName": "${productName}-${version}-linux.${ext}" }, "npmRebuild": false diff --git a/electron/resources/build/logo.icns b/electron/resources/build/logo.icns index f6e631f..f783144 100644 Binary files a/electron/resources/build/logo.icns and b/electron/resources/build/logo.icns differ diff --git a/electron/resources/build/logo.ico b/electron/resources/build/logo.ico index 0ca480c..6f3368f 100644 Binary files a/electron/resources/build/logo.ico and b/electron/resources/build/logo.ico differ diff --git a/electron/resources/build/logo.png b/electron/resources/build/logo.png index 3398cba..026b5bf 100644 Binary files a/electron/resources/build/logo.png and b/electron/resources/build/logo.png differ diff --git a/public/logo.ico b/public/logo.ico index 0ca480c..6f3368f 100644 Binary files a/public/logo.ico and b/public/logo.ico differ diff --git a/src/assets/icon.png b/src/assets/icon.png deleted file mode 100644 index 3398cba..0000000 Binary files a/src/assets/icon.png and /dev/null differ diff --git a/src/assets/logo.png b/src/assets/logo.png new file mode 100644 index 0000000..026b5bf Binary files /dev/null and b/src/assets/logo.png differ diff --git a/src/components/About/index.vue b/src/components/About/index.vue index 214a5e4..dcd0642 100644 --- a/src/components/About/index.vue +++ b/src/components/About/index.vue @@ -1,7 +1,7 @@