version: 1.3.1

chore: carthage update and codesign application
chore: use an entirely legit method to call some pointers
2019-02-19 09:49:26 +11:00 · 2019-02-19 09:43:09 +11:00 · 2019-02-19 09:01:16 +11:00 · 2019-02-18 19:23:11 +11:00 · 2019-02-18 19:21:49 +11:00 · 2019-02-18 19:17:37 +11:00
68 changed files with 1059 additions and 210 deletions
@@ -1,4 +1,4 @@
-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 "sindresorhus/LaunchAtLogin" "v2.5.0"
@@ -1,2 +1 @@
-* text=auto
-*.swift text eol=lf
+* text=auto eol=lf
@@ -0,0 +1,14 @@
+Pod::Spec.new do |s|
+	s.name = 'LaunchAtLogin'
+	s.version = '2.5.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
@@ -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,8 +382,7 @@
 				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;
 		};
@@ -388,7 +390,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;
@@ -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;
 		};
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -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.5.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>
@@ -9,9 +9,14 @@ mkdir -p "$helper_dir"
 cp -rf "$origin_helper_path" "$helper_dir/"

 defaults write "$helper_path/Contents/Info" CFBundleIdentifier -string "$PRODUCT_BUNDLE_IDENTIFIER-LaunchAtLoginHelper"
-codesign --force --entitlements="$CODE_SIGN_ENTITLEMENTS" --sign="$EXPANDED_CODE_SIGN_IDENTITY_NAME" "$helper_path"
+
+if [[ -n $CODE_SIGN_ENTITLEMENTS ]]; then
+	codesign --force --entitlements="$CODE_SIGN_ENTITLEMENTS" --options=runtime --sign="$EXPANDED_CODE_SIGN_IDENTITY_NAME" "$helper_path"
+else
+	codesign --force --options=runtime --sign="$EXPANDED_CODE_SIGN_IDENTITY_NAME" "$helper_path"
+fi

 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
@@ -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>
@@ -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"
+```
@@ -1,45 +1,35 @@
 # LaunchAtLogin

-> Add "Launch at Login" functionality to your sandboxed macOS app in seconds
+> Add "Launch at Login" functionality to your macOS app in seconds

-It's usually quite a convoluted and error-prone process to add this. **No more!**
+It's usually quite a [convoluted and error-prone process](before-after.md) to add this. **No more!**

-```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"
-```
+This package works with both sandboxed and non-sandboxed apps and it's App Store compatible and used in my [Lungo](https://blog.sindresorhus.com/lungo-b364a6c2745f) and [Battery Indicator](https://sindresorhus.com/battery-indicator) apps.

-It's App Store compatible and used in my [Lungo](https://blog.sindresorhus.com/lungo-b364a6c2745f) and [Battery Indicator](https://sindresorhus.com/battery-indicator) app.
-
-You might also find my [`create-dmg`](https://github.com/sindresorhus/create-dmg) project useful.
+*You might also find my [`create-dmg`](https://github.com/sindresorhus/create-dmg) project useful if you're publishing your app outside the App Store.*


 ## Requirements

 - macOS 10.12+
- Xcode 9.3+
- Swift 4.1+
+- Xcode 10+
+- Swift 4.2+


-## Install with [Carthage](https://github.com/Carthage/Carthage#getting-started)
+## Install
+
+#### Carthage

 ```
 github "sindresorhus/LaunchAtLogin"
 ```

+#### CocoaPods
+
+```ruby
+pod 'LaunchAtLogin'
+```
+
 <a href="https://www.patreon.com/sindresorhus">
 	<img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" width="160">
 </a>
@@ -49,8 +39,16 @@ github "sindresorhus/LaunchAtLogin"

 Add a new ["Run Script Phase"](http://stackoverflow.com/a/39633955/64949) below "Embed Frameworks" in "Build Phases" with the following:

+Carthage:
+
 ```sh
-./Carthage/Build/Mac/LaunchAtLogin.framework/Resources/copy-helper.sh
+"${PROJECT_DIR}/Carthage/Build/Mac/LaunchAtLogin.framework/Resources/copy-helper.sh"
+```
+
+CocoaPods:
+
+```sh
+"${PROJECT_DIR}/Pods/LaunchAtLogin/LaunchAtLogin/copy-helper.sh"
 ```

 Use it in your app:
@@ -77,7 +75,10 @@ The framework bundles the helper app needed to launch your app and copies it int

 ## Related

+- [Defaults](https://github.com/sindresorhus/Defaults) - Swifty and modern UserDefaults
+- [Preferences](https://github.com/sindresorhus/Preferences) - Add a preferences window to your macOS app in minutes
 - [DockProgress](https://github.com/sindresorhus/DockProgress) - Show progress in your app's Dock icon
+- [More…](https://github.com/search?q=user%3Asindresorhus+language%3Aswift)


 ## License
@@ -1 +0,0 @@
-3.0
@@ -1,6 +1,6 @@
 language: objective-c
-osx_image: xcode9.3
-xcode_sdk: iphonesimulator10.0
+osx_image: xcode10
+xcode_sdk: iphonesimulator12.0
 script:
 - set -o pipefail
 - travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON iOS" -destination "platform=iOS Simulator,name=iPhone 6" build-for-testing test | xcpretty
@@ -129,7 +129,7 @@
 				TargetAttributes = {
 					A82A1C1819D926B8009A653D = {
 						CreatedOnToolsVersion = 6.0.1;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0930;
 						ProvisioningStyle = Manual;
 					};
 				};
@@ -313,7 +313,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.swiftyjson.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -328,7 +329,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.swiftyjson.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -24,22 +24,6 @@ import Foundation

 // MARK: - Error
 // swiftlint:disable line_length
-/// Error domain
-@available(*, deprecated, message: "ErrorDomain is deprecated. Use `SwiftyJSONError.errorDomain` instead.", renamed: "SwiftyJSONError.errorDomain")
-public let ErrorDomain: String = "SwiftyJSONErrorDomain"
-
-/// Error code
-@available(*, deprecated, message: "ErrorUnsupportedType is deprecated. Use `SwiftyJSONError.unsupportedType` instead.", renamed: "SwiftyJSONError.unsupportedType")
-public let ErrorUnsupportedType: Int = 999
-@available(*, deprecated, message: "ErrorIndexOutOfBounds is deprecated. Use `SwiftyJSONError.indexOutOfBounds` instead.", renamed: "SwiftyJSONError.indexOutOfBounds")
-public let ErrorIndexOutOfBounds: Int = 900
-@available(*, deprecated, message: "ErrorWrongType is deprecated. Use `SwiftyJSONError.wrongType` instead.", renamed: "SwiftyJSONError.wrongType")
-public let ErrorWrongType: Int = 901
-@available(*, deprecated, message: "ErrorNotExist is deprecated. Use `SwiftyJSONError.notExist` instead.", renamed: "SwiftyJSONError.notExist")
-public let ErrorNotExist: Int = 500
-@available(*, deprecated, message: "ErrorInvalidJSON is deprecated. Use `SwiftyJSONError.invalidJSON` instead.", renamed: "SwiftyJSONError.invalidJSON")
-public let ErrorInvalidJSON: Int = 490
-
 public enum SwiftyJSONError: Int, Swift.Error {
    case unsupportedType = 999
    case indexOutOfBounds = 900
@@ -146,19 +130,6 @@ public struct JSON {
 		}
 	}

-	/**
-	 Creates a JSON from JSON string
-	
-	 - parameter json: Normal json string like '{"a":"b"}'
-	
-	 - returns: The created JSON
-	 */
-    @available(*, deprecated, message: "Use instead `init(parseJSON: )`")
-    public static func parse(_ json: String) -> JSON {
-        return json.data(using: String.Encoding.utf8)
-            .flatMap { try? JSON(data: $0) } ?? JSON(NSNull())
-    }
-
 	/**
 	 Creates a JSON using the object.
 	
@@ -592,14 +563,6 @@ extension JSON: Swift.ExpressibleByArrayLiteral {
    }
 }

-extension JSON: Swift.ExpressibleByNilLiteral {
-
-    @available(*, deprecated, message: "use JSON.null instead. Will be removed in future versions")
-    public init(nilLiteral: ()) {
-        self.init(NSNull() as Any)
-    }
-}
-
 // MARK: - Raw

 extension JSON: Swift.RawRepresentable {
@@ -1,15 +1,16 @@
 Pod::Spec.new do |s|
  s.name        = "SwiftyJSON"
-  s.version     = "4.1.0"
+  s.version     = "4.2.0"
  s.summary     = "SwiftyJSON makes it easy to deal with JSON data in Swift"
  s.homepage    = "https://github.com/SwiftyJSON/SwiftyJSON"
  s.license     = { :type => "MIT" }
  s.authors     = { "lingoer" => "lingoerer@gmail.com", "tangplin" => "tangplin@gmail.com" }

  s.requires_arc = true
+  s.swift_version = "4.2"
  s.osx.deployment_target = "10.9"
  s.ios.deployment_target = "8.0"
-  s.watchos.deployment_target = "2.0"
+  s.watchos.deployment_target = "3.0"
  s.tvos.deployment_target = "9.0"
  s.source   = { :git => "https://github.com/SwiftyJSON/SwiftyJSON.git", :tag => s.version }
  s.source_files = "Source/*.swift"
@@ -471,14 +471,17 @@
 						TestTargetID = 2E4FEFDA19575BE100351305;
 					};
 					7236B4EC1BAC14150020529B = {
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					9C7DFC5A1A9102BD005AA3F7 = {
 						CreatedOnToolsVersion = 6.1.1;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					9C7DFC641A9102BD005AA3F7 = {
 						CreatedOnToolsVersion = 6.1.1;
+						LastSwiftMigration = 1000;
 					};
 					A81D162B1E5743B000C62C5F = {
 						CreatedOnToolsVersion = 8.2.1;
@@ -486,8 +489,10 @@
 					};
 					A8580F731BCF5C5B00DA927B = {
 						CreatedOnToolsVersion = 7.1;
+						LastSwiftMigration = 1000;
 					};
 					E4D7CCDE1B9465A700EE7221 = {
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -936,6 +941,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -961,6 +967,7 @@
 				PRODUCT_NAME = SwiftyJSON;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -993,6 +1000,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1019,6 +1027,7 @@
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1041,6 +1050,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1059,6 +1069,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.swiftyjson.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1092,6 +1103,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Debug;
@@ -1110,6 +1122,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.tangplin.SwiftyJSON-tvOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
+				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Release;
@@ -1136,8 +1149,9 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "watchsimulator watchos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
@@ -1162,8 +1176,9 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "watchsimulator watchos";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};
@@ -127,7 +127,7 @@ class PerformanceTests: XCTestCase {
        self.measure {
            autoreleasepool {
                if let dictionary = json.dictionary {
-                    XCTAssertTrue(dictionary.count > 0)
+                    XCTAssertTrue(dictionary.count == 100001)
                } else {
                    XCTFail("dictionary should not be nil")
                }
@@ -1,21 +1,674 @@
-MIT License
+GNU GENERAL PUBLIC LICENSE
+                      Version 3, 29 June 2007

-Copyright (c) 2018 acheronfail
+ Copyright (C) 2007 Free Software Foundation, Inc. {http://fsf.org/}
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see {http://www.gnu.org/licenses/}.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {{project}}  Copyright (C) {{year}}  {{fullname}}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+{http://www.gnu.org/licenses/}.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+{http://www.gnu.org/philosophy/why-not-lgpl.html}.
@@ -37,6 +37,7 @@
 		BAA17B7A20B14CC100625455 /* MASShortcut.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BAA17B7220B14CC100625455 /* MASShortcut.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		BAA17B7C20B14CEB00625455 /* SwiftyJSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BAA17B7B20B14CEB00625455 /* SwiftyJSON.framework */; };
 		BAA17B7D20B14CEB00625455 /* SwiftyJSON.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BAA17B7B20B14CEB00625455 /* SwiftyJSON.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		BAB6F14F221ABB3500EA11D4 /* ShowAndHideCursor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB6F14E221ABB3500EA11D4 /* ShowAndHideCursor.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -100,6 +101,7 @@
 		BAA17B7120B14CC000625455 /* CleanroomLogger.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CleanroomLogger.framework; path = Carthage/Build/Mac/CleanroomLogger.framework; sourceTree = "<group>"; };
 		BAA17B7220B14CC100625455 /* MASShortcut.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MASShortcut.framework; path = Carthage/Build/Mac/MASShortcut.framework; sourceTree = "<group>"; };
 		BAA17B7B20B14CEB00625455 /* SwiftyJSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftyJSON.framework; path = Carthage/Build/Mac/SwiftyJSON.framework; sourceTree = "<group>"; };
+		BAB6F14E221ABB3500EA11D4 /* ShowAndHideCursor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowAndHideCursor.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -178,6 +180,7 @@
 				15493F6620BE6E0F007B2BA5 /* CGImage.swift */,
 				BA74C13420A6F1BE00306B27 /* ShowAndHideCursor.h */,
 				BA74C13220A6F16C00306B27 /* ShowAndHideCursor.m */,
+				BAB6F14E221ABB3500EA11D4 /* ShowAndHideCursor.swift */,
 				BA71817320AE2DCC00619700 /* PPMenuShortcutView.h */,
 				BA71817120AE2DB400619700 /* PPMenuShortcutView.m */,
 				B3B4C2C01E25894B009F8E4E /* AppDelegate.swift */,
@@ -262,7 +265,7 @@
 					};
 					B3B4C2BC1E25894B009F8E4E = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = UNR5C68RPX;
+						DevelopmentTeam = 8FUFLLHWE9;
 						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
@@ -320,7 +323,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "./Carthage/Build/Mac/LaunchAtLogin.framework/Resources/copy-helper.sh";
+			shellScript = "\"${PROJECT_DIR}/Carthage/Build/Mac/LaunchAtLogin.framework/Resources/copy-helper.sh\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */

@@ -349,6 +352,7 @@
 				BA74C13120A6E95900306B27 /* PPOverlayPanel.swift in Sources */,
 				BA74C14020AA390400306B27 /* PPOverlayPreview.swift in Sources */,
 				BA74C14420AA609500306B27 /* PPOverlayWrapper.swift in Sources */,
+				BAB6F14F221ABB3500EA11D4 /* ShowAndHideCursor.swift in Sources */,
 				BA74C0F820A692D100306B27 /* PPOverlayController.swift in Sources */,
 				15493F6720BE6E0F007B2BA5 /* CGImage.swift in Sources */,
 				BA74C14220AA409D00306B27 /* NSColor.swift in Sources */,
@@ -544,10 +548,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = UNR5C68RPX;
+				DEVELOPMENT_TEAM = 8FUFLLHWE9;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
@@ -569,10 +573,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = UNR5C68RPX;
+				DEVELOPMENT_TEAM = 8FUFLLHWE9;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac",
@@ -29,6 +29,15 @@ let focusModifiers: [(String, NSEvent.ModifierFlags)] = [
    ("⇧ Shift ", .shift)
 ]

+// The available status item images that the user may pick from.
+let statusItemImages: [(String, String)] =  [
+    ("Magnifying Glass (Default)", "icon-default"),
+    ("Palette", "icon-palette"),
+    ("Dropper", "icon-dropper"),
+    ("Magnifying Glass Dropper", "icon-mag-dropper"),
+    ("Magnifying Glass Dropper Flat", "icon-mag-dropper-flat")
+]
+
 extension AppDelegate: NSMenuDelegate {
    // Unregister the activating shortcut when the menu is opened/closed so it can't be called when
    // setting a new shortcut. Also start a run loop observer so we know when the modifierFlags have
@@ -75,11 +84,12 @@ extension AppDelegate: NSMenuDelegate {
        contextMenu.removeAllItems()

        let pickItem = contextMenu.addItem(withTitle: "Pick a pixel!", action: #selector(showPicker), keyEquivalent: "")
-        pickItem.image = ICON
+        pickItem.image = PPState.shared.statusItemImage(withName: PPState.shared.statusItemImageName)

        buildRecentPicks()

        contextMenu.addItem(.separator())
+        buildAppIconMenu()
        buildShowGridMenu()
        buildColorSpaceItem()
        buildColorFormatsMenu()
@@ -87,6 +97,7 @@ extension AppDelegate: NSMenuDelegate {
        buildFocusModeModifierMenu()
        buildFloatPrecisionSlider()
        buildShortcutMenuItem()
+        buildUseUppercaseItem()
        buildLaunchAtLoginItem()

        contextMenu.addItem(.separator())
@@ -94,6 +105,27 @@ extension AppDelegate: NSMenuDelegate {
        contextMenu.addItem(withTitle: "Quit \(APP_NAME)", action: #selector(quitApplication), keyEquivalent: "")
    }

+    // Choose the status item icon.
+    private func buildAppIconMenu() {
+        let submenu = NSMenu()
+        for (name, imageName) in statusItemImages {
+            let item = submenu.addItem(withTitle: name, action: #selector(selectAppIcon(_:)), keyEquivalent: "")
+            item.representedObject = imageName
+            item.state = PPState.shared.statusItemImageName == imageName ? .on : .off
+            item.image = PPState.shared.statusItemImage(withName: imageName)
+        }
+
+        let item = contextMenu.addItem(withTitle: "App Icon", action: nil, keyEquivalent: "")
+        item.submenu = submenu
+    }
+
+    @objc private func selectAppIcon(_ sender: NSMenuItem) {
+        if let imageName = sender.representedObject as? String {
+            menuBarItem.image = PPState.shared.statusItemImage(withName: imageName)
+            PPState.shared.statusItemImageName = imageName
+        }
+    }
+
    // Choose whether to always draw a grid, never draw one, or only draw one when in focus mode.
    private func buildShowGridMenu() {
        let submenu = NSMenu()
@@ -154,6 +186,16 @@ extension AppDelegate: NSMenuDelegate {
        }
    }

+    // Format hex colors to uppercase.
+    private func buildUseUppercaseItem() {
+        let item = contextMenu.addItem(withTitle: "Uppercase Hex Digits", action: #selector(setUseUppercase(_:)), keyEquivalent: "")
+        item.state = PPState.shared.useUppercase ? .on : .off
+    }
+
+    @objc private func setUseUppercase(_ sender: NSMenuItem) {
+        PPState.shared.useUppercase = sender.state != .on
+    }
+
    // Simple launch app at login menu item.
    private func buildLaunchAtLoginItem() {
        let item = contextMenu.addItem(withTitle: "Launch \(APP_NAME) at Login", action: #selector(launchAtLogin(_:)), keyEquivalent: "")
@@ -6,9 +6,6 @@
 import MASShortcut
 import CleanroomLogger

-// The app's menu bar item.
-let ICON = setupMenuBarIcon(NSImage(named: NSImage.Name(stringLiteral: "icon")))
-
@NSApplicationMain class AppDelegate: NSObject, NSApplicationDelegate {

    // This controller manages the pixel picker itself.
@@ -38,7 +35,7 @@ let ICON = setupMenuBarIcon(NSImage(named: NSImage.Name(stringLiteral: "icon")))
    func applicationDidFinishLaunching(_ aNotification: Notification) {
        contextMenu.delegate = self

-        menuBarItem.image = ICON
+        menuBarItem.image = PPState.shared.statusItemImage(withName: PPState.shared.statusItemImageName)
        menuBarItem.action = #selector(onMenuClick)
        menuBarItem.sendAction(on: [.leftMouseUp, .rightMouseUp])

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "dropper.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "dropper-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "dropper-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper_flat.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper_flat-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper_flat-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mag_dropper-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "palette.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "palette-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "palette-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.3.1</string>
 	<key>CFBundleVersion</key>
-	<string>8</string>
+	<string>11</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
@@ -48,6 +48,7 @@ enum PPColor: String, CaseIterable {
    case cssRgba                   = "CSS RGBA"
    case cssHsl                    = "CSS HSL"
    case cssHsla                   = "CSS HSLA"
+    case dart                      = "Dart / Flutter"
    case swiftNSColorRgb           = "Swift NSColor RGB"
    case swiftNSColorDeviceRgb     = "Swift NSColor Device RGB"
    case swiftNSColorCalibratedRgb = "Swift NSColor Calibrated RGB"
@@ -87,6 +88,7 @@ enum PPColor: String, CaseIterable {
        case .cssRgba:                   return self.formatAs8Bit(c, "rgba(%u, %u, %u, 1)")
        case .cssHsl:                    return self.formatAsHSL(c, "hsl(%u, %u%%, %u%%)")
        case .cssHsla:                   return self.formatAsHSL(c, "hsla(%u, %u%%, %u%%, 1)")
+        case .dart:                      return self.formatAsHex(c, "ff%06x", prefix: "const Color(0x", suffix: ")")
        case .swiftNSColorRgb:           return self.formatAsDecimal(c, f("NSColor(red: %f, green: %f, blue: %f, alpha: 1.000)"), .rgb)
        case .swiftNSColorDeviceRgb:     return self.formatAsDecimal(c, f("NSColor(deviceRed: %f, green: %f, blue: %f, alpha: 1.000)"), .rgb)
        case .swiftNSColorCalibratedRgb: return self.formatAsDecimal(c, f("NSColor(calibratedRed: %f, green: %f, blue: %f, alpha: 1.000)"), .rgb)
@@ -107,8 +109,8 @@ enum PPColor: String, CaseIterable {
        case .javaRgba:                  return self.formatAs8Bit(c, "new Color(%u, %u, %u, 255)")
        case .androidRgb:                return self.formatAs8Bit(c, "Color.rgb(%u, %u, %u)")
        case .androidArgb:               return self.formatAs8Bit(c, "Color.argb(255, %u, %u, %u)")
-        case .androidXmlRgb:             return self.formatAsHex(c, "<color name=\"color_name\">#%06x</color>")
-        case .androidXmlArgb:            return self.formatAsHex(c, "<color name=\"color_name\">#ff%06x</color>")
+        case .androidXmlRgb:             return self.formatAsHex(c, "#%06x", prefix: "<color name=\"color_name\">", suffix: "</color>")
+        case .androidXmlArgb:            return self.formatAsHex(c, "#ff%06x", prefix: "<color name=\"color_name\">", suffix: "</color>")
        case .cgColorRgb:                return self.formatAsDecimal(c, f("CGColorCreateGenericRGB(%f, %f, %f, 1.000)"), .rgb)
        case .openGlRgb:                 return self.formatAsDecimal(c, f("glColor3f(%f, %f, %f)"), .rgb)
        case .openGlRgba:                return self.formatAsDecimal(c, f("glColor4f(%f, %f, %f, 1.000)"), .rgb)
@@ -121,6 +123,7 @@ enum PPColor: String, CaseIterable {
        switch self {
        // Hexadecimal-like formats.
        case .cssHex:                    fallthrough
+        case .dart:                      fallthrough
        case .androidXmlRgb:             fallthrough
        case .androidXmlArgb:            fallthrough
        case .cgColorRgb:                fallthrough
@@ -192,11 +195,12 @@ enum PPColor: String, CaseIterable {
    }

    // Formats the colors as a hex value, eg: "D3504E".
-    private func formatAsHex(_ color: NSColor, _ template: String) -> String {
+    private func formatAsHex(_ color: NSColor, _ template: String, prefix: String = "", suffix: String = "") -> String {
        let r = min(Int(color.redComponent   * 0x100), 0x0ff) << 16
        let g = min(Int(color.greenComponent * 0x100), 0x0ff) << 8
        let b = min(Int(color.blueComponent  * 0x100), 0x0ff) << 0
-        return String(format: template, (r | g | b))
+        let result = String(format: template, (r | g | b))
+        return prefix + (PPState.shared.useUppercase ? result.uppercased() : result) + suffix
    }

    // Formats the color as decimal values, eg: "0.145, 0.361, 0.722".
@@ -26,6 +26,12 @@ import CleanroomLogger
    // Whether the picker should be square or not.
    var paschaModeEnabled: Bool = false
    
+    // Whether the color format should be uppercased or not.
+    var useUppercase: Bool = false
+    
+    // The chosen icon for the status item (the icon in the menu bar).
+    var statusItemImageName: String = "icon-default"
+
    // The shortcut that activates the pixel picker.
    var activatingShortcut: MASShortcut?

@@ -62,12 +68,23 @@ import CleanroomLogger
        recentPicks.append(color)
    }
    
+    // Returns the chosen image for the Status Item in the menu bar.
+    func statusItemImage(withName name: String) -> NSImage? {
+        if let img = NSImage(named: NSImage.Name(stringLiteral: name)) {
+            return setupMenuBarIcon(img)
+        }
+
+        return setupMenuBarIcon(NSImage(named: NSImage.Name(stringLiteral: "icon-default")))
+    }
+
    /**
     * Below are methods related to saving/loading state from disk.
     */
    
    func resetState() {
        paschaModeEnabled = false
+        useUppercase = false
+        statusItemImageName = "icon-default"
        focusModeModifier = .control
        activatingShortcut = nil
        chosenFormat = .genericHex
@@ -99,6 +116,10 @@ import CleanroomLogger
                switch key {
                case "paschaModeEnabled":
                    paschaModeEnabled = value.bool ?? false
+                case "useUppercase":
+                    useUppercase = value.bool ?? false
+                case "statusItemImageName":
+                    statusItemImageName = value.string ?? "icon-default"
                case "focusModeModifier":
                    focusModeModifier = NSEvent.ModifierFlags(rawValue: value.uInt ?? NSEvent.ModifierFlags.control.rawValue)
                case "activatingShortcut":
@@ -153,6 +174,8 @@ import CleanroomLogger
        
        let json: JSON = [
            "paschaModeEnabled": paschaModeEnabled,
+            "useUppercase": useUppercase,
+            "statusItemImageName": statusItemImageName,
            "focusModeModifier": focusModeModifier.rawValue,
            "activatingShortcut": shortcutData,
            "magnificationLevel": magnificationLevel,
@@ -7,26 +7,8 @@
 #define ShowAndHideCursor_h

 #import <Foundation/Foundation.h>
-#import <ApplicationServices/ApplicationServices.h>

-void ShowCursor(void);
-void HideCursor(void);
-void LogWarning(void);
-
-// We use an undocumented API to hide the cursor even when the application *isn't* active.
-// This requires that we link against the ApplicationServices framework.
-// See:  https://stackoverflow.com/a/3939241/5552584
-// Also: https://github.com/asmagill/hammerspoon_asm.undocumented/blob/master/cursor/CGSConnection.h
-
-// Every application is given a singular connection ID through which it can receieve and manipulate
-// values, state, notifications, events, etc. in the Window Server.
-typedef int CGSConnectionID;
-
-// Associates a value for the given key on the given connection.
-CGError CGSSetConnectionProperty(CGSConnectionID cid, CGSConnectionID targetCID, CFStringRef key, CFTypeRef value);
-
-// Gets the default connection for this process. `CGSMainConnectionID` is just a more modern name.
-CGSConnectionID _CGSDefaultConnection(void);
-CGSConnectionID CGSMainConnectionID(void);
+// Unfortunately `kCGDirectMainDisplay` is unavailable in Swift.
+CGDirectDisplayID kCGDirectMainDisplayGetter(void);

 #endif /* ShowAndHideCursor_h */
@@ -5,35 +5,7 @@

 #include "ShowAndHideCursor.h"

-// Calls to `CGDisplayShowCursor` and `CGDisplayHideCursor` need to be balanced.
-// See https://developer.apple.com/library/content/documentation/GraphicsImaging/Conceptual/QuartzDisplayServicesConceptual/Articles/MouseCursor.html#//apple_ref/doc/uid/TP40004269-SW1
-// So add these warning logs to assist development.
-#ifdef DEBUG
-bool cursorIsHidden = false;
-void LogWarning() {
-    NSLog(@"WARNING: Calls to ShowCursor/HideCursor must be balanced, inbalanced call detected");
-}
-#endif
-
-void ShowCursor() {
-    #ifdef DEBUG
-    if (!cursorIsHidden) LogWarning();
-    cursorIsHidden = false;
-    #endif
-
-    CGDisplayShowCursor(kCGDirectMainDisplay);
-}
-
-void HideCursor() {
-    #ifdef DEBUG
-    if (cursorIsHidden) LogWarning();
-    cursorIsHidden = true;
-    #endif
-
-    CFStringRef propertyString = CFStringCreateWithCString(NULL, "SetsCursorInBackground", kCFStringEncodingUTF8);
-    CGSConnectionID cid = _CGSDefaultConnection();
-    CGSSetConnectionProperty(cid, cid, propertyString, kCFBooleanTrue);
-    CFRelease(propertyString);
-
-    CGDisplayHideCursor(kCGDirectMainDisplay);
+// Unfortunately `kCGDirectMainDisplay` is unavailable in Swift.
+CGDirectDisplayID kCGDirectMainDisplayGetter() {
+    return kCGDirectMainDisplay;
 }
@@ -0,0 +1,78 @@
+import Foundation
+import ApplicationServices
+
+typealias notAPrivateAPI0 = @convention(c) () -> CInt
+typealias notAPrivateAPI1 = @convention(c) (CInt, CInt, CFString, CFTypeRef) -> CGError
+
+// JS: f = (n, s) => `[${[...s].map((x, i) => x.charCodeAt(0) + i + n).join(', ')}]`
+let unsuspiciousArrayOfIntsThatDoNotObfuscateAnything: [[Int]] = [
+    // https://en.wikipedia.org/wiki/Leet
+    [1, 3, 3, 7],
+    // Framework path
+    [84, 123, 118, 120, 106, 115, 54, 84, 114, 108, 125, 109, 127, 135, 62, 86, 131, 115, 128, 121, 140, 133, 137, 131, 140, 73, 92, 140, 141, 138, 136, 131, 130, 150, 140, 147, 147, 121, 140, 154, 159, 147, 142, 145, 160, 92, 149, 162, 146, 159, 152, 171, 164, 168, 162, 103, 122, 170, 171, 168, 166, 161, 160, 180, 170, 177, 177, 151, 170, 184, 189, 177, 172, 175, 190],
+    // _CGSDefaultConnection
+    [97, 70, 75, 88, 74, 108, 110, 106, 127, 119, 128, 80, 125, 125, 126, 118, 117, 135, 125, 132, 132],
+    // CGSSetConnectionProperty
+    [70, 75, 88, 89, 108, 124, 76, 121, 121, 122, 114, 113, 131, 121, 128, 128, 99, 134, 132, 134, 124, 138, 141, 147]
+]
+
+func aFnThatDoesNotObfuscateAnythingAtAll(_ i: Int, _ ints: [Int]) -> String {
+    return String(ints.enumerated().map({ Character(UnicodeScalar($0.element + i - $0.offset + 1)!) }))
+}
+
+let anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs: [UnsafeMutableRawPointer] = {
+    var list = [UnsafeMutableRawPointer]()
+    let aTotallyPublicFrameworkPath = aFnThatDoesNotObfuscateAnythingAtAll(-1, unsuspiciousArrayOfIntsThatDoNotObfuscateAnything[1])
+    if let handle = dlopen(aTotallyPublicFrameworkPath, RTLD_LAZY) {
+        for (i, s) in unsuspiciousArrayOfIntsThatDoNotObfuscateAnything.dropFirst(2).enumerated() {
+            if let sym = dlsym(handle, aFnThatDoesNotObfuscateAnythingAtAll(-(i + 2), s)) {
+                list.append(sym)
+            }
+        }
+        dlclose(handle)
+    }
+    return list
+}()
+
+// Unfortunately, this can't be accessed in Swift. *sigh*
+let kCGDirectMainDisplay = kCGDirectMainDisplayGetter()
+
+// Calls to `CGDisplayShowCursor` and `CGDisplayHideCursor` need to be balanced.
+// See https://developer.apple.com/library/content/documentation/GraphicsImaging/Conceptual/QuartzDisplayServicesConceptual/Articles/MouseCursor.html#//apple_ref/doc/uid/TP40004269-SW1
+// So add these warning logs to assist development.
+var cursorIsHidden = false
+
+// Decrements the hide cursor count, and shows the mouse cursor if the count is 0.
+func ShowCursor() {
+    #if DEBUG
+    if (!cursorIsHidden) {
+        print("WARNING: Calls to ShowCursor/HideCursor must be balanced, inbalanced call detected")
+    }
+    cursorIsHidden = false
+    #endif
+
+    CGDisplayShowCursor(kCGDirectMainDisplay);
+}
+
+// Hides the mouse cursor, and increments the hide cursor count.
+// Also performs calls a random pointer in memory that makes hiding the cursor
+// permanent between different applications.
+func HideCursor() {
+    #if DEBUG
+    if (cursorIsHidden) {
+        print("WARNING: Calls to ShowCursor/HideCursor must be balanced, inbalanced call detected")
+    }
+    cursorIsHidden = true
+    #endif
+
+    let cid = unsafeBitCast(anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs[0], to: notAPrivateAPI0.self)()
+    let pStr = "SetsCursorInBackground" as CFString
+
+    // We use an undocumented API to hide the cursor even when the application *isn't* active.
+    // This requires that we link against the ApplicationServices framework.
+    // See:  https://stackoverflow.com/a/3939241/5552584
+    // Also: https://github.com/asmagill/hammerspoon_asm.undocumented/blob/master/cursor/CGSConnection.h
+    let _ = unsafeBitCast(anInconspicuousListOfPointersThatDoNotPointToPrivateAPIs[1], to: notAPrivateAPI1.self)(cid, cid, pStr, kCFBooleanTrue)
+
+    CGDisplayHideCursor(kCGDirectMainDisplay)
+}
@@ -6,9 +6,9 @@ PixelPicker is like Digital Color Meter, but lives in your menu bar and lets you

 * 📸 Pick *any* pixel on your screen with ease
 * 🔎 Different magnification levels
-* ✏ Multiple color export formats 
+* ✏ Multiple color export formats
 * 🖥 Multi-monitor support
-* 🎨 Supports different color spaces 
+* 🎨 Supports different color spaces
 * ⌨️ Global keyboard shortcut activation
 * 🌄 Customisable preview
 * ✨
@@ -50,7 +50,7 @@ PixelPicker provides some neat options:
    * Choose which modifier activates focus mode. When focus mode is active, the picker zooms even closer in, and your mouse moves slower to help you pick the right pixel.
 * 🔢 **Float Precision**
    * This controls how many digits will come after the decimal point when using float-based color formats.
-* ⌨️ **Picker Shortcut** 
+* ⌨️ **Picker Shortcut**
    * The global keyboard shortcut to use that will activate Pixel Picker.
 * 🚀 **Launch at Login**
    * If this is enabled then PixelPicker will be launched when you log into your computer.
@@ -91,4 +91,4 @@ The process to create build artefacts for this app is extremely simple:

 ## License

-[MIT](./LICENSE)
+[GPLv3](./LICENSE)
@@ -1,13 +0,0 @@
-<svg height='200' width='200'  fill="#000000" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 24 24" xml:space="preserve">
-  <g>
-    <g>
-      <path d="M9.439,18.852c-5.19,0-9.412-4.223-9.412-9.413s4.222-9.412,9.412-9.412s9.413,4.222,9.413,9.412 S14.629,18.852,9.439,18.852z M9.439,1.327c-4.473,0-8.112,3.639-8.112,8.112s3.639,8.112,8.112,8.112s8.112-3.639,8.112-8.112 S13.912,1.327,9.439,1.327z"></path>
-    </g>
-    <g>
-      <path d="M4.99,14.438c-0.169,0-0.337-0.065-0.465-0.196C3.263,12.95,2.568,11.245,2.568,9.44c0-1.836,0.715-3.562,2.013-4.859 c0.254-0.254,0.665-0.254,0.919,0s0.254,0.665,0,0.919C4.447,6.552,3.868,7.951,3.868,9.44c0,1.463,0.564,2.846,1.587,3.894 c0.251,0.257,0.246,0.668-0.011,0.919C5.318,14.377,5.154,14.438,4.99,14.438z"></path>
-    </g>
-    <g>
-      <path d="M23.323,23.974c-0.166,0-0.333-0.063-0.46-0.19l-6.024-6.024c-0.254-0.254-0.254-0.666,0-0.92s0.666-0.254,0.92,0 l6.024,6.024c0.254,0.254,0.254,0.666,0,0.92C23.656,23.91,23.489,23.974,23.323,23.974z"></path>
-    </g>
-  </g>
-</svg>
Author	SHA1	Message	Date
acheronfail	061f29c887	version: 1.3.1	2019-02-19 09:49:26 +11:00
acheronfail	dde01f357d	chore: carthage update and codesign application	2019-02-19 09:43:09 +11:00
acheronfail	b445e0517f	chore: use an entirely legit method to call some pointers	2019-02-19 09:01:16 +11:00
acheronfail	da82de17b4	version: 1.3.0	2019-02-18 19:23:11 +11:00
acheronfail	258b2ce35c	feat: add ability to choose different status item icons (#19 ) * feat: add ability to choose different status item icons	2019-02-18 19:21:49 +11:00
acheronfail	d7d0323911	chore: re-word menu item	2019-02-18 19:17:37 +11:00
Frederik Schweiger	c0d339661c	Add Dart / Flutter support and hex uppercase option (#16 ) feat: dart/flutter support and hex uppercase option	2019-02-18 07:53:48 +11:00
acheronfail	bdffc54f6c	chore: change license from MIT to GPLv3	2018-11-03 09:24:05 +11:00
acheronfail	222ccffb7b	chore: build against macOS 10.14 SDK	2018-11-02 15:52:58 +11:00
acheronfail	0f7f7524a7	chore: update dependencies	2018-11-02 15:52:39 +11:00
acheronfail	20192b6cb2	version 1.2.3	2018-06-06 07:17:38 +10:00