Merge pull request #10 from yannickl/swift3

Update to Swift 3

.travis.yml

@@ -1,13 +1,11 @@
 language: objective-c
-osx_image: xcode7.1
-branches:
-  only:
-    - master
+osx_image: xcode8
 before_install:
   - gem install xcpretty
 script:
-  - set -o pipefail
-  - xcodebuild -project Example/DynamicColorExample.xcodeproj -scheme iOSTests -sdk iphonesimulator -destination "id=74B65E5F-38DA-42D9-AD99-1DF06695DC54" -configuration Release ONLY_ACTIVE_ARCH=YES test | xcpretty -c
-  - xcodebuild -project Example/DynamicColorExample.xcodeproj -scheme OSXTests -sdk macosx -configuration Release ONLY_ACTIVE_ARCH=YES test | xcpretty -c
+  - cd Examples
+  - xcodebuild -version
+  - xcodebuild -project DynamicColorExample.xcodeproj -scheme iOSTests -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6" -configuration Release GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES ONLY_ACTIVE_ARCH=YES test | xcpretty -c
+  - xcodebuild -project DynamicColorExample.xcodeproj -scheme OSXTests -sdk macosx -configuration Release GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES ONLY_ACTIVE_ARCH=YES test | xcpretty -c
 after_success:
   - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Change log
 
+## [Version 3.0.0](https://github.com/yannickl/DynamicColor/releases/tag/3.0.0)
+*Released on 2016-06-14.*
+
+- Swift 3 Supports
+- `isLight` instead of `isLightColor`
+- `adjustedAlpha` instead of `adjustedAlphaColor`
+- `inverted` instead of `invertColor`
+- `grayscaled` instead of `grayscaledColor`
+- `darkened` instead of `darkerColor`
+- `lighter` instead of `lighterColor`
+- `saturated` instead of `saturatedColor`
+- `desaturated` instead of `desaturatedColor`
+- `complemented` instead of `complementColor`
+- `adjustedHue` instead of `adjustedHueColor`
+- `tinted` instead of `tintColor`
+- `shaded` instead of `shadeColor`
+- `mixed` instead of `mixWithColor`
+- Removing the `darkenColor`, use `darkened` instead
+- Removing the `lightenColor`, use `lighter` instead
+- Removing the `saturateColor`, use `saturated` instead
+- Removing the `desaturateColor`, use `desaturated` instead
+
 ## [Version 2.4.0](https://github.com/yannickl/DynamicColor/releases/tag/2.4.0)
 *Released on 2016-02-29.*
 

DynamicColor.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'DynamicColor'
-  s.version          = '2.4.0'
+  s.version          = '3.0.0'
   s.license          = 'MIT'
   s.summary          = 'Yet another extension to manipulate colors easily in Swift'
   s.homepage         = 'https://github.com/yannickl/DynamicColor.git'

Example/DynamicColor/Info.plist → Examples/DynamicColor/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.0</string>
+	<string>3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/DynamicColorExample.xcodeproj/project.pbxproj → Examples/DynamicColorExample.xcodeproj/project.pbxproj

@@ -376,24 +376,27 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Yannick LORIOT";
 				TargetAttributes = {
 					CECBCD801B2B6C5E0047E731 = {
 						CreatedOnToolsVersion = 6.3.2;
+						LastSwiftMigration = 0800;
 					};
 					CECBCD8A1B2B6C5E0047E731 = {
 						CreatedOnToolsVersion = 6.3.2;
 						TestTargetID = CEFBDADA1B1CE38D000E6F30;
 					};
 					CEE753C91BF105E3001FF6ED = {
 						CreatedOnToolsVersion = 7.1;
+						LastSwiftMigration = 0800;
 					};
 					CEEB28CE1BE27340001A74E8 = {
 						CreatedOnToolsVersion = 7.1;
 					};
 					CEFBDADA1B1CE38D000E6F30 = {
 						CreatedOnToolsVersion = 6.3.2;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -585,6 +588,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yannickloriot.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -606,6 +610,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yannickloriot.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -645,6 +651,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yannickloriot.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DynamicColorExample.app/DynamicColorExample";
 			};
 			name = Release;
@@ -663,6 +670,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.OSXTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -679,6 +687,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.OSXTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -708,6 +718,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.TVExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -802,24 +813,27 @@
 		CEFBDAFB1B1CE38D000E6F30 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/iOSExample/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yannickloriot.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = DynamicColorExample;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		CEFBDAFC1B1CE38D000E6F30 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/iOSExample/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yannickloriot.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = DynamicColorExample;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

Example/DynamicColorExample.xcodeproj/xcshareddata/xcschemes/DynamicColor.xcscheme → Examples/DynamicColorExample.xcodeproj/xcshareddata/xcschemes/DynamicColor.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/DynamicColorExample.xcodeproj/xcshareddata/xcschemes/OSXTests.xcscheme → Examples/DynamicColorExample.xcodeproj/xcshareddata/xcschemes/OSXTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/DynamicColorExample.xcodeproj/xcshareddata/xcschemes/iOSTests.xcscheme → Examples/DynamicColorExample.xcodeproj/xcshareddata/xcschemes/iOSTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"