Merge pull request #9 from IvanMathy/feat/releasePrep

Feat/release prep
IvanMathy · Jun 16, 2020 · e18d856 · e18d856
2 parents 2c7f92a + 6ec53ee
commit e18d856
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 11 deletions.
diff --git a/Boop/Boop.xcodeproj/project.pbxproj b/Boop/Boop.xcodeproj/project.pbxproj
@@ -155,6 +155,7 @@
 		2C2066A521FE53870082570E /* SearchField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchField.swift; sourceTree = "<group>"; };
 		2C3B003D22E3775300BBD4D0 /* SavannaKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SavannaKit.framework; path = ../../../Carthage/Build/Mac/SavannaKit.framework; sourceTree = "<group>"; };
 		2C53B6DF226D404E00DC6861 /* ScriptExecution.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptExecution.swift; sourceTree = "<group>"; };
+		2C5770D4249727A600B38470 /* BoopRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = BoopRelease.entitlements; sourceTree = "<group>"; };
 		2C5ED41D2357F67200322893 /* Preferences.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Preferences.storyboard; sourceTree = "<group>"; };
 		2C60A4A12482FE9E006496BA /* UpdateBuddy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateBuddy.swift; sourceTree = "<group>"; };
 		2C60A4A3248300CE006496BA /* AppVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppVersion.swift; sourceTree = "<group>"; };
@@ -235,6 +236,7 @@
 		2C20667421FD628E0082570E /* Boop */ = {
 			isa = PBXGroup;
 			children = (
+				2C5770D4249727A600B38470 /* BoopRelease.entitlements */,
 				2C9761DA2214E44300AFF8CD /* System */,
 				2C9761D42214E11600AFF8CD /* scripts */,
 				2C20669821FD767E0082570E /* Views */,
@@ -644,7 +646,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -705,7 +707,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -733,9 +735,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Boop/Boop.entitlements;
 				CODE_SIGN_IDENTITY = "-";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = RLZ8XBTX7G;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../Carthage/Build/Mac",
 					"$(inherited)",
@@ -761,11 +763,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = Boop/Boop.entitlements;
+				CODE_SIGN_ENTITLEMENTS = Boop/BoopRelease.entitlements;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = "";
+				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../Carthage/Build/Mac",
 					"$(inherited)",
@@ -780,7 +783,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MARKETING_VERSION = 1.0.0;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
-				PRODUCT_BUNDLE_IDENTIFIER = com.OKatBest.Boop;
+				PRODUCT_BUNDLE_IDENTIFIER = com.okatbest.boop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 4.2;
@@ -795,6 +798,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../Carthage/Build/Mac",
@@ -826,6 +830,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../Carthage/Build/Mac",
@@ -842,7 +847,7 @@
 				MARKETING_VERSION = 1.0.0;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				"OTHER_SWIFT_FLAGS[arch=*]" = "-D APPSTORE";
-				PRODUCT_BUNDLE_IDENTIFIER = com.OKatBest.Boop;
+				PRODUCT_BUNDLE_IDENTIFIER = com.okatbest.boop;
 				PRODUCT_NAME = Boop;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 4.2;

diff --git a/Boop/Boop/BoopRelease.entitlements b/Boop/Boop/BoopRelease.entitlements
@@ -0,0 +1,14 @@
+<?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/>
+	<key>com.apple.security.files.bookmarks.app-scope</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-only</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Boop/Boop/Controllers/MainViewController.swift b/Boop/Boop/Controllers/MainViewController.swift
@@ -13,10 +13,17 @@ class MainViewController: NSViewController {
 
     @IBOutlet weak var editorView: SyntaxTextView!
     @IBOutlet weak var updateBuddy: UpdateBuddy!
+    @IBOutlet weak var checkUpdateMenuItem: NSMenuItem!
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        #if APPSTORE
+
+        checkUpdateMenuItem.isHidden = true
+
+        #endif
+
 
         editorView.delegate = self
         editorView.theme = DefaultTheme()

diff --git a/Boop/Boop/Info.plist b/Boop/Boop/Info.plist
@@ -17,7 +17,9 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Boop/Boop/scripts/Base64Decode.js b/Boop/Boop/scripts/Base64Decode.js
@@ -2,7 +2,7 @@
 	{
 		"api":1,
 		"name":"Base64 Decode",
-		"description":"Decodes your text from Base 64",
+		"description":"Decodes your text from Base64",
 		"author":"See Source",
 		"icon":"metamorphose",
 		"tags":"base64,btoa,decode"

diff --git a/Boop/Boop/scripts/Base64Encode.js b/Boop/Boop/scripts/Base64Encode.js
@@ -1,8 +1,8 @@
 /**
 	{
 		"api":1,
-		"name":"Bas64 Encode",
-		"description":"Encodes your text to Base 64",
+		"name":"Base64 Encode",
+		"description":"Encodes your text to Base64",
 		"author":"See Source",
 		"icon":"metamorphose",
 		"tags":"base64,atob,encode"

diff --git a/Boop/Documentation/Readme.md b/Boop/Documentation/Readme.md
@@ -34,10 +34,18 @@ Because that's not the goal of Boop. It's not really an editor, more of a unstru
 
 Yes! Simply follow the instruction in the [Custom Scripts page](CustomScripts.md) to know how to get started.
 
+### Does Boop collect data on me?
+
+No. The only time Boop communicates outside of itself is to check whether a new version is available. This is done by fetching a static .json file, with no additional data passed along. If you downloaded Boop through the Mac App Store, it's possible that standard data and/or crash reports get sent back to Apple and shared with me if you enabled App Analytics sharing.
+
 ### How can I report a problem?
 
 The best way to do that is to [file an issue on Github](https://github.com/IvanMathy/Boop/issues/new). Otherwise, you can [talk to me on Twitter](https://twitter.com/OKatBest), as long as you're nice.
 
+### How is Boop built?
+
+Built is mostly built using a custom fork of [SavannaKit](https://github.com/IvanMathy/savannakit), originaly created by [Louis D'hauwe](http://twitter.com/LouisDhauwe). The search is powered by a custom fork of [Fuse-swift](https://github.com/IvanMathy/fuse-swift). The rest of Boop is simply built in Swift, besides scripts which are Javascript. Go ahead and open some of them to check their license!
+
 ### Do I have to say "Boop" out loud when I press ⌘+B?
 
 Yes.
diff --git a/Boop/UI/Base.lproj/MainMenu.xib b/Boop/UI/Base.lproj/MainMenu.xib
@@ -25,6 +25,7 @@
         </customObject>
         <viewController id="unv-pE-gme" customClass="MainViewController" customModule="Boop" customModuleProvider="target">
             <connections>
+                <outlet property="checkUpdateMenuItem" destination="mdD-pu-Aba" id="Ffr-2n-BVJ"/>
                 <outlet property="editorView" destination="Ef0-Na-xwu" id="Bgy-ZL-Z2D"/>
                 <outlet property="updateBuddy" destination="twH-mb-iPe" id="Sqq-Ci-vlD"/>
                 <outlet property="view" destination="Ef0-Na-xwu" id="wVq-8C-Rni"/>

diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@
 
 <img src="Boop/Documentation/Images/UI.png?raw=true" width="663" alt="UI Screenshot">
 
+[book.okat.best](https://boop.okat.best/)
+
 </p>
 
 [![Build Status](https://app.bitrise.io/app/b0c493f8b65e1dac/status.svg?token=BoJJDoViYpKy8V_O5P7ljA&branch=master)](https://app.bitrise.io/app/b0c493f8b65e1dac) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=IvanMathy_Boop&metric=alert_status)](https://sonarcloud.io/dashboard?id=IvanMathy_Boop)