Merge branch 'release/0.7.0'

Bernard Gatt · Bernard Gatt · commit 422c065877fe · 2017-11-07T00:24:32.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,8 @@ language: objective-c
 
 xcode_project: StyleKit.xcodeproj
 xcode_scheme: StyleKit
-osx_image: xcode8.3
-xcode_sdk: macosx10.11
+osx_image: xcode9.1
+xcode_sdk: macosx10.13
 
 script:
-  - xcodebuild clean build test -project StyleKit.xcodeproj -scheme StyleKit -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.3'
+  - xcodebuild clean build test -project StyleKit.xcodeproj -scheme StyleKit -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.1'
diff --git a/README.md b/README.md
@@ -154,16 +154,15 @@ The levels of logging are:
 
 #### Carthage
 
-##### Swift 2.2 & 2.3
+##### Swift 3
 
 ```ogdl
-github "146BC/StyleKit" ~> 0.4
+github "146BC/StyleKit" ~> 0.6
 ```
-
-##### Swift 3
+##### Swift 4
 
 ```ogdl
-github "146BC/StyleKit" ~> 0.6
+github "146BC/StyleKit" ~> 0.7
 ```
 
 #### CocoaPods
@@ -175,14 +174,14 @@ source 'https://github.com/146BC/Specs.git'
 source 'https://github.com/CocoaPods/Specs.git'
 ```
 
-##### Swift 2.2 & 2.3
+##### Swift 3
 
 ```ruby
-pod 'StyleKit', '~> 0.4'
+pod 'StyleKit', '~> 0.6'
 ```
 
-##### Swift 3
+##### Swift 4
 
 ```ruby
-pod 'StyleKit', '~> 0.6'
-```
+pod 'StyleKit', '~> 0.7'
+```
diff --git a/StyleKit.xcodeproj/project.pbxproj b/StyleKit.xcodeproj/project.pbxproj
@@ -293,20 +293,21 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0910;
 				ORGANIZATIONNAME = "Bernard Gatt";
 				TargetAttributes = {
 					A100097B1DB02AF300C761CC = {
 						CreatedOnToolsVersion = 8.0;
+						LastSwiftMigration = 0910;
 						ProvisioningStyle = Automatic;
 					};
 					A10FD6991D53FA2600341EDD = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0910;
 					};
 					A10FD6A31D53FA2600341EDD = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0910;
 						TestTargetID = A100097B1DB02AF300C761CC;
 					};
 				};
@@ -428,7 +429,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = OneFourSixBC.StyleKitTestsHost;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -443,7 +445,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = OneFourSixBC.StyleKitTestsHost;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -456,14 +459,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -510,14 +519,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -569,7 +584,8 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -592,30 +608,35 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
 		A10FD6B21D53FA2600341EDD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = StyleKitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = BernardGatt.StyleKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StyleKitTestsHost.app/StyleKitTestsHost";
 			};
 			name = Debug;
 		};
 		A10FD6B31D53FA2600341EDD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = StyleKitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = BernardGatt.StyleKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StyleKitTestsHost.app/StyleKitTestsHost";
 			};
 			name = Release;
diff --git a/StyleKit.xcodeproj/xcshareddata/xcschemes/StyleKit.xcscheme b/StyleKit.xcodeproj/xcshareddata/xcschemes/StyleKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0910"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/StyleKit/Helpers/ColorHelper.swift b/StyleKit/Helpers/ColorHelper.swift
@@ -6,7 +6,7 @@ public struct ColorHelper {
         
         do {
             let colorRegex = try NSRegularExpression(pattern: "^#[0-9a-f]{8}|#[0-9a-f]{6}|#[0-9a-f]{3}$", options: .caseInsensitive)
-            let validColor = colorRegex.firstMatch(in: color, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, color.characters.count)) != nil
+            let validColor = colorRegex.firstMatch(in: color, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, color.count)) != nil
             if validColor {
                 return UIColor(hexString: color)
             } else {
diff --git a/StyleKit/Info.plist b/StyleKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.0</string>
+	<string>0.7.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/StyleKit/Utilities/ColorExtensions.swift b/StyleKit/Utilities/ColorExtensions.swift
@@ -5,7 +5,7 @@ extension UIColor {
         var int = UInt32()
         Scanner(string: hex).scanHexInt32(&int)
         let a, r, g, b: UInt32
-        switch hex.characters.count {
+        switch hex.count {
         case 3: // RGB (12-bit)
             (a, r, g, b) = (255, (int >> 8) * 17, (int >> 4 & 0xF) * 17, (int & 0xF) * 17)
         case 6: // RGB (24-bit)
@@ -20,6 +20,6 @@ extension UIColor {
     }
     
     func getNSForegroundColorAttribute() -> [String:UIColor] {
-        return [NSForegroundColorAttributeName:self]
+        return [NSAttributedStringKey.foregroundColor.rawValue:self]
     }
 }
diff --git a/StyleKit/Utilities/SKTryCatch.h b/StyleKit/Utilities/SKTryCatch.h
@@ -6,7 +6,7 @@
 /**
  Provides try catch functionality for swift by wrapping around Objective-C
  */
-+ (void)tryBlock:(void(^)())tryBlock catchBlock:(void(^)(NSException*exception))catchBlock finallyBlock:(void(^)())finallyBlock;
++ (void)tryBlock:(void(^)(void))tryBlock catchBlock:(void(^)(NSException*exception))catchBlock finallyBlock:(void(^)(void))finallyBlock;
 + (void)throwString:(NSString*)s;
 + (void)throwException:(NSException*)e;
 @end
diff --git a/StyleKit/Utilities/SKTryCatch.m b/StyleKit/Utilities/SKTryCatch.m
@@ -6,7 +6,7 @@ @implementation SKTryCatch
 /**
  Provides try catch functionality for swift by wrapping around Objective-C
  */
-+ (void)tryBlock:(void(^)())tryBlock catchBlock:(void(^)(NSException*exception))catchBlock finallyBlock:(void(^)())finallyBlock {
++ (void)tryBlock:(void(^)(void))tryBlock catchBlock:(void(^)(NSException*exception))catchBlock finallyBlock:(void(^)(void))finallyBlock {
     @try {
         tryBlock ? tryBlock() : nil;
     }
diff --git a/StyleKit/Utilities/StringExtensions.swift b/StyleKit/Utilities/StringExtensions.swift
@@ -1,7 +1,7 @@
 extension String {
     func capitalizeFirstLetter() -> String {
-        let first = String(characters.prefix(1)).capitalized
-        let other = String(characters.dropFirst())
+        let first = String(prefix(1)).capitalized
+        let other = String(dropFirst())
         return first + other
     }
 }
diff --git a/StyleKitDemo/StyleKitDemo.xcodeproj/project.pbxproj b/StyleKitDemo/StyleKitDemo.xcodeproj/project.pbxproj
@@ -156,12 +156,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0910;
 				ORGANIZATIONNAME = "Bernard Gatt";
 				TargetAttributes = {
 					A104CDFF1D57DCD500626F2A = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0910;
 					};
 				};
 			};
@@ -244,14 +244,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -293,14 +299,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -335,7 +347,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = OneFourSixBC.StyleKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -347,7 +360,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = OneFourSixBC.StyleKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/StyleKitDemo/StyleKitDemo/CustomViews/SKButton.swift b/StyleKitDemo/StyleKitDemo/CustomViews/SKButton.swift
@@ -16,11 +16,13 @@ class SKButton: UIButton {
             updateBackgroundColorForState(state)
         }
     }
-    
+
+    @objc
     func setTransparency(_ alpha: NSNumber) {
         self.alpha = CGFloat(alpha.floatValue) / 100.0
     }
-    
+
+    @objc
     func setBackgroundColor(_ color: UIColor, forState state: UIControlState) {
         backgroundColors[state.rawValue] = color
         
diff --git a/StyleKitDemo/StyleKitDemo/CustomViews/SKLabel.swift b/StyleKitDemo/StyleKitDemo/CustomViews/SKLabel.swift
@@ -3,7 +3,7 @@ import UIKit
 
 class SKLabel: UILabel {
     
-    var padding: [CGFloat] = [0,0,0,0]
+    @objc dynamic var padding: [CGFloat] = [0,0,0,0]
     
     override func drawText(in rect: CGRect) {
         let insets = UIEdgeInsets.init(top: padding[0], left: padding[1], bottom: padding[2], right: padding[3])
diff --git a/StyleKitTests/StyleTests.swift b/StyleKitTests/StyleTests.swift
@@ -59,13 +59,13 @@ class StyleTests: XCTestCase {
         // UINavigationBar
         XCTAssertEqual(navigationBar.tintColor, UIColor(hexString: "#000"))
         
-        if let navigationBarColor = navigationBar.titleTextAttributes?["NSColor"] as? UIColor {
+        if let navigationBarColor = navigationBar.titleTextAttributes?[.foregroundColor] as? UIColor {
             XCTAssertEqual(navigationBarColor, UIColor(hexString: "#FF000000"))
         } else {
             XCTFail("Color not found in navigation")
         }
         
-        if let navigationBarFont = navigationBar.titleTextAttributes?["NSFont"] as? UIFont {
+        if let navigationBarFont = navigationBar.titleTextAttributes?[.font] as? UIFont {
             XCTAssertEqual(navigationBarFont.fontName, "HelveticaNeue-Light")
             XCTAssertEqual(navigationBarFont.pointSize, 18.0)
         } else {
diff --git a/StyleKitTests/UI Extensions/SKButton.swift b/StyleKitTests/UI Extensions/SKButton.swift
diff --git a/StyleKitTests/UI Extensions/SKLabel.swift b/StyleKitTests/UI Extensions/SKLabel.swift

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ extension UIColor {`
`5`	`5`	`var int = UInt32()`
`6`	`6`	`Scanner(string: hex).scanHexInt32(&int)`
`7`	`7`	`let a, r, g, b: UInt32`
`8`		`- switch hex.characters.count {`
	`8`	`+ switch hex.count {`
`9`	`9`	`case 3: // RGB (12-bit)`
`10`	`10`	`(a, r, g, b) = (255, (int >> 8) * 17, (int >> 4 & 0xF) * 17, (int & 0xF) * 17)`
`11`	`11`	`case 6: // RGB (24-bit)`
`@@ -20,6 +20,6 @@ extension UIColor {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func getNSForegroundColorAttribute() -> [String:UIColor] {`
`23`		`- return [NSForegroundColorAttributeName:self]`
	`23`	`+ return [NSAttributedStringKey.foregroundColor.rawValue:self]`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ @implementation SKTryCatch`
`6`	`6`	`/**`
`7`	`7`	`Provides try catch functionality for swift by wrapping around Objective-C`
`8`	`8`	`*/`
`9`		`-+ (void)tryBlock:(void(^)())tryBlock catchBlock:(void(^)(NSException*exception))catchBlock finallyBlock:(void(^)())finallyBlock {`
	`9`	`++ (void)tryBlock:(void(^)(void))tryBlock catchBlock:(void(^)(NSException*exception))catchBlock finallyBlock:(void(^)(void))finallyBlock {`
`10`	`10`	`@try {`
`11`	`11`	`tryBlock ? tryBlock() : nil;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`extension String {`
`2`	`2`	`func capitalizeFirstLetter() -> String {`
`3`		`- let first = String(characters.prefix(1)).capitalized`
`4`		`- let other = String(characters.dropFirst())`
	`3`	`+ let first = String(prefix(1)).capitalized`
	`4`	`+ let other = String(dropFirst())`
`5`	`5`	`return first + other`
`6`	`6`	`}`
`7`	`7`	`}`