Merge pull request #4 from USThing/swift-4

Upgrade to swift 4 and fix related issues

Author: Coledunsby

CDCodabarView.swift

@@ -39,10 +39,10 @@ public final class CDCodabarView: UIView {
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.alignment = .center
 
-        let attributes: [String: Any] = [
-            NSFontAttributeName: font,
-            NSForegroundColorAttributeName: textColor,
-            NSParagraphStyleAttributeName: paragraphStyle,
+        let attributes: [NSAttributedStringKey: Any] = [
+            NSAttributedStringKey.font: font,
+            NSAttributedStringKey.foregroundColor: textColor,
+            NSAttributedStringKey.paragraphStyle: paragraphStyle,
         ]
 
         guard let encoder = encoder else {
@@ -51,7 +51,7 @@ public final class CDCodabarView: UIView {
             let textSize = text.boundingRect(
                 with: CGSize(width: bounds.size.width, height: CGFloat.greatestFiniteMagnitude),
                 options: [.truncatesLastVisibleLine, .usesLineFragmentOrigin],
-                attributes: [NSFontAttributeName: font],
+                attributes: [NSAttributedStringKey.font: font],
                 context: nil
             )
 
@@ -69,7 +69,7 @@ public final class CDCodabarView: UIView {
         let labelHeight = ceil(code.boundingRect(
             with: CGSize(width: bounds.size.width, height: CGFloat.greatestFiniteMagnitude),
             options: [.truncatesLastVisibleLine, .usesLineFragmentOrigin],
-            attributes: [NSFontAttributeName: font],
+            attributes: [NSAttributedStringKey.font: font],
             context: nil).height)
         let barHeight = bounds.size.height - (hideCode ? 0 : labelHeight + padding)
         let sequence = encoder.sequence()

CDCodabarViewExample.xcodeproj/project.pbxproj

@@ -153,13 +153,14 @@
 					2092DBCF1E9BC1B300B735A5 = {
 						CreatedOnToolsVersion = 8.3;
 						DevelopmentTeam = B3YTJ78KXJ;
+						LastSwiftMigration = 0940;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = JU6JS2KXPW;
-						LastSwiftMigration = 0810;
+						LastSwiftMigration = 0940;
 					};
 				};
 			};
@@ -248,7 +249,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.appunite.CDCodabarViewTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CDCodabarView_Example.app/CDCodabarView_Example";
 			};
 			name = Debug;
@@ -266,7 +268,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.appunite.CDCodabarViewTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CDCodabarView_Example.app/CDCodabarView_Example";
 			};
 			name = Release;
@@ -370,7 +373,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.jcdigital.CDCodabarViewExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -385,7 +389,8 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jcdigital.CDCodabarViewExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -399,6 +404,7 @@
 				2092DBD91E9BC1B300B735A5 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "CDCodabarViewExample" */ = {
 			isa = XCConfigurationList;

CDCodabarViewExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

CDCodabarViewTests/EncoderSpecs.swift

@@ -13,47 +13,48 @@ import XCTest
 class CDCodabarViewTests: XCTestCase {
 
     func testThatZeroLetterCodeIsInvalid() {
-        let encoder = CDCodabarEncoder(code: "")
+        let encoder = try? CDCodabarEncoder(code: "")
         XCTAssertNil(encoder)
     }
 
     func testThat1LetterCodeIsInvalid() {
-        let encoder = CDCodabarEncoder(code: "A")
+        let encoder = try? CDCodabarEncoder(code: "A")
         XCTAssertNil(encoder)
     }
 
     func testThat2LettersCodeIsInvalid() {
-        let encoder = CDCodabarEncoder(code: "A0")
+        let encoder = try? CDCodabarEncoder(code: "A0")
         XCTAssertNil(encoder)
     }
 
     func testThat3LettersCodeIsValid() {
-        let encoder = CDCodabarEncoder(code: "A0B")
+        let encoder = try? CDCodabarEncoder(code: "A0B")
         XCTAssertNotNil(encoder)
     }
 
     func testThat17LettersCodeIsInvalid() {
-        let encoder = CDCodabarEncoder(code: "A000000000000000B")
+        let encoder = try? CDCodabarEncoder(code: "A000000000000000B")
         XCTAssertNil(encoder)
     }
 
     func testThatCodeWithWrongStartLetterIsInvalid() {
-        let encoder = CDCodabarEncoder(code: "E00000000000B")
+        let encoder = try? CDCodabarEncoder(code: "E00000000000B")
         XCTAssertNil(encoder)
     }
 
     func testThatCodeWithWrongStopLetterIsInvalid() {
-        let encoder = CDCodabarEncoder(code: "A00000000000E")
+        let encoder = try? CDCodabarEncoder(code: "A00000000000E")
         XCTAssertNil(encoder)
     }
 
     func testThreeCodeWithUnsupportedCharacterIsInvalid() {
-        let encoder = CDCodabarEncoder(code: "A!B")
+        let encoder = try? CDCodabarEncoder(code: "A!B")
         XCTAssertNil(encoder)
     }
 
     func testExampleSequance() {
-        let encoder = CDCodabarEncoder(code: "A012B")
+        let encoder = try? CDCodabarEncoder(code: "A012B")
+        XCTAssertNotNil(encoder)
         XCTAssertEqual(encoder!.sequence(), [
             1, 0, 1, 1, 0, 0, 1, 0, 0, 1,
             0,