From f4a0bd2331d24bdff326b9c61168f49a1c6dd3b5 Mon Sep 17 00:00:00 2001
From: Nayam Amarshe <25067102+NayamAmarshe@users.noreply.github.com>
Date: Sat, 14 Oct 2023 13:21:52 +0530
Subject: [PATCH] Update plist

---
 .prettierignore                              |  3 +++
 package-lock.json                            |  4 ++--
 package.json                                 | 16 +++++-----------
 resources/entitlements.mac.plist             | 10 +++-------
 resources/entitlements.mas.inherit.plist     |  4 ----
 resources/entitlements.mas.loginhelper.plist |  8 --------
 6 files changed, 13 insertions(+), 32 deletions(-)
 create mode 100644 .prettierignore
 delete mode 100644 resources/entitlements.mas.loginhelper.plist

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..b72bb75
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,3 @@
+**/*.plist
+**/resources/**/*
+*.plist
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 9dc9a04..9ab7990 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "upscayl",
-  "version": "2.8.6",
+  "version": "2.9.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "upscayl",
-      "version": "2.8.6",
+      "version": "2.9.0",
       "license": "AGPL-3.0",
       "dependencies": {
         "daisyui": "^3.3.1",
diff --git a/package.json b/package.json
index a59d4cd..30b57c5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "upscayl",
   "private": true,
-  "version": "2.8.6",
+  "version": "2.9.0",
   "productName": "Upscayl",
   "homepage": "https://github.com/TGS963/upscayl",
   "contributors": [
@@ -43,7 +43,8 @@
     "dist:deb": "tsc && npm run build && cross-env DEBUG=* electron-builder build -l deb",
     "dist:rpm": "tsc && npm run build && cross-env DEBUG=* electron-builder build -l rpm",
     "dist:zip": "tsc && npm run build && cross-env DEBUG=* electron-builder build -l zip",
-    "dist:dmg": "tsc && npm run build && cross-env DEBUG=* electron-builder build -m dmg",
+    "dist:mac-zip": "tsc && npm run build && cross-env DEBUG=* electron-builder build -l zip",
+    "dist:dmg": "tsc && npm run build && electron-builder build -m dmg",
     "dist:msi": "tsc && npm run build && cross-env DEBUG=* electron-builder build -w nsis",
     "dist:pkg": "tsc && npm run build && cross-env DEBUG=* electron-builder build -m pkg",
     "dist:mac": "tsc && npm run build && electron-builder --mac --universal",
@@ -115,23 +116,16 @@
           "arch": [
             "universal"
           ]
-        },
-        {
-          "target": "mas",
-          "arch": [
-            "universal"
-          ]
         }
       ],
-      "x64ArchFiles": "*",
-      "provisioningProfile": "embedded.provisionprofile"
+      "x64ArchFiles": "*"
     },
     "mas": {
       "hardenedRuntime": false,
       "type": "distribution",
       "category": "public.app-category.photography",
       "entitlements": "resources/entitlements.mac.plist",
-      "entitlementsInherit": "resources/entitlements.mac.plist",
+      "entitlementsInherit": "resources/entitlements.mas.inherit.plist",
       "provisioningProfile": "embedded.provisionprofile",
       "mergeASARs": false,
       "icon": "build/icon.icns",
diff --git a/resources/entitlements.mac.plist b/resources/entitlements.mac.plist
index 1e4911b..e8c622e 100644
--- a/resources/entitlements.mac.plist
+++ b/resources/entitlements.mac.plist
@@ -2,12 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.team-identifier</key>
+	<string>W2T4W74X87</string>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>W2T4W74X87.org.upscayl.Upscayl</string>
-	</array>
+	<string>org.upscayl.Upscayl</string>
 	<key>com.apple.security.automation.apple-events</key>
 	<true/>
 	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
@@ -16,10 +16,6 @@
 	<true/>
 	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
 	<true/>
-	<key>com.apple.security.cs.debugger</key>
-	<true/>
-	<key>com.apple.security.cs.disable-library-validation</key>
-	<true/>
 	<key>com.apple.security.files.user-selected.read-write</key>
 	<true/>
 	<key>com.apple.security.inherit</key>
diff --git a/resources/entitlements.mas.inherit.plist b/resources/entitlements.mas.inherit.plist
index 4759d0a..794eada 100644
--- a/resources/entitlements.mas.inherit.plist
+++ b/resources/entitlements.mas.inherit.plist
@@ -4,10 +4,6 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
-	<key>com.apple.security.cs.allow-jit</key>
-	<true/>
-	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-	<true/>
 	<key>com.apple.security.inherit</key>
 	<true/>
 </dict>
diff --git a/resources/entitlements.mas.loginhelper.plist b/resources/entitlements.mas.loginhelper.plist
deleted file mode 100644
index 852fa1a..0000000
--- a/resources/entitlements.mas.loginhelper.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.app-sandbox</key>
-	<true/>
-</dict>
-</plist>