@@ -381,10 +381,22 @@ public enum Device {
381381 ///
382382 /// 
383383 case iMac215InchMid2010
384+ /// Device is a [Mac Pro (2019)](https://support.apple.com/kb/SP797)
385+ ///
386+ /// 
387+ case macPro2019
388+ /// Device is a [Mac Pro (Late 2013)](https://support.apple.com/kb/SP697)
389+ ///
390+ /// 
391+ case macProLate2013
384392 /// Device is a [Mac Pro (Mid 2012)](https://support.apple.com/kb/SP652)
385393 ///
386- /// 
394+ /// 
387395 case macProMid2012
396+ /// Device is a [Mac Pro (Early 2009)](https://support.apple.com/kb/SP506)
397+ ///
398+ /// 
399+ case macProEarly2009
388400 /// Device is a [MacBook (Retina, 12-inch, 2017)](https://support.apple.com/kb/SP757)
389401 ///
390402 /// 
@@ -667,7 +679,10 @@ public enum Device {
667679 case " iMac12,1 " : return iMac215InchMid2011
668680 case " iMac11,3 " : return iMac27InchMid2010
669681 case " iMac11,2 " : return iMac215InchMid2010
682+ case " MacPro7,1 " : return macPro2019
683+ case " MacPro6,1 " : return macProLate2013
670684 case " MacPro5,1 " : return macProMid2012
685+ case " MacPro4,1 " : return macProEarly2009
671686 case " MacBook10,1 " : return macBookRetina12Inch2017
672687 case " MacBook9,1 " : return macBookRetina12InchEarly2016
673688 case " MacBook8,1 " : return macBookRetina12InchEarly2015
@@ -1084,7 +1099,7 @@ public enum Device {
10841099 #elseif os(macOS)
10851100 /// All Macs
10861101 public static var allMacs : [ Device ] {
1087- return [ . macMini2018, . macMiniLate2014, . macMiniLate2012, . macMiniMid2011, . macMiniMid2010, . macMini2009, . iMacRetina5K27Inch2019, . iMacRetina4K215Inch2019, . iMacRetina5K27Inch2017, . iMacRetina4K215Inch2017, . iMac215Inch2017, . iMacRetina5K27InchLate2015, . iMacRetina4K215InchLate2015, . iMac215InchLate2015, . iMacRetina5K27InchMid2015, . iMac215InchMid2014, . iMac27InchLate2013, . iMac215InchLate2013, . iMac215InchLate2012, . iMac27InchMid2011, . iMac215InchMid2011, . iMac27InchMid2010, . iMac215InchMid2010, . macProMid2012, . macBookRetina12Inch2017, . macBookRetina12InchEarly2016, . macBookRetina12InchEarly2015, . macBook13InchMid2010, . macBook13InchLate2009, . macBookAirRetina13Inch2019, . macBookAirRetina13Inch2018, . macBookAir13Inch2017, . macBookAir13InchEarly2015, . macBookAir11InchEarly2015, . macBookAir13InchEarly2014, . macBookAir11InchEarly2014, . macBookAir13InchMid2012, . macBookAir11InchMid2012, . macBookAir13InchMid2011, . macBookAir11InchMid2011, . macBookAir13InchLate2010, . macBookAir11InchLate2010, . macBookAirMid2009, . macBookPro16Inch2019, . macBookPro13Inch2019TwoThunderbolt3Ports, . macBookPro15Inch2019, . macBookPro13Inch2019FourThunderbolt3Ports, . macBookPro15Inch2018, . macBookPro15Inch2017, . macBookPro13Inch2017FourThunderbolt3Ports, . macBookPro13Inch2017TwoThunderbolt3Ports, . macBookPro15Inch2016, . macBookPro13Inch2016FourThunderbolt3Ports, . macBookPro13Inch2016TwoThunderbolt3Ports, . macBookProRetina15InchMid2015, . macBookProRetina13InchEarly2015, . macBookProRetina15InchMid2014, . macBookProRetina13InchMid2014, . iMacPro2017]
1102+ return [ . macMini2018, . macMiniLate2014, . macMiniLate2012, . macMiniMid2011, . macMiniMid2010, . macMini2009, . iMacRetina5K27Inch2019, . iMacRetina4K215Inch2019, . iMacRetina5K27Inch2017, . iMacRetina4K215Inch2017, . iMac215Inch2017, . iMacRetina5K27InchLate2015, . iMacRetina4K215InchLate2015, . iMac215InchLate2015, . iMacRetina5K27InchMid2015, . iMac215InchMid2014, . iMac27InchLate2013, . iMac215InchLate2013, . iMac215InchLate2012, . iMac27InchMid2011, . iMac215InchMid2011, . iMac27InchMid2010, . iMac215InchMid2010, . macPro2019, . macProLate2013, . macProMid2012, . macProEarly2009, . macBookRetina12Inch2017, . macBookRetina12InchEarly2016, . macBookRetina12InchEarly2015, . macBook13InchMid2010, . macBook13InchLate2009, . macBookAirRetina13Inch2019, . macBookAirRetina13Inch2018, . macBookAir13Inch2017, . macBookAir13InchEarly2015, . macBookAir11InchEarly2015, . macBookAir13InchEarly2014, . macBookAir11InchEarly2014, . macBookAir13InchMid2012, . macBookAir11InchMid2012, . macBookAir13InchMid2011, . macBookAir11InchMid2011, . macBookAir13InchLate2010, . macBookAir11InchLate2010, . macBookAirMid2009, . macBookPro16Inch2019, . macBookPro13Inch2019TwoThunderbolt3Ports, . macBookPro15Inch2019, . macBookPro13Inch2019FourThunderbolt3Ports, . macBookPro15Inch2018, . macBookPro15Inch2017, . macBookPro13Inch2017FourThunderbolt3Ports, . macBookPro13Inch2017TwoThunderbolt3Ports, . macBookPro15Inch2016, . macBookPro13Inch2016FourThunderbolt3Ports, . macBookPro13Inch2016TwoThunderbolt3Ports, . macBookProRetina15InchMid2015, . macBookProRetina13InchEarly2015, . macBookProRetina15InchMid2014, . macBookProRetina13InchMid2014, . iMacPro2017]
10881103 }
10891104
10901105 public static var allMacMinis : [ Device ] {
@@ -1112,7 +1127,7 @@ public enum Device {
11121127 }
11131128
11141129 public static var allMacPros : [ Device ] {
1115- return [ . macProMid2012]
1130+ return [ . macPro2019 , . macProLate2013 , . macProMid2012, . macProEarly2009 ]
11161131 }
11171132
11181133 public var isMacMini : Bool {
@@ -1465,7 +1480,10 @@ extension Device: CustomStringConvertible {
14651480 case . iMac215InchMid2011: return " iMac (21.5-inch, Mid 2011) "
14661481 case . iMac27InchMid2010: return " iMac (27-inch, Mid 2010) "
14671482 case . iMac215InchMid2010: return " iMac (21.5-inch, Mid 2010) "
1468- case . macProMid2012: return " Mac Pro (Mid 2012) "
1483+ case . macPro2019: return " Mac Pro (2019) "
1484+ case . macProLate2013: return " Mac Pro (Late 2013) "
1485+ case . macProMid2012: return " Mac Pro (Mid 2010 to Mid 2012) "
1486+ case . macProEarly2009: return " Mac Pro (Early 2009) "
14691487 case . macBookRetina12Inch2017: return " MacBook (Retina, 12-inch, 2017) "
14701488 case . macBookRetina12InchEarly2016: return " MacBook (Retina, 12-inch, Early 2016) "
14711489 case . macBookRetina12InchEarly2015: return " MacBook (Retina, 12-inch, Early 2015) "
0 commit comments