Release

Author: sebastianvarela

DeviceIdentificator.xcodeproj/project.pbxproj

@@ -652,6 +652,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.DeviceIdentificator;
 				SKIP_INSTALL = YES;
@@ -672,6 +673,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.DeviceIdentificator;
 				SKIP_INSTALL = YES;

Source/DeviceModel+Name.swift

@@ -92,9 +92,9 @@ public extension DeviceModel {
         case .appleTV4K2G: return "Apple TV 4K 2G"
         case .appleTV4K3G: return "Apple TV 4K 3G"
 
-        case .iPadSimulator: return "iPad Simulator"
-        case .iPhoneSimulator: return "iPhone Simulator"
-        case .appleTVSimulator: return "Apple TV Simulator"
+        case .iPadSimulator(let model, let arch): return "iPad Simulator (\(model.name) @ \(arch))"
+        case .iPhoneSimulator(let model, let arch): return "iPhone Simulator (\(model.name) @ \(arch))"
+        case .appleTVSimulator(let model, let arch): return "Apple TV Simulator (\(model.name) @ \(arch))"
 
         case .iPhoneUnknown(let model): return "Unknown iPhone (\(model))"
         case .iPadUnknown(let model): return "Unknown iPad (\(model))"

Tests/DeviceModelTests.swift

@@ -12,60 +12,31 @@ public class DeviceModelTests: XCTestCase {
             XCTAssertEqual(DeviceModel(rawValue: model.rawValue), model)
         }
     }
-    /*
-    public func testIsSimulator() {
-        XCTAssertTrue(DeviceModel.iPadSimulator(.iPad1G, arch: "x86").isSimulator)
-        XCTAssertTrue(DeviceModel.iPhoneSimulator(.iPhone6, arch: "x86").isSimulator)
-        XCTAssertFalse(DeviceModel.iPhone6Plus.isSimulator)
-    }
-
-    public func testUnknownSimulator() {
-        let deviceModel32b = DeviceModel(rawValue: "i386")
-        let deviceModel64b = DeviceModel(rawValue: "x86_64")
-
-        switch UI_USER_INTERFACE_IDIOM() {
-        case .pad:
-            XCTAssertEqual(deviceModel32b, .iPadSimulator(.iPhone6, arch: "x86"))
-            XCTAssertEqual(deviceModel64b, .iPadSimulator(.iPhone6, arch: "x86"))
-        case .phone:
-            XCTAssertEqual(deviceModel32b, .iPhoneSimulator(.iPad1G, arch: "x86"))
-            XCTAssertEqual(deviceModel64b, .iPhoneSimulator(.iPad1G, arch: "x86"))
-        case .tv:
-            XCTAssertEqual(deviceModel32b, .appleTVSimulator(.appleTV4K, arch: "x86"))
-            XCTAssertEqual(deviceModel64b, .appleTVSimulator(.appleTV4K, arch: "x86"))
-        default:
-            XCTFail("not supported yet")
-        }
-    }
-
-    public func testKnownModels() {
-        XCTAssertEqual(DeviceModel(rawValue: "iPhone7,1"), .iPhone6Plus)
-        XCTAssertEqual(DeviceModel(rawValue: "iPod1,1"), .iPodTouch1G)
-        XCTAssertEqual(DeviceModel(rawValue: "iPad4,1"), .iPadAir1G)
-    }
-
-    public func testUnknown() {
-        let identifier = "wawa"
-
-        XCTAssertEqual(DeviceModel(rawValue: identifier), .unknown(model: identifier))
-    }
-
-    public func testUnknownIphone() {
-        let identifier = "iPhone67,21"
-
-        XCTAssertEqual(DeviceModel(rawValue: identifier), .iPhoneUnknown(model: identifier))
+    
+    public func test_iPad_simulator() {
+        let iPadSimulator = DeviceModel.iPadSimulator(.iPad1G(.celullar), arch: "x86")
+        
+        XCTAssertTrue(iPadSimulator.isSimulator)
+        XCTAssertFalse(iPadSimulator.isIphone)
+        XCTAssertTrue(iPadSimulator.isIpad)
+        XCTAssertFalse(iPadSimulator.isAppleTV)
     }
-
-    public func testUnknownIpod() {
-        let identifier = "iPod67,21"
-
-        XCTAssertEqual(DeviceModel(rawValue: identifier), .iPodUnknown(model: identifier))
+    
+    public func test_iPhone_simulator() {
+        let iPadSimulator = DeviceModel.iPhoneSimulator(.iPhoneXS, arch: "arm64")
+        
+        XCTAssertTrue(iPadSimulator.isSimulator)
+        XCTAssertTrue(iPadSimulator.isIphone)
+        XCTAssertFalse(iPadSimulator.isIpad)
+        XCTAssertFalse(iPadSimulator.isAppleTV)
     }
-
-    public func testUnknownIpad() {
-        let identifier = "iPad67,21"
-
-        XCTAssertEqual(DeviceModel(rawValue: identifier), .iPadUnknown(model: identifier))
+    
+    public func test_AppleTV_simulator() {
+        let iPadSimulator = DeviceModel.appleTVSimulator(.appleTV4G, arch: "x86")
+        
+        XCTAssertTrue(iPadSimulator.isSimulator)
+        XCTAssertFalse(iPadSimulator.isIphone)
+        XCTAssertFalse(iPadSimulator.isIpad)
+        XCTAssertTrue(iPadSimulator.isAppleTV)
     }
-     */
 }

Tests/UIDeviceExtensionsTests.swift

@@ -5,7 +5,7 @@ public class DeviceIdentificatorTests: XCTestCase {
     public func testIsSimulator() {
         #if targetEnvironment(simulator)
             XCTAssertTrue(UIDevice.current.isSimulator)
-        XCTAssertTrue(UIDevice.current.deviceModelName.lowercased.contains("simulator"), UIDevice.current.deviceModelName as String)
+            XCTAssertTrue(UIDevice.current.deviceModelName.lowercased.contains("simulator"), UIDevice.current.deviceModelName as String)
         #else
             XCTAssertFalse(UIDevice.current.isSimulator)
         #endif