fix(cli): corrupted icons in bundled macOS icons (#5698)

Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
tauri-apps · Nov 28, 2022 · 2d545ef · 2d545ef
1 parent 0e8d3a6
commit 2d545ef
Show file tree

Hide file tree

Showing 46 changed files with 8 additions and 2 deletions.
diff --git a/.changes/cli-corrupted-icns.md b/.changes/cli-corrupted-icns.md
@@ -0,0 +1,6 @@
+---
+'cli.rs': 'patch'
+'cli.js': 'patch'
+---
+
+Use older icon types to work around a macOS bug resulting in corrupted 16x16px and 32x32px icons in bundled apps.
diff --git a/examples/.icons/128x128.png b/examples/.icons/128x128.png
diff --git a/examples/.icons/128x128@2x.png b/examples/.icons/128x128@2x.png
diff --git a/examples/.icons/32x32.png b/examples/.icons/32x32.png
diff --git a/examples/.icons/Square107x107Logo.png b/examples/.icons/Square107x107Logo.png
diff --git a/examples/.icons/Square142x142Logo.png b/examples/.icons/Square142x142Logo.png
diff --git a/examples/.icons/Square150x150Logo.png b/examples/.icons/Square150x150Logo.png
diff --git a/examples/.icons/Square284x284Logo.png b/examples/.icons/Square284x284Logo.png
diff --git a/examples/.icons/Square30x30Logo.png b/examples/.icons/Square30x30Logo.png
diff --git a/examples/.icons/Square310x310Logo.png b/examples/.icons/Square310x310Logo.png
diff --git a/examples/.icons/Square44x44Logo.png b/examples/.icons/Square44x44Logo.png
diff --git a/examples/.icons/Square71x71Logo.png b/examples/.icons/Square71x71Logo.png
diff --git a/examples/.icons/Square89x89Logo.png b/examples/.icons/Square89x89Logo.png
diff --git a/examples/.icons/StoreLogo.png b/examples/.icons/StoreLogo.png
diff --git a/examples/.icons/icon.icns b/examples/.icons/icon.icns
diff --git a/examples/.icons/icon.ico b/examples/.icons/icon.ico
diff --git a/examples/.icons/icon.png b/examples/.icons/icon.png
diff --git a/tooling/cli/src/helpers/icns.json b/tooling/cli/src/helpers/icns.json
@@ -2,7 +2,7 @@
   "16x16": {
     "name": "icon_16x16.png",
     "size": 16,
-    "ostype": "icp4"
+    "ostype": "is32"
   },
   "16x16@2x": {
     "name": "icon_16x16@2x.png",
@@ -12,7 +12,7 @@
   "32x32": {
     "name": "icon_32x32.png",
     "size": 32,
-    "ostype": "icp5"
+    "ostype": "il32"
   },
   "32x32@2x": {
     "name": "icon_32x32@2x.png",

diff --git a/tooling/cli/templates/app/src-tauri/icons/128x128.png b/tooling/cli/templates/app/src-tauri/icons/128x128.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/128x128@2x.png b/tooling/cli/templates/app/src-tauri/icons/128x128@2x.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/32x32.png b/tooling/cli/templates/app/src-tauri/icons/32x32.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/Square107x107Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square107x107Logo.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/Square142x142Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square142x142Logo.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/Square150x150Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square150x150Logo.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/Square284x284Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square284x284Logo.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/Square30x30Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square30x30Logo.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/Square310x310Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square310x310Logo.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/Square44x44Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square44x44Logo.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/Square71x71Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square71x71Logo.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/Square89x89Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square89x89Logo.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/StoreLogo.png b/tooling/cli/templates/app/src-tauri/icons/StoreLogo.png
diff --git a/tooling/cli/templates/app/src-tauri/icons/icon.icns b/tooling/cli/templates/app/src-tauri/icons/icon.icns
diff --git a/tooling/cli/templates/app/src-tauri/icons/icon.ico b/tooling/cli/templates/app/src-tauri/icons/icon.ico
diff --git a/tooling/cli/templates/app/src-tauri/icons/icon.png b/tooling/cli/templates/app/src-tauri/icons/icon.png
diff --git a/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128.png b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128.png
diff --git a/...ng/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128@2x.png b/...ng/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128@2x.png
diff --git a/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/32x32.png b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/32x32.png
diff --git a/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.icns b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.icns
diff --git a/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.ico b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.ico
diff --git a/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.png b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.png
diff --git a/...g/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128.png b/...g/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128.png
diff --git a/...li/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128@2x.png b/...li/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128@2x.png
diff --git a/...ing/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/32x32.png b/...ing/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/32x32.png
diff --git a/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.icns b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.icns
diff --git a/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.ico b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.ico
diff --git a/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.png b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.png