Homebrew Support

.gitignore

@@ -66,3 +66,7 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
+
+# Autorevision
+autorevision.swift
+autorevision.h

.swiftlint.yml

@@ -4,7 +4,7 @@ disabled_rules:
   - nesting
   - todo
 excluded: 
-  - excluded_dir
+  - Screenshot Framer CLI/autorevision.swift
 file_length: 
   warning: 500
 large_tuple: 

Screenshot Framer CLI/ConsoleIO.swift

@@ -64,6 +64,19 @@ class ConsoleIO {
         self.writeMessage("\toptional: -ignoreFontToBig")
         self.writeMessage("")
     }
+
+    func printVersion() {
+        self.writeMessage("Screenshot Framer CLI: Create localized App Store screenshots")
+        self.writeMessage("Brought to you by IdeasOnCanvas GmbH, the creator of MindNode for iOS, macOS & watchOS.")
+        self.writeMessage("https://github.com/IdeasOnCanvas/ScreenshotFramer")
+        self.writeMessage("")
+        self.writeMessage("       Version: \(VCS_TAG ?? "0.0")")
+        self.writeMessage("        Branch: \(VCS_BRANCH)")
+        self.writeMessage("   Commit Hash: \(VCS_FULL_HASH)")
+        self.writeMessage("   Commit Time: \(VCS_DATE)")
+        self.writeMessage("")
+        self.writeMessage("")
+    }
 }
 
 

Screenshot Framer CLI/Controller.swift

@@ -38,6 +38,10 @@ final class Controller {
             self.console.printUsage()
         }
 
+        if self.arguments.filter({ $0.lowercased() == "-v" || $0.lowercased() == "-version" }).hasElements {
+            self.console.printVersion()
+        }
+
         self.ignoreFontToBig = self.arguments.filter { $0.lowercased() == "-ignorefonttobig" }.hasElements
         guard let index = self.arguments.index(of: "-project") else { parseParameterFailed(); return .wrongArguments }
         guard self.arguments.count >= index + 1 else { parseParameterFailed(); return .wrongArguments }

Screenshot Framer.xcodeproj/project.pbxproj

@@ -6,6 +6,20 @@
 	objectVersion = 48;
 	objects = {
 
+/* Begin PBXAggregateTarget section */
+		CDDB614C226F30A50053DEDE /* Version */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = CDDB614D226F30A60053DEDE /* Build configuration list for PBXAggregateTarget "Version" */;
+			buildPhases = (
+				CDDB6154226F30E70053DEDE /* Copy Version from Git to Source */,
+			);
+			dependencies = (
+			);
+			name = Version;
+			productName = Version;
+		};
+/* End PBXAggregateTarget section */
+
 /* Begin PBXBuildFile section */
 		CD26F83B1FCEE01800449B4A /* LayerState.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD26F83A1FCEE01800449B4A /* LayerState.swift */; };
 		CD26F83D1FCEEB1C00449B4A /* LayerStateHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD26F83C1FCEEB1C00449B4A /* LayerStateHistory.swift */; };
@@ -56,6 +70,7 @@
 		CDB659131FE4268200430F20 /* FileController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDB659121FE4268200430F20 /* FileController.swift */; };
 		CDD324602266E73100D0D6CF /* VerticallyCenteredTextFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDD3245F2266E73100D0D6CF /* VerticallyCenteredTextFieldCell.swift */; };
 		CDD324612266E73100D0D6CF /* VerticallyCenteredTextFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDD3245F2266E73100D0D6CF /* VerticallyCenteredTextFieldCell.swift */; };
+		CDE4190A226F46A700316B68 /* autorevision.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDE41909226F46A700316B68 /* autorevision.swift */; };
 		CDE9C3541FEBDBD100168B40 /* Document Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = CDE9C3531FEBDBD100168B40 /* Document Icon.icns */; };
 		CDE9C3551FEBEBCE00168B40 /* OutputConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD75DDA61FE916E80035952D /* OutputConfig.swift */; };
 		CDE9C3561FEBEBD300168B40 /* Operations.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD50EF4C1FDE883200FB0F2F /* Operations.swift */; };
@@ -70,6 +85,20 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		CD6B0736226F4CB900DDCC2E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CD5EE0341FCD557200AD2ED7 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = CDDB614C226F30A50053DEDE;
+			remoteInfo = Version;
+		};
+		CD6B0738226F52A900DDCC2E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CD5EE0341FCD557200AD2ED7 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = CDDB614C226F30A50053DEDE;
+			remoteInfo = Version;
+		};
 		CDFF699A1FD827B800E652EE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = CD5EE0341FCD557200AD2ED7 /* Project object */;
@@ -130,6 +159,7 @@
 		CDB659101FE3F00000430F20 /* MNCoalescing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MNCoalescing.swift; sourceTree = "<group>"; };
 		CDB659121FE4268200430F20 /* FileController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileController.swift; sourceTree = "<group>"; };
 		CDD3245F2266E73100D0D6CF /* VerticallyCenteredTextFieldCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerticallyCenteredTextFieldCell.swift; sourceTree = "<group>"; };
+		CDE41909226F46A700316B68 /* autorevision.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = autorevision.swift; sourceTree = "<group>"; };
 		CDE9C3531FEBDBD100168B40 /* Document Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "Document Icon.icns"; sourceTree = "<group>"; };
 		CDFF69951FD827B800E652EE /* Screenshot FramerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Screenshot FramerTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		CDFF69971FD827B800E652EE /* ScreenshotFramerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScreenshotFramerTests.swift; sourceTree = "<group>"; };
@@ -288,6 +318,7 @@
 		CD9395571FF6AC6D00D3D831 /* Screenshot Framer CLI */ = {
 			isa = PBXGroup;
 			children = (
+				CDE41909226F46A700316B68 /* autorevision.swift */,
 				CD9395581FF6AC6D00D3D831 /* main.swift */,
 				CD93955F1FF6AEAB00D3D831 /* Controller.swift */,
 				CD93955D1FF6AE1900D3D831 /* ConsoleIO.swift */,
@@ -344,6 +375,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				CD6B0739226F52A900DDCC2E /* PBXTargetDependency */,
 			);
 			name = "Screenshot Framer";
 			productName = Framer;
@@ -362,6 +394,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				CD6B0737226F4CB900DDCC2E /* PBXTargetDependency */,
 			);
 			name = "Screenshot-Framer-CLI";
 			productName = "Screenshot Framer CLI";
@@ -408,12 +441,14 @@
 					};
 					CD9395551FF6AC6D00D3D831 = {
 						CreatedOnToolsVersion = 9.2;
+					};
+					CDDB614C226F30A50053DEDE = {
+						CreatedOnToolsVersion = 10.2.1;
 						ProvisioningStyle = Automatic;
 					};
 					CDFF69941FD827B800E652EE = {
 						CreatedOnToolsVersion = 9.2;
 						LastSwiftMigration = 1010;
-						ProvisioningStyle = Automatic;
 						TestTargetID = CD5EE03B1FCD557200AD2ED7;
 					};
 				};
@@ -434,6 +469,7 @@
 				CD5EE03B1FCD557200AD2ED7 /* Screenshot Framer */,
 				CDFF69941FD827B800E652EE /* Screenshot FramerTests */,
 				CD9395551FF6AC6D00D3D831 /* Screenshot-Framer-CLI */,
+				CDDB614C226F30A50053DEDE /* Version */,
 			);
 		};
 /* End PBXProject section */
@@ -477,7 +513,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Swift Lint\n(exec ./.tools/SwiftLint/swiftlint)";
+			shellScript = "# Swift Lint\n(exec ./.tools/SwiftLint/swiftlint)\n";
 		};
 		CDAEE1FC1FED46EE00F4B1BA /* Swift Lint */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -493,6 +529,24 @@
 			shellPath = /bin/sh;
 			shellScript = "# Swift Lint\n(exec ./.tools/SwiftLint/swiftlint)\n";
 		};
+		CDDB6154226F30E70053DEDE /* Copy Version from Git to Source */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Version from Git to Source";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "#!/bin/sh\n\n# This script drives autorevision so that you end up with two\n# `autorevision.h` files; one for including in the program and one for\n# populating values in the `info.plist` file (some of which are user\n# visible).\n# This script is meant to called from within Xcode, some of the\n# variables are defined in the environment there.\n\n# Config\nexport PATH=${PATH}:/sw/bin:/usr/local/bin:/usr/local/git/bin\n\n# Autorevision Path\nautorevisionPath=\"${SRCROOT}/autorevision-1.21/autorevision.sh\"\n\n# Swift output\nswiftOutput=\"${SRCROOT}/Screenshot Framer CLI/autorevision.swift\"\n\n# Output the swift file\n$autorevisionPath -t swift > \"${swiftOutput}\"\n\n\n\n# Info.plist output\ninfoPlistOutput=\"${SRCROOT}/Screenshot Framer/Supporting Files/autorevision.h\"\n\n# Output the info plist file\n$autorevisionPath -t h > \"${infoPlistOutput}\"\n\n\n\n# Finished\nexit ${?}\n";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -534,6 +588,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CDE4190A226F46A700316B68 /* autorevision.swift in Sources */,
 				CD9395601FF6AEAB00D3D831 /* Controller.swift in Sources */,
 				CD9395611FF6B1BF00D3D831 /* LayerState.swift in Sources */,
 				CDD324612266E73100D0D6CF /* VerticallyCenteredTextFieldCell.swift in Sources */,
@@ -571,6 +626,16 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		CD6B0737226F4CB900DDCC2E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = CDDB614C226F30A50053DEDE /* Version */;
+			targetProxy = CD6B0736226F4CB900DDCC2E /* PBXContainerItemProxy */;
+		};
+		CD6B0739226F52A900DDCC2E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = CDDB614C226F30A50053DEDE /* Version */;
+			targetProxy = CD6B0738226F52A900DDCC2E /* PBXContainerItemProxy */;
+		};
 		CDFF699B1FD827B800E652EE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = CD5EE03B1FCD557200AD2ED7 /* Screenshot Framer */;
@@ -719,6 +784,9 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "Screenshot Framer/Supporting Files/Info.plist";
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
+				INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/Screenshot Framer/Supporting Files/autorevision.h";
+				INFOPLIST_PREPROCESS = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ideasoncanvas.ScreenshotFramer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -736,6 +804,9 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "Screenshot Framer/Supporting Files/Info.plist";
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
+				INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/Screenshot Framer/Supporting Files/autorevision.h";
+				INFOPLIST_PREPROCESS = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ideasoncanvas.ScreenshotFramer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -747,34 +818,46 @@
 		CD93955A1FF6AC6D00D3D831 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = W6L39UYL6Z;
+				CODE_SIGN_IDENTITY = "";
+				DEVELOPMENT_TEAM = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
 		CD93955B1FF6AC6D00D3D831 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = W6L39UYL6Z;
+				CODE_SIGN_IDENTITY = "";
+				DEVELOPMENT_TEAM = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
+		CDDB614E226F30A60053DEDE /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		CDDB614F226F30A60053DEDE /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
 		CDFF699C1FD827B800E652EE /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = W6L39UYL6Z;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "Screenshot Framer Tests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ideasoncanvas.FrameMeTests;
@@ -788,9 +871,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = W6L39UYL6Z;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "Screenshot Framer Tests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ideasoncanvas.FrameMeTests;
@@ -830,6 +913,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		CDDB614D226F30A60053DEDE /* Build configuration list for PBXAggregateTarget "Version" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				CDDB614E226F30A60053DEDE /* Debug */,
+				CDDB614F226F30A60053DEDE /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		CDFF699E1FD827B800E652EE /* Build configuration list for PBXNativeTarget "Screenshot FramerTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

Screenshot Framer.xcodeproj/xcshareddata/xcschemes/Screenshot-Framer-CLI.xcscheme

@@ -61,6 +61,12 @@
             ReferencedContainer = "container:Screenshot Framer.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-v"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

Screenshot Framer/Supporting Files/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="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -669,12 +669,6 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="v53-rj-mvJ"/>
-                            <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"/>
-                                </connections>
-                            </menuItem>
                             <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
                                 <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                 <connections>
@@ -723,10 +717,5 @@
                 </menuItem>
             </items>
         </menu>
-        <menuItem title="Zoom To Fit" keyEquivalent="0" id="OeK-11-pA2">
-            <connections>
-                <action selector="zoomToFit:" target="-1" id="r12-xp-acm"/>
-            </connections>
-        </menuItem>
     </objects>
 </document>

Screenshot Framer/Supporting Files/Info.plist

@@ -40,9 +40,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>VCS_TAG</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>VCS_SHORT_HASH</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

autorevision-1.21/AUTHORS.txt

@@ -0,0 +1,15 @@
+dak180 <dak180@users.sourceforge.net>
+Eric S. Raymond <esr@thyrsus.com>
+Paul Wise <pabs3@bonedaddy.net>
+Mike Swanson <mikeonthecomputer@gmail.com>
+Dmitry Marakasov <amdmi3@amdmi3.ru>
+Vlad <vlad@v-lad.org>
+Dennis Biringer <github@biringer.org>
+allevo <tomallevi@gmail.com>
+Qiuwen Lu <luqiuwen@gmail.com>
+Jérôme Pouiller <jezz@sysmic.org>
+Joel C. Salomon <joelcsalomon@gmail.com>
+yuanchuan <yuanchuan23@gmail.com>
+vagrant <vagrant>
+Robert Wenner <robert@port25.com>
+Hironori Ichimiya <hiron@hironytic.com>