Merge pull request #155 from homebysix/1.2.1

v1.2.1
homebysix · Dec 21, 2019 · 2cca100 · 2cca100
2 parents a876deb + 038ab21
commit 2cca100
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 43 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.3.0
+  rev: v2.4.0
   hooks:
   - id: check-added-large-files
     args: [--maxkb=100]
@@ -13,16 +13,16 @@ repos:
   - id: trailing-whitespace
     args: [--markdown-linebreak-ext=md]
 - repo: https://github.com/python/black
-  rev: 19.3b0
+  rev: 19.10b0
   hooks:
   - id: black
     language_version: python3.7
 - repo: https://github.com/asottile/blacken-docs
-  rev: v1.3.0
+  rev: v1.4.0
   hooks:
   - id: blacken-docs
     additional_dependencies: [black==19.3b0]
 - repo: https://github.com/homebysix/pre-commit-macadmin
-  rev: v1.5.1
+  rev: v1.5.2
   hooks:
   - id: check-plists
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,20 @@
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [1.2.1] - 2019-12-21
+
+### Fixed
+- Resolved Xcode signing issue that resulted in "damaged" warning upon launching Recipe Robot 1.2.0. (#154)
+
+### Changed
+- Various automatic syntax updates to align with Swift 5.
+
+
 ## [1.2.0] - 2019-12-15
 
+### Known Issue
+- Issue with Xcode signing may result in Gatekeeper showing "app is damaged" warning upon launch. Fixed in v1.2.1.
+
 ### Added
 - Recipe Robot can now create recipes for basic non-app bundles (e.g. prefpane, plugin) contained in zip or dmg downloads.
 - A warning will be displayed if the "content-type" header of downloaded files seems unusual.
@@ -238,7 +250,8 @@ All notable changes to this project will be documented in this file. This projec
 
 - Initial public release of Recipe Robot (beta).
 
-[Unreleased]: https://github.com/homebysix/recipe-robot/compare/v1.2.0...HEAD
+[Unreleased]: https://github.com/homebysix/recipe-robot/compare/v1.2.1...HEAD
+[1.2.1]: https://github.com/homebysix/recipe-robot/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/homebysix/recipe-robot/compare/v1.1.2...v1.2.0
 [1.1.2]: https://github.com/homebysix/recipe-robot/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/homebysix/recipe-robot/compare/v1.1.0...v1.1.1

diff --git a/app/Recipe Robot.xcodeproj/project.pbxproj b/app/Recipe Robot.xcodeproj/project.pbxproj
@@ -251,7 +251,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1130;
 				ORGANIZATIONNAME = "Elliot Jordan";
 				TargetAttributes = {
 					8B42AC7D1B5C5BEC0058A814 = {
@@ -260,7 +260,7 @@
 					};
 					8B42AC8D1B5C5BEC0058A814 = {
 						CreatedOnToolsVersion = 6.3.2;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1130;
 						TestTargetID = 8B42AC7D1B5C5BEC0058A814;
 					};
 				};
@@ -387,6 +387,7 @@
 			baseConfigurationReference = D5416420220E96EC00A886AF /* Project-Debug.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CODE_SIGN_IDENTITY = "";
 			};
 			name = Debug;
 		};
@@ -395,6 +396,7 @@
 			baseConfigurationReference = D541641B220E96EC00A886AF /* Project-Release.xcconfig */;
 			buildSettings = {
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CODE_SIGN_IDENTITY = "";
 				SWIFT_COMPILATION_MODE = wholemodule;
 			};
 			name = Release;
@@ -403,6 +405,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D541641C220E96EC00A886AF /* Recipe Robot-Debug.xcconfig */;
 			buildSettings = {
+				CURRENT_PROJECT_VERSION = 1038;
+				MARKETING_VERSION = 1.2.1;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.elliotjordan.recipe-robot";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
@@ -411,6 +416,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D541641D220E96EC00A886AF /* Recipe Robot-Release.xcconfig */;
 			buildSettings = {
+				CURRENT_PROJECT_VERSION = 1038;
+				MARKETING_VERSION = 1.2.1;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.elliotjordan.recipe-robot";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
@@ -419,13 +427,15 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D5416418220E96EC00A886AF /* Recipe RobotTests-Debug.xcconfig */;
 			buildSettings = {
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		8B42AC9D1B5C5BEC0058A814 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D541641E220E96EC00A886AF /* Recipe RobotTests-Release.xcconfig */;
 			buildSettings = {
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/app/Recipe Robot.xcodeproj/xcshareddata/xcschemes/Recipe Robot - Debug.xcscheme b/app/Recipe Robot.xcodeproj/xcshareddata/xcschemes/Recipe Robot - Debug.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Recipe Robot.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Recipe Robot.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/app/Recipe Robot.xcodeproj/xcshareddata/xcschemes/Recipe Robot - Release.xcscheme b/app/Recipe Robot.xcodeproj/xcshareddata/xcschemes/Recipe Robot - Release.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Recipe Robot.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Recipe Robot.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/app/Recipe Robot.xcodeproj/xcuserdata/elliot.xcuserdatad/xcschemes/Recipe Robot.xcscheme b/app/Recipe Robot.xcodeproj/xcuserdata/elliot.xcuserdatad/xcschemes/Recipe Robot.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8B42AC7D1B5C5BEC0058A814"
+            BuildableName = "Recipe Robot.app"
+            BlueprintName = "Recipe Robot"
+            ReferencedContainer = "container:Recipe Robot.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -53,17 +62,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8B42AC7D1B5C5BEC0058A814"
-            BuildableName = "Recipe Robot.app"
-            BlueprintName = "Recipe Robot"
-            ReferencedContainer = "container:Recipe Robot.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -85,8 +83,6 @@
             ReferencedContainer = "container:Recipe Robot.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/app/Recipe Robot/Info.plist b/app/Recipe Robot/Info.plist
@@ -9,19 +9,19 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.elliotjordan.recipe-robot</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>RRBT</string>
 	<key>CFBundleVersion</key>
-	<string>1037</string>
+	<string>1041</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/scripts/recipe_robot_lib/FoundationPlist/FoundationPlist.py b/scripts/recipe_robot_lib/FoundationPlist/FoundationPlist.py
@@ -79,7 +79,11 @@ def readPlist(filepath):
     (which is usually a dictionary).
     """
     plistData = NSData.dataWithContentsOfFile_(filepath)
-    dataObject, dummy_plistFormat, error = NSPropertyListSerialization.propertyListFromData_mutabilityOption_format_errorDescription_(
+    (
+        dataObject,
+        dummy_plistFormat,
+        error,
+    ) = NSPropertyListSerialization.propertyListFromData_mutabilityOption_format_errorDescription_(
         plistData, NSPropertyListMutableContainers, None, None
     )
     if dataObject is None:
@@ -99,7 +103,11 @@ def readPlistFromString(data):
         plistData = buffer(data)
     except TypeError as err:
         raise NSPropertyListSerializationException(err)
-    dataObject, dummy_plistFormat, error = NSPropertyListSerialization.propertyListFromData_mutabilityOption_format_errorDescription_(
+    (
+        dataObject,
+        dummy_plistFormat,
+        error,
+    ) = NSPropertyListSerialization.propertyListFromData_mutabilityOption_format_errorDescription_(
         plistData, NSPropertyListMutableContainers, None, None
     )
     if dataObject is None:
@@ -116,7 +124,10 @@ def writePlist(dataObject, filepath):
     """
     Write 'rootObject' as a plist to filepath.
     """
-    plistData, error = NSPropertyListSerialization.dataFromPropertyList_format_errorDescription_(
+    (
+        plistData,
+        error,
+    ) = NSPropertyListSerialization.dataFromPropertyList_format_errorDescription_(
         dataObject, NSPropertyListXMLFormat_v1_0, None
     )
     if plistData is None:
@@ -136,7 +147,10 @@ def writePlist(dataObject, filepath):
 
 def writePlistToString(rootObject):
     """Return 'rootObject' as a plist-formatted string."""
-    plistData, error = NSPropertyListSerialization.dataFromPropertyList_format_errorDescription_(
+    (
+        plistData,
+        error,
+    ) = NSPropertyListSerialization.dataFromPropertyList_format_errorDescription_(
         rootObject, NSPropertyListXMLFormat_v1_0, None
     )
     if plistData is None:

diff --git a/scripts/recipe_robot_lib/tools.py b/scripts/recipe_robot_lib/tools.py
@@ -55,7 +55,7 @@
     import plistlib as FoundationPlist
 
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 ENDC = "\033[0m"
 PREFS_FILE = os.path.expanduser(
     "~/Library/Preferences/com.elliotjordan.recipe-robot.plist"