Update to Swift 5 and clear up build warnings

Author: theoriginalbit

Source/UIDevice+deviceModel.swift

@@ -9,9 +9,7 @@
 import UIKit
 
 public extension UIDevice {
-    
-    public var deviceModel: UIDeviceModel {
+    var deviceModel: UIDeviceModel {
         return UIDeviceModel.current
     }
-    
 }

Source/UIDeviceModel.swift

@@ -27,7 +27,7 @@ public enum UIDeviceModel {
     case iPadMini2
     case iPadMini3
     case iPadMini4
-    
+
     /// Also known as iPhone 2G
     case iPhone
     case iPhone3G
@@ -50,44 +50,40 @@ public enum UIDeviceModel {
     case iPhoneXS
     case iPhoneXSMax
     case iPhoneXR
-    
+
     case iPodTouch
     case iPodTouch2
     case iPodTouch3
     case iPodTouch4
     case iPodTouch5
     case iPodTouch6
-    
+
     indirect case simulator(UIDeviceModel)
     /// Device is not yet known or implemented
     case unknown(String)
-    
 }
 
 public extension UIDeviceModel {
-    
-    public var unwrapIfSimulator: UIDeviceModel {
+    var unwrapIfSimulator: UIDeviceModel {
         return UIDeviceModel.unwrapIfSimulator(self)
     }
-    
-    static private func unwrapIfSimulator(_ device: UIDeviceModel) -> UIDeviceModel {
+
+    private static func unwrapIfSimulator(_ device: UIDeviceModel) -> UIDeviceModel {
         if case let .simulator(model) = device {
             return model
         }
         return device
     }
-    
 }
 
 // MARK: - Mapping from Identifier
 
 extension UIDeviceModel {
-    
     static var current: UIDeviceModel {
         return mapToDevice(identifier: identifier)
     }
-    
-    static private var identifier: String = {
+
+    private static var identifier: String = {
         var systemInfo = utsname()
         uname(&systemInfo)
         let mirror = Mirror(reflecting: systemInfo.machine)
@@ -97,8 +93,8 @@ extension UIDeviceModel {
         }
         return identifier
     }()
-    
-    static private func mapToDevice(identifier: String) -> UIDeviceModel {
+
+    private static func mapToDevice(identifier: String) -> UIDeviceModel {
         switch identifier {
         case "iPad1,1": return .iPad
         case "iPad2,1", "iPad2,2", "iPad2,3", "iPad2,4": return .iPad2
@@ -118,7 +114,7 @@ extension UIDeviceModel {
         case "iPad7,5", "iPad7,6": return .iPad6
         case "iPad8,1", "iPad8,2", "iPad8,3", "iPad8,4": return .iPadPro11Inch
         case "iPad8,5", "iPad8,6", "iPad8,7", "iPad8,8": return .iPadPro12Inch3
-        
+
         case "iPhone1,1": return .iPhone
         case "iPhone1,2": return .iPhone3G
         case "iPhone2,1": return .iPhone3GS
@@ -140,18 +136,16 @@ extension UIDeviceModel {
         case "iPhone11,2": return .iPhoneXS
         case "iPhone11,4", "iPhone11,6": return .iPhoneXSMax
         case "iPhone11,8": return .iPhoneXR
-        
+
         case "iPod1,1": return .iPodTouch
         case "iPod2,1": return .iPodTouch2
         case "iPod3,1": return .iPodTouch3
         case "iPod4,1": return .iPodTouch4
         case "iPod5,1": return .iPodTouch5
         case "iPod7,1": return .iPodTouch6
-        
+
         case "i386", "x86_64": return .simulator(mapToDevice(identifier: ProcessInfo().environment["SIMULATOR_MODEL_IDENTIFIER"] ?? "iOS"))
         default: return .unknown(identifier)
         }
     }
-    
 }
-

UIDeviceModel.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                        = "UIDeviceModel"
-  s.version                     = "1.1.0"
+  s.version                     = "2.0.0"
   s.summary                     = "A µframework to detect the device model."
   s.description                 = <<-DESC
                                     A µframework to detect the device model provided through an extension of UIDevice. It also allows detection of the simulator and the device model it is simulating.
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
 
   s.source                      = { :git => "https://github.com/theoriginalbit/UIDeviceModel.git", :tag => "#{s.version}" }
   s.source_files                = "Source", "Source/**/*.{h,swift}"
-  s.swift_version               = "4.2" 
+  s.swift_version               = "5.0" 
 end

UIDeviceModel.xcodeproj/project.pbxproj

@@ -115,7 +115,7 @@
 				TargetAttributes = {
 					237B01AC216CCD9C00816AC8 = {
 						CreatedOnToolsVersion = 10.0;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -125,6 +125,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 237B01A3216CCD9C00816AC8;
 			productRefGroup = 237B01AE216CCD9C00816AC8 /* Products */;
@@ -302,7 +303,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -327,7 +328,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.theoriginalbit.UIDeviceModel;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;