From 247710fd7136f8faa7e178a71f6e23cea98a014e Mon Sep 17 00:00:00 2001
From: cbh778899 <cbh778899@outlook.com>
Date: Wed, 16 Oct 2024 12:25:50 +1100
Subject: [PATCH] adjust settings so they won't conflict with each other

Signed-off-by: cbh778899 <cbh778899@outlook.com>
---
 electron-builder.yml |  3 +++
 package.json         | 14 +-------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/electron-builder.yml b/electron-builder.yml
index 4bc864a..034d00f 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -12,14 +12,17 @@ files:
 win:
   target:
     - nsis
+  icon: build/icons/icon.ico  # Set Windows icon
 
 mac:
   target:
     - zip
+  icon: build/icons/icon.icns  # Set macOS icon
 
 linux:
   target:
     - AppImage
+  icon: build/icons/icon.png  # Set Linux icon
 
 nsis:
   oneClick: false  # Whether the installer is one-click
diff --git a/package.json b/package.json
index cf649d3..62305a3 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "name": "Bohan Cheng",
     "email": "cbh778899@outlook.com"
   },
-  "version": "0.2.5",
+  "version": "0.2.6",
   "main": "electron.js",
   "license": "Apache-2.0",
   "scripts": {
@@ -42,17 +42,5 @@
     "eslint-plugin-react-refresh": "^0.4.9",
     "globals": "^15.9.0",
     "vite": "^5.4.1"
-  },
-  "build": {
-    "icon": "build/icons/icon.png",
-    "win": {
-      "icon": "build/icons/icon.ico"
-    },
-    "mac": {
-      "icon": "build/icons/icon.icns"
-    },
-    "linux": {
-      "icon": "build/icons/icon.png"
-    }
   }
 }