Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issues #127

Merged
merged 1 commit into from
Jul 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions Generator/GeneratorDeviceList.plist
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
<key>name</key>
<string>iPhone 15 Pro</string>
<key>enum</key>
<string>IPHONE_14_PRO</string>
<string>IPHONE_15_PRO</string>
</dict>
<key>iPhone16,2</key>
<dict>
Expand Down Expand Up @@ -968,61 +968,61 @@
<key>enum</key>
<string>IPAD_MINI_6_WIFI_CELLULAR</string>
</dict>
<key>iPad14,3-A</key>
<key>iPad14,3</key>
<dict>
<key>name</key>
<string>iPad Pro 11-inch (4th generation)</string>
<key>enum</key>
<string>IPAD_PRO_11_4G_WIFI</string>
</dict>
<key>iPad14,3-B</key>
<key>iPad14,4</key>
<dict>
<key>name</key>
<string>iPad Pro 11-inch (1TB, 4th generation)</string>
<string>iPad Pro 11-inch (Wi-Fi + Cellular, 4th generation)</string>
<key>enum</key>
<string>IPAD_PRO_11_3G_1TB_WIFI</string>
<string>IPAD_PRO_11_4G_WIFI_CELLULAR</string>
</dict>
<key>iPad14,4-A</key>
<key>iPad14,5</key>
<dict>
<key>name</key>
<string>iPad Pro 11-inch (Wi-Fi + Cellular, 4th generation)</string>
<string>iPad Pro 12.9-inch (6th generation)</string>
<key>enum</key>
<string>IPAD_PRO_11_4G_WIFI_CELLULAR</string>
<string>IPAD_PRO_6G_WIFI</string>
</dict>
<key>iPad14,4-B</key>
<key>iPad14,6</key>
<dict>
<key>name</key>
<string>iPad Pro 11-inch (1TB, Wi-Fi + Cellular, 4th generation)</string>
<string>iPad Pro 12.9-inch (WiFi + Cellular, 6th generation)</string>
<key>enum</key>
<string>IPAD_PRO_11_4G_1TB_WIFI_CELLULAR</string>
<string>IPAD_PRO_6G_WIFI_CELLULAR</string>
</dict>
<key>iPad14,5-A</key>
<key>iPad16,3</key>
<dict>
<key>name</key>
<string>iPad Pro 12.9-inch (6th generation)</string>
<string>iPad Pro 11 inch M4</string>
<key>enum</key>
<string>IPAD_PRO_6G_WIFI</string>
<string>IPAD_PRO_11_M4</string>
</dict>
<key>iPad14,5-B</key>
<key>iPad16,4</key>
<dict>
<key>name</key>
<string>iPad Pro 12.9-inch (1TB, 6th generation)</string>
<string>iPad Pro 11 inch M4</string>
<key>enum</key>
<string>IPAD_PRO_6G_1TB_WIFI</string>
<string>IPAD_PRO_11_M4_CELLULAR</string>
</dict>
<key>iPad14,6-A</key>
<key>iPad16,5</key>
<dict>
<key>name</key>
<string>iPad Pro 12.9-inch (WiFi + Cellular, 6th generation)</string>
<string>iPad Pro 13 inch M4</string>
<key>enum</key>
<string>IPAD_PRO_6G_WIFI_CELLULAR</string>
<string>IPAD_PRO_13_M4</string>
</dict>
<key>iPad14,6-B</key>
<key>iPad16,6</key>
<dict>
<key>name</key>
<string>iPad Pro 12.9-inch (1TB, WiFi + Cellular, 6th generation)</string>
<string>iPad Pro 13 inch M4</string>
<key>enum</key>
<string>IPAD_PRO_6G_1TB_WIFI_CELLULAR</string>
<string>IPAD_PRO_13_M4_CELLULAR</string>
</dict>
<key>AppleTV1,1</key>
<dict>
Expand Down
20 changes: 10 additions & 10 deletions Sources/DeviceGuruImplementation+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
public extension DeviceGuruImplementation {

/// This should be same as cocoa pod version
static var libraryVersion: String { "10.0.7" }
static var libraryVersion: String { "10.0.8" }

var hardware: Hardware {

Expand Down Expand Up @@ -80,14 +80,14 @@ public extension DeviceGuruImplementation {
if (hardwareString == "iPad13,9") { return .ipad_pro_5g_1tb_wifi }
if (hardwareString == "iPad14,1") { return .ipad_mini_6_wifi }
if (hardwareString == "iPad14,2") { return .ipad_mini_6_wifi_cellular }
if (hardwareString == "iPad14,3-A") { return .ipad_pro_11_4g_wifi }
if (hardwareString == "iPad14,3-B") { return .ipad_pro_11_3g_1tb_wifi }
if (hardwareString == "iPad14,4-A") { return .ipad_pro_11_4g_wifi_cellular }
if (hardwareString == "iPad14,4-B") { return .ipad_pro_11_4g_1tb_wifi_cellular }
if (hardwareString == "iPad14,5-A") { return .ipad_pro_6g_wifi }
if (hardwareString == "iPad14,5-B") { return .ipad_pro_6g_1tb_wifi }
if (hardwareString == "iPad14,6-A") { return .ipad_pro_6g_wifi_cellular }
if (hardwareString == "iPad14,6-B") { return .ipad_pro_6g_1tb_wifi_cellular }
if (hardwareString == "iPad14,3") { return .ipad_pro_11_4g_wifi }
if (hardwareString == "iPad14,4") { return .ipad_pro_11_4g_wifi_cellular }
if (hardwareString == "iPad14,5") { return .ipad_pro_6g_wifi }
if (hardwareString == "iPad14,6") { return .ipad_pro_6g_wifi_cellular }
if (hardwareString == "iPad16,3") { return .ipad_pro_11_m4 }
if (hardwareString == "iPad16,4") { return .ipad_pro_11_m4_cellular }
if (hardwareString == "iPad16,5") { return .ipad_pro_13_m4 }
if (hardwareString == "iPad16,6") { return .ipad_pro_13_m4_cellular }
if (hardwareString == "iPad2,1") { return .ipad_2_wifi }
if (hardwareString == "iPad2,2") { return .ipad_2 }
if (hardwareString == "iPad2,3") { return .ipad_2_cdma }
Expand Down Expand Up @@ -171,7 +171,7 @@ public extension DeviceGuruImplementation {
if (hardwareString == "iPhone15,3") { return .iphone_14_pro_max }
if (hardwareString == "iPhone15,4") { return .iphone_15 }
if (hardwareString == "iPhone15,5") { return .iphone_15_plus }
if (hardwareString == "iPhone16,1") { return .iphone_14_pro }
if (hardwareString == "iPhone16,1") { return .iphone_15_pro }
if (hardwareString == "iPhone16,2") { return .iphone_15_pro_max }
if (hardwareString == "iPhone2,1") { return .iphone_3gs }
if (hardwareString == "iPhone3,1") { return .iphone_4 }
Expand Down
30 changes: 15 additions & 15 deletions Sources/DeviceList.plist
Original file line number Diff line number Diff line change
Expand Up @@ -372,45 +372,45 @@
<key>name</key>
<string>iPad mini (Wi-Fi + Cellular, 6th generation)</string>
</dict>
<key>iPad14,3-A</key>
<key>iPad14,3</key>
<dict>
<key>name</key>
<string>iPad Pro 11-inch (4th generation)</string>
</dict>
<key>iPad14,3-B</key>
<key>iPad14,4</key>
<dict>
<key>name</key>
<string>iPad Pro 11-inch (1TB, 4th generation)</string>
<string>iPad Pro 11-inch (Wi-Fi + Cellular, 4th generation)</string>
</dict>
<key>iPad14,4-A</key>
<key>iPad14,5</key>
<dict>
<key>name</key>
<string>iPad Pro 11-inch (Wi-Fi + Cellular, 4th generation)</string>
<string>iPad Pro 12.9-inch (6th generation)</string>
</dict>
<key>iPad14,4-B</key>
<key>iPad14,6</key>
<dict>
<key>name</key>
<string>iPad Pro 11-inch (1TB, Wi-Fi + Cellular, 4th generation)</string>
<string>iPad Pro 12.9-inch (WiFi + Cellular, 6th generation)</string>
</dict>
<key>iPad14,5-A</key>
<key>iPad16,3</key>
<dict>
<key>name</key>
<string>iPad Pro 12.9-inch (6th generation)</string>
<string>iPad Pro 11 inch M4</string>
</dict>
<key>iPad14,5-B</key>
<key>iPad16,4</key>
<dict>
<key>name</key>
<string>iPad Pro 12.9-inch (1TB, 6th generation)</string>
<string>iPad Pro 11 inch M4</string>
</dict>
<key>iPad14,6-A</key>
<key>iPad16,5</key>
<dict>
<key>name</key>
<string>iPad Pro 12.9-inch (WiFi + Cellular, 6th generation)</string>
<string>iPad Pro 13 inch M4</string>
</dict>
<key>iPad14,6-B</key>
<key>iPad16,6</key>
<dict>
<key>name</key>
<string>iPad Pro 12.9-inch (1TB, WiFi + Cellular, 6th generation)</string>
<string>iPad Pro 13 inch M4</string>
</dict>
<key>iPad2,1</key>
<dict>
Expand Down
8 changes: 5 additions & 3 deletions Sources/Hardware.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public enum Hardware {
case iphone_14_pro_max
case iphone_15
case iphone_15_plus
case iphone_15_pro
case iphone_15_pro_max

case ipod_touch_1g
Expand Down Expand Up @@ -150,11 +151,12 @@ public enum Hardware {
case ipad_mini_6_wifi_cellular
case ipad_pro_11_4g_wifi
case ipad_pro_11_4g_wifi_cellular
case ipad_pro_11_4g_1tb_wifi_cellular
case ipad_pro_6g_wifi
case ipad_pro_6g_1tb_wifi
case ipad_pro_6g_wifi_cellular
case ipad_pro_6g_1tb_wifi_cellular
case ipad_pro_11_m4
case ipad_pro_11_m4_cellular
case ipad_pro_13_m4
case ipad_pro_13_m4_cellular

case apple_watch_38
case apple_watch_42
Expand Down
Loading