version 1.2.0

Author: yang991178

README.md

@@ -14,7 +14,7 @@
 
 For Windows 10 users, the recommended way of installation is through [Microsoft Store](https://www.microsoft.com/store/apps/9P71FC94LRH8?cid=github). 
 This enables auto-update and experimental ARM64 support. 
-macOS users can also get Fluent Reader from the [Mac App Store](https://apps.apple.com/app/id1520907427).
+macOS users can also get Fluent Reader from the Mac App Store (temporarily unavailable).
 
 If you are using Linux or an older version of Windows, you can [get Fluent Reader from GitHub releases](https://github.com/yang991178/fluent-reader/releases).
 

build/entitlements.mac.plist

@@ -0,0 +1,9 @@
+<?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.cs.allow-jit</key><true/>
+		<key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
+		<key>com.apple.security.cs.allow-dyld-environment-variables</key><true/>
+	</dict>
+</plist>

build/entitlements.mas.plist

@@ -5,7 +5,7 @@
     <key>com.apple.security.app-sandbox</key><true/>
     <key>com.apple.security.application-groups</key>  
     <array> 
-      <string>EM8VE646TZ.DevHYLiu.FluentReader</string>  
+      <string>P2CG8QD3BP.me.hyliu.fluent-reader-mas</string>  
     </array>  
     <!-- Put any entitlements your app requires here. Below is a example --> 
     <key>com.apple.security.network.client</key><true/>

build/resignAndPackage.sh

@@ -1,7 +1,7 @@
 # Name of your app.
 APP="Fluent Reader"
 # Your Certificate name.
-CERT="Jieyu Yan (EM8VE646TZ)"
+CERT="Haoyuan Liu (P2CG8QD3BP)"
 # The path of your app to sign.
 APP_PATH="bin/darwin/universal/mas-universal/Fluent Reader.app"
 # The path to the location you want to put the signed package.
@@ -19,9 +19,10 @@ FRAMEWORKS_PATH="$APP_PATH/Contents/Frameworks"
 # FONTLIST_PATH="node_modules/font-list/libs/darwin/fontlist.m"
 # clang -arch arm64 -arch x86_64 "$FONTLIST_PATH" -fmodules -o "dist/fontlist"
 # Build the MAS app
-CSC_IDENTITY_AUTO_DISCOVERY=false npx electron-builder -c electron-builder-mas.yml --mac mas:universal
+CSC_IDENTITY_AUTO_DISCOVERY=false
+npx electron-builder -c electron-builder-mas.yml --mac mas:universal
 # Add ElectronTeamID to Info.plist
-sed -i '' -e 's/<\/dict>/<key>ElectronTeamID<\/key><string>EM8VE646TZ<\/string><\/dict>/g' "bin/darwin/universal/mas-universal/Fluent Reader.app/Contents/Info.plist"
+sed -i '' -e 's/<\/dict>/<key>ElectronTeamID<\/key><string>P2CG8QD3BP<\/string><\/dict>/g' "bin/darwin/universal/mas-universal/Fluent Reader.app/Contents/Info.plist"
 
 printf "......................\nresignAndPackage start\n\n"
 codesign --deep --force --verify --verbose=4 --timestamp --options runtime --entitlements "$CHILD_PLIST" -s "$APP_KEY" "$APP_PATH/Contents/Resources/app.asar.unpacked/dist/fontlist"

dist/fontlist

@@ -1,5 +1,5 @@
-appId: DevHYLiu.FluentReader
-buildVersion: 29
+appId: me.hyliu.fluent-reader-mas
+buildVersion: 30
 productName: Fluent Reader
 copyright: Copyright © 2020 Haoyuan Liu
 files:

electron-builder-mas.yml

@@ -9,6 +9,11 @@ directories:
     output: "./bin/${platform}/${arch}/"
 mac:
     darkModeSupport: true
+    hardenedRuntime: true
+    gatekeeperAssess: false
+    entitlements: "./build/entitlements.mac.plist"
+    entitlementsInherit: "./build/entitlements.mac.plist"
+    notarize: true
     target:
         - dmg
     category: public.app-category.news
@@ -70,4 +75,5 @@ linux:
     icon: build/icons
     category: Utility
     desktop:
-        StartupWMClass: fluent-reader
+        entry:
+            StartupWMClass: fluent-reader

electron-builder.yml

@@ -1,6 +1,6 @@
 {
   "name": "fluent-reader",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "Modern desktop RSS reader",
   "main": "./dist/electron.js",
   "scripts": {
@@ -10,7 +10,7 @@
     "format": "prettier --write .",
     "package-win": "electron-builder -w appx:x64 && electron-builder -w appx:ia32 && electron-builder -w appx:arm64",
     "package-win-ci": "electron-builder -w --x64 -p never && electron-builder -w --ia32 -p never",
-    "package-mac": "electron-builder --mac --x64",
+    "package-mac": "electron-builder --mac --universal",
     "package-mas": "bash build/resignAndPackage.sh",
     "package-linux": "electron-builder --linux --x64 -p never"
   },