Modernization

.gitignore

@@ -0,0 +1,23 @@
+# OS X
+.DS_Store
+
+# Xcode
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+profile
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+
+# User-specific xcconfig files
+Xcode-config/DEVELOPMENT_TEAM.xcconfig

LNS/Info.plist

@@ -20,6 +20,8 @@
 	<string>1.0.1</string>
 	<key>CFBundleVersion</key>
 	<string>2</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
 	<key>LSBackgroundOnly</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>

OSAXHost.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3D0F977627652012008F24E0 /* DEVELOPMENT_TEAM.template.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 3D0F977327652012008F24E0 /* DEVELOPMENT_TEAM.template.xcconfig */; };
+		3D0F977727652012008F24E0 /* DEVELOPMENT_TEAM.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 3D0F977427652012008F24E0 /* DEVELOPMENT_TEAM.xcconfig */; };
+		3D0F977827652012008F24E0 /* Shared.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 3D0F977527652012008F24E0 /* Shared.xcconfig */; };
 		A52591D521B08EE9007EF081 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A5BC7BAB216BA7150055D4F8 /* main.m */; };
 		A52591D621B08EE9007EF081 /* StubScriptSuiteRegistry.m in Sources */ = {isa = PBXBuildFile; fileRef = A5BC7C80216BB1F70055D4F8 /* StubScriptSuiteRegistry.m */; };
 		A52591D721B08EE9007EF081 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A5BC7BA3216BA7130055D4F8 /* AppDelegate.m */; };
@@ -61,6 +64,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		3D0F977327652012008F24E0 /* DEVELOPMENT_TEAM.template.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DEVELOPMENT_TEAM.template.xcconfig; sourceTree = "<group>"; };
+		3D0F977427652012008F24E0 /* DEVELOPMENT_TEAM.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DEVELOPMENT_TEAM.xcconfig; sourceTree = "<group>"; };
+		3D0F977527652012008F24E0 /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		A52591E621B08EE9007EF081 /* LNSOSAX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LNSOSAX.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A52591EB21B08F97007EF081 /* List & Record Tools.osax */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "List & Record Tools.osax"; path = "LNS/List & Record Tools.osax"; sourceTree = SOURCE_ROOT; };
 		A52591EC21B08F97007EF081 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = LNS/Info.plist; sourceTree = SOURCE_ROOT; };
@@ -103,6 +109,16 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		3D0F977227652012008F24E0 /* Xcode-config */ = {
+			isa = PBXGroup;
+			children = (
+				3D0F977327652012008F24E0 /* DEVELOPMENT_TEAM.template.xcconfig */,
+				3D0F977427652012008F24E0 /* DEVELOPMENT_TEAM.xcconfig */,
+				3D0F977527652012008F24E0 /* Shared.xcconfig */,
+			);
+			path = "Xcode-config";
+			sourceTree = "<group>";
+		};
 		A52591EA21B08F81007EF081 /* LNS */ = {
 			isa = PBXGroup;
 			children = (
@@ -118,6 +134,7 @@
 		A5BC7B96216BA7130055D4F8 = {
 			isa = PBXGroup;
 			children = (
+				3D0F977227652012008F24E0 /* Xcode-config */,
 				A52591EA21B08F81007EF081 /* LNS */,
 				A5BC7C6F216BA9F50055D4F8 /* Satimage */,
 				A5BC7BA1216BA7130055D4F8 /* OSAXHost */,
@@ -208,7 +225,7 @@
 		A5BC7B97216BA7130055D4F8 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1320;
 				ORGANIZATIONNAME = "Mark Alldritt";
 				TargetAttributes = {
 					A5BC7B9E216BA7130055D4F8 = {
@@ -250,9 +267,12 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3D0F977727652012008F24E0 /* DEVELOPMENT_TEAM.xcconfig in Resources */,
+				3D0F977627652012008F24E0 /* DEVELOPMENT_TEAM.template.xcconfig in Resources */,
 				A5BC7BA6216BA7150055D4F8 /* Assets.xcassets in Resources */,
 				A5BC7C83216BB2F40055D4F8 /* SatimageOSAX.sdef in Resources */,
 				A5BC7BA9216BA7150055D4F8 /* MainMenu.xib in Resources */,
+				3D0F977827652012008F24E0 /* Shared.xcconfig in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -298,11 +318,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = OSAXHost/OSAXHost.entitlements;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 2;
-				DEVELOPMENT_TEAM = Z7S6X96M3X;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/LNS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -320,11 +340,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = OSAXHost/OSAXHost.entitlements;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 2;
-				DEVELOPMENT_TEAM = Z7S6X96M3X;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/LNS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -339,8 +359,10 @@
 		};
 		A5BC7BAE216BA7150055D4F8 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 3D0F977527652012008F24E0 /* Shared.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -363,6 +385,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -398,8 +421,10 @@
 		};
 		A5BC7BAF216BA7150055D4F8 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 3D0F977527652012008F24E0 /* Shared.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -422,6 +447,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -453,11 +479,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = OSAXHost/OSAXHost.entitlements;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 3;
-				DEVELOPMENT_TEAM = Z7S6X96M3X;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Satimage/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -475,11 +501,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = OSAXHost/OSAXHost.entitlements;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 3;
-				DEVELOPMENT_TEAM = Z7S6X96M3X;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Satimage/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

OSAXHost/Base.lproj/MainMenu.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +11,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
         <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
         <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
@@ -624,7 +624,7 @@
                             <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
                                 <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                 <connections>
-                                    <action selector="toggleSourceList:" target="-1" id="iwa-gc-5KM"/>
+                                    <action selector="toggleSidebar:" target="-1" id="iwa-gc-5KM"/>
                                 </connections>
                             </menuItem>
                             <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
@@ -674,6 +674,7 @@
                     </menu>
                 </menuItem>
             </items>
+            <point key="canvasLocation" x="141" y="154"/>
         </menu>
     </objects>
 </document>

Satimage/Info.plist

@@ -20,6 +20,8 @@
 	<string>1.0.2</string>
 	<key>CFBundleVersion</key>
 	<string>3</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
 	<key>LSBackgroundOnly</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>

Xcode-config/DEVELOPMENT_TEAM.template.xcconfig

@@ -0,0 +1 @@
+DEVELOPMENT_TEAM = AB1234C5DE

Xcode-config/Shared.xcconfig

@@ -0,0 +1,49 @@
+#include? "DEVELOPMENT_TEAM.xcconfig"
+
+// Create the file DEVELOPMENT_TEAM.xcconfig
+// in the "Xcode-config" directory within the project directory
+// with the following build setting:
+// DEVELOPMENT_TEAM = [Your TeamID]
+
+// One way to find your Team ID is to set the “Development Team”
+// build setting (Xcode key: "DEVELOPMENT_TEAM") and have a look
+// at the “Source Control” changes (menu item “Commit…”/⌥⌘C).
+// Just make sure that this change doesn’t actually get commited.
+
+// You can also find your Team ID by logging into your Apple Developer account
+// and going to
+// https://developer.apple.com/account/#/membership
+// It should be listed under “Team ID”.
+
+// To set this system up for your own project,
+// copy the "Xcode-config" directory there,
+// add it to your Xcode project,
+// navigate to your project settings
+// (root icon in the Xcode Project Navigator)
+// click on the project icon there,
+// click on the “Info” tab
+// under “Configurations”
+// open the “Debug”, “Release”,
+// and any other build configurations you might have.
+// There you can set the pull-down menus in the
+// “Based on Configuration File” column to “Shared”.
+// Your work in Xcode is done.
+
+// Don’t forget to add the DEVELOPMENT_TEAM.xcconfig file to your .gitignore:
+// # User-specific xcconfig files
+// Xcode-config/DEVELOPMENT_TEAM.xcconfig
+// The two lines above are an example.
+// Please don’t copy the comment slashes over though.
+
+// You can and should now replace the “DevelopmentTeam = AB1234C5DE;” entries in
+// .xcodeproj/project.pbxproj
+// with “DevelopmentTeam = "";”
+// They would otherwise override the Team ID set via this config file and its include.
+// Please note that .pbxproj files use straight quotes.
+
+// When you commit changes to the Xcode project file
+// after changing settings in “Signing & Capabilities”
+// Entries like these may appear in your file changes/commit diff preview:
+// CODE_SIGN_IDENTITY = …;
+// CODE_SIGN_STYLE = Manual/Automatic;
+// Please make sure not to commit them to source control.