chore: carthage update

acheronfail · Nov 8, 2018 · cc66611 · cc66611
1 parent 9af7f76
commit cc66611
Show file tree

Hide file tree

Showing 24 changed files with 129 additions and 120 deletions.
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "SwiftyJSON/SwiftyJSON" "4.1.0"
+github "SwiftyJSON/SwiftyJSON" "4.2.0"
 github "acheronfail/MASShortcut" "2.3.6-custom"
 github "emaloney/CleanroomLogger" "6.0.2"
-github "sindresorhus/LaunchAtLogin" "v2.1.0"
-github "tmandry/AXSwift" "0.2.1"
+github "sindresorhus/LaunchAtLogin" "v2.4.0"
+github "tmandry/AXSwift" "0.2.2"
diff --git a/Carthage/Checkouts/AXSwift/AXSwift.podspec b/Carthage/Checkouts/AXSwift/AXSwift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'AXSwift'
-  s.version          = '0.2.1'
+  s.version          = '0.2.2'
   s.summary          = 'Swift wrapper for Mac accessibility APIs'
 
   s.description      = <<-DESC

diff --git a/Carthage/Checkouts/AXSwift/AXSwift.xcodeproj/project.pbxproj b/Carthage/Checkouts/AXSwift/AXSwift.xcodeproj/project.pbxproj
@@ -216,7 +216,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "Tyler Mandry";
 				TargetAttributes = {
 					2F32C6831BD42D5000AD4419 = {
@@ -340,12 +340,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -394,12 +396,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

diff --git a/Carthage/Checkouts/AXSwift/AXSwift.xcodeproj/xcshareddata/xcschemes/AXSwift.xcscheme b/Carthage/Checkouts/AXSwift/AXSwift.xcodeproj/xcshareddata/xcschemes/AXSwift.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Carthage/Checkouts/AXSwift/Package.swift b/Carthage/Checkouts/AXSwift/Package.swift
diff --git a/Carthage/Checkouts/AXSwift/README.md b/Carthage/Checkouts/AXSwift/README.md
@@ -13,6 +13,9 @@ That's up to you!
 
 ## Using AXSwift
 
+Swift package manager (SPM) is not supported, because it cannot build libraries
+and applications that depend on Cocoa.
+
 ### Carthage
 In your Cartfile:
 ```

diff --git a/Carthage/Checkouts/AXSwift/Sources/Application.swift b/Carthage/Checkouts/AXSwift/Sources/Application.swift
@@ -38,7 +38,7 @@ public final class Application: UIElement {
         let runningApps = NSWorkspace.shared.runningApplications
         return runningApps
             .filter({ $0.activationPolicy != .prohibited })
-            .flatMap({ Application($0) })
+            .compactMap({ Application($0) })
     }
 
     /// Creates an `Application` for every running instance of the given `bundleID`.
@@ -47,7 +47,7 @@ public final class Application: UIElement {
         let runningApps = NSWorkspace.shared.runningApplications
         return runningApps
             .filter({ $0.bundleIdentifier == bundleID })
-            .flatMap({ Application($0) })
+            .compactMap({ Application($0) })
     }
 
     /// Creates an `Observer` on this application, if it is still alive.

diff --git a/Carthage/Checkouts/AXSwift/Sources/UIElement.swift b/Carthage/Checkouts/AXSwift/Sources/UIElement.swift
@@ -81,7 +81,7 @@ open class UIElement {
         for attr in attrs where Attribute(rawValue: attr) == nil {
             print("Unrecognized attribute: \(attr)")
         }
-        return attrs.flatMap({ Attribute(rawValue: $0) })
+        return attrs.compactMap({ Attribute(rawValue: $0) })
     }
 
     // This version is named differently so the caller doesn't have to specify the return type when
@@ -365,7 +365,7 @@ open class UIElement {
     /// Parameterized attributes are attributes that require parameters to retrieve. For example,
     /// the cell contents of a spreadsheet might require the row and column of the cell you want.
     open func parameterizedAttributes() throws -> [Attribute] {
-        return try parameterizedAttributesAsStrings().flatMap({ Attribute(rawValue: $0) })
+        return try parameterizedAttributesAsStrings().compactMap({ Attribute(rawValue: $0) })
     }
 
     open func parameterizedAttributesAsStrings() throws -> [String] {
@@ -478,7 +478,7 @@ open class UIElement {
 
     /// Returns a list of actions that can be performed on the element.
     open func actions() throws -> [Action] {
-        return try actionsAsStrings().flatMap({ Action(rawValue: $0) })
+        return try actionsAsStrings().compactMap({ Action(rawValue: $0) })
     }
 
     open func actionsAsStrings() throws -> [String] {

diff --git a/Carthage/Checkouts/LaunchAtLogin/.gitattributes b/Carthage/Checkouts/LaunchAtLogin/.gitattributes
@@ -1,2 +1 @@
-* text=auto
-*.swift text eol=lf
+* text=auto eol=lf
diff --git a/Carthage/Checkouts/LaunchAtLogin/LaunchAtLogin.podspec b/Carthage/Checkouts/LaunchAtLogin/LaunchAtLogin.podspec
@@ -0,0 +1,14 @@
+Pod::Spec.new do |s|
+	s.name = 'LaunchAtLogin'
+	s.version = '2.4.0'
+	s.summary = 'Add "Launch at Login" functionality to your sandboxed macOS app in seconds'
+	s.license = 'MIT'
+	s.homepage = 'https://github.com/sindresorhus/LaunchAtLogin'
+	s.social_media_url = 'https://twitter.com/sindresorhus'
+	s.authors = { 'Sindre Sorhus' => 'sindresorhus@gmail.com' }
+	s.source = { :git => 'https://github.com/sindresorhus/LaunchAtLogin.git', :tag => "v#{s.version}" }
+	s.source_files = 'LaunchAtLogin', 'LaunchAtLoginHelper'
+	s.resource = 'LaunchAtLogin/copy-helper.sh'
+	s.swift_version = '4.2'
+	s.platform = :macos, '10.12'
+end
diff --git a/Carthage/Checkouts/LaunchAtLogin/LaunchAtLogin.xcodeproj/project.pbxproj b/Carthage/Checkouts/LaunchAtLogin/LaunchAtLogin.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -32,8 +32,8 @@
 		E32E9B741EB87EA3000FEEE9 /* LaunchAtLoginHelper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LaunchAtLoginHelper.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E32E9B761EB87EA3000FEEE9 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = main.swift; sourceTree = "<group>"; usesTabs = 1; };
 		E32E9B7F1EB87EA3000FEEE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		E32E9B831EB87F57000FEEE9 /* LaunchAtLoginHelper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LaunchAtLoginHelper.entitlements; sourceTree = "<group>"; };
 		E32E9B921EB889AE000FEEE9 /* copy-helper.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; lineEnding = 0; path = "copy-helper.sh"; sourceTree = "<group>"; usesTabs = 1; };
+		E3B8C38A20C0003300272EC0 /* LaunchAtLoginHelper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LaunchAtLoginHelper.entitlements; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -89,7 +89,7 @@
 			children = (
 				E32E9B761EB87EA3000FEEE9 /* main.swift */,
 				E32E9B7F1EB87EA3000FEEE9 /* Info.plist */,
-				E32E9B831EB87F57000FEEE9 /* LaunchAtLoginHelper.entitlements */,
+				E3B8C38A20C0003300272EC0 /* LaunchAtLoginHelper.entitlements */,
 			);
 			path = LaunchAtLoginHelper;
 			sourceTree = "<group>";
@@ -151,17 +151,20 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "Sindre Sorhus";
 				TargetAttributes = {
 					E32E9B621EB87D7B000FEEE9 = {
 						CreatedOnToolsVersion = 8.3.2;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = "";
 					};
 					E32E9B731EB87EA3000FEEE9 = {
 						CreatedOnToolsVersion = 8.3.2;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = "";
 						SystemCapabilities = {
+							com.apple.HardenedRuntime = {
+								enabled = 1;
+							};
 							com.apple.Sandbox = {
 								enabled = 1;
 							};
@@ -170,7 +173,7 @@
 				};
 			};
 			buildConfigurationList = E32E9B5D1EB87D7B000FEEE9 /* Build configuration list for PBXProject "LaunchAtLogin" */;
-			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 10.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -265,7 +268,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -328,7 +331,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -357,7 +360,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
@@ -379,16 +382,15 @@
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = singlefile;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
 		E32E9B6D1EB87D7B000FEEE9 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
@@ -408,8 +410,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -421,6 +422,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = YG56YK5RN5;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = LaunchAtLoginHelper/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -430,8 +432,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -443,6 +444,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = YG56YK5RN5;
+				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = LaunchAtLoginHelper/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -452,8 +454,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/...kouts/LaunchAtLogin/LaunchAtLogin.xcodeproj/xcshareddata/xcschemes/LaunchAtLogin.xcscheme b/...kouts/LaunchAtLogin/LaunchAtLogin.xcodeproj/xcshareddata/xcschemes/LaunchAtLogin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...LaunchAtLogin/LaunchAtLogin.xcodeproj/xcshareddata/xcschemes/LaunchAtLoginHelper.xcscheme b/...LaunchAtLogin/LaunchAtLogin.xcodeproj/xcshareddata/xcschemes/LaunchAtLoginHelper.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Carthage/Checkouts/LaunchAtLogin/LaunchAtLogin/Info.plist b/Carthage/Checkouts/LaunchAtLogin/LaunchAtLogin/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -15,12 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>MIT © Sindre Sorhus</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
 </dict>
 </plist>
diff --git a/Carthage/Checkouts/LaunchAtLogin/LaunchAtLogin/copy-helper.sh b/Carthage/Checkouts/LaunchAtLogin/LaunchAtLogin/copy-helper.sh
@@ -13,5 +13,5 @@ codesign --force --entitlements="$CODE_SIGN_ENTITLEMENTS" --sign="$EXPANDED_CODE
 
 if [[ $CONFIGURATION == "Release" ]]; then
 	rm -rf "$origin_helper_path"
-	rm "$(dirname $origin_helper_path)/copy-helper.sh"
+	rm "$(dirname "$origin_helper_path")/copy-helper.sh"
 fi
diff --git a/Carthage/Checkouts/LaunchAtLogin/LaunchAtLoginHelper/Info.plist b/Carthage/Checkouts/LaunchAtLogin/LaunchAtLoginHelper/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

diff --git a/Carthage/Checkouts/LaunchAtLogin/before-after.md b/Carthage/Checkouts/LaunchAtLogin/before-after.md
@@ -0,0 +1,21 @@
+# Before and after
+
+With `LaunchAtLogin`, you only have to do 2 steps instead of 13!
+
+```diff
+-  1. Create a new target that will be the helper app that launches your app
+-  2. Set `LSBackgroundOnly` to true in the `Info.plist` file
+-  3. Set `Skip Install` to `YES` in the build settings for the helper app
+-  4. Enable sandboxing for the helper app
+-  5. Add a new `Copy Files` build phase to the main app
+-  6. Select `Wrapper` as destination
+-  7. Enter `Contents/Library/LoginItems` as subpath
+-  8. Add the helper build product to the build phase
+-  9. Copy-paste some boilerplate code into the helper app
+- 10. Remember to replace `bundleid.of.main.app` and `MainExectuableName` with your own values
+- 11. Copy-paste some code to register the helper app into your main app
+- 12. Make sure the main app and helper app use the same code signing certificate
+- 13. Manually verify that you did everything correctly
++  1. Install this package
++  2. Add a new "Run Script Phase"
+```