Add swiftlint and solve first warnings

Author: sebastianvarela

DeviceIdentificator.xcodeproj/project.pbxproj

@@ -125,6 +125,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = E2A3650A200D104900668DF9 /* Build configuration list for PBXNativeTarget "DeviceIdentificator" */;
 			buildPhases = (
+				E20BA6072138AFCB005BA13B /* Swiftlint */,
 				E2A364F1200D104900668DF9 /* Sources */,
 				E2A364F2200D104900668DF9 /* Frameworks */,
 				E2A364F3200D104900668DF9 /* Headers */,
@@ -195,6 +196,23 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		E20BA6072138AFCB005BA13B /* Swiftlint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = Swiftlint;
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, run: brew install swiftlint\"\nfi";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		E256651C212614270061CCF7 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

Source/UIDeviceExtensions.swift

@@ -18,12 +18,12 @@ public extension UIDevice {
 
         return parseDeviceModel(identifier)
     }
-    
+
     @objc
     var deviceModelName: NSString {
         return deviceModel.name as NSString
     }
-    
+
     @objc
     var isSimulator: Bool {
         switch deviceModel {
@@ -33,7 +33,7 @@ public extension UIDevice {
             return false
         }
     }
-    
+
     @objc
     public var isIpad: Bool {
         return deviceModel.name.contains("iPad")
@@ -136,15 +136,15 @@ public enum DeviceModel {
         case .iPadSimulator: return "iPad Simulator"
         case .iPhoneSimulator: return "iPhone Simulator"
 
-        case .iPhoneUnknown(let id): return "Unknown iPhone (\(id))"
-        case .iPadUnknown(let id): return "Unknown iPad (\(id))"
-        case .iPodUnknown(let id): return "Unknown iPod (\(id))"
-        case .unknown(let id): return "Unknown iOS device (\(id))"
+        case .iPhoneUnknown(let model): return "Unknown iPhone (\(model))"
+        case .iPadUnknown(let model): return "Unknown iPad (\(model))"
+        case .iPodUnknown(let model): return "Unknown iPod (\(model))"
+        case .unknown(let model): return "Unknown iOS device (\(model))"
         }
     }
 }
 
-fileprivate func parseDeviceModel(_ identifier: String) -> DeviceModel {
+private func parseDeviceModel(_ identifier: String) -> DeviceModel {
 
     if identifier == "i386" || identifier == "x86_64" {
         let smallerScreen = UIScreen.main.bounds.size.width < 768

Tests/DeviceIdentificatorTests.swift

@@ -11,7 +11,7 @@ class DeviceIdentificatorTests: XCTestCase {
             XCTAssertFalse(UIDevice.current.isSimulator)
         #endif
     }
-    
+
     func testIsIpad() {
         switch UI_USER_INTERFACE_IDIOM() {
         case .pad: