Add September 2021 Devices (#14)

* Update device datasets

* Update dependencies

* Bump version

* Update Ruby version to 3.0.2

* Fix iPad 9 enum case naming

.ruby-version

@@ -1 +1 @@
-2.7.2
+3.0.2

.version

@@ -1 +1 @@
-1.10.0
+1.11.0

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Orchard Change Log
 
+## [1.11.0](https://github.com/Detroit-Labs/Orchard/releases/tag/1.11.0)
+**Released:** 2021-10-18
+
+### Added
+- Support for iPhone 13, iPhone 13 mini, iPhone 13 Pro, iPhone 13 Pro Max.
+- Support for Apple Watch Series 7
+- Support for iPad (9th Generation)
+- Support for iPad mini (6th Generation)
+- Support for iPad Pro (12.9-inch), iPad Pro (11-inch)
+
 ## [1.10.0](https://github.com/Detroit-Labs/Orchard/releases/tag/1.10.0)
 **Released:** 2021-01-12
 

Common/GYBUtilities.py

@@ -75,4 +75,15 @@ def needsAvailabilityCheck(version, os = OSFamily.IOS):
 	return versiontuple(version) > minimum
 
 def enumName(x):
-	return x.replace(" ", "").replace("(", "").replace(")","").replace(".", "_").replace("-", "").replace(",", "").replace("mini", "Mini").replace("Generation", "").replace("inch", "Inch").replace("1st", "").replace("2nd", "2").replace("3rd", "3").replace("4th", "4").replace("5th", "5").replace("6th", "6").replace("7th", "7").replace("8th", "8").replace("touch", "Touch")
+	return (x
+		.replace(" ", "")
+		.replace("(", "").replace(")","")
+		.replace(".", "_").replace("-", "").replace(",", "")
+		.replace("mini", "Mini")
+		.replace("Generation", "")
+		.replace("inch", "Inch")
+		.replace("1st", "").replace("2nd", "2").replace("3rd", "3")
+		.replace("4th", "4").replace("5th", "5").replace("6th", "6")
+		.replace("7th", "7").replace("8th", "8").replace("9th", "9")
+		.replace("touch", "Touch")
+	)

Data/Watches.tsv

@@ -15,3 +15,5 @@ Apple Watch SE	40mm	7.0	Watch5,9;Watch5,11
 Apple Watch SE	44mm	7.0	Watch5,10;Watch5,12	
 Apple Watch Series 6	40mm	7.0	Watch6,1;Watch6,3	
 Apple Watch Series 6	44mm	7.0	Watch6,2;Watch6,4	
+Apple Watch Series 7	41mm	8.0	Watch6,6;Watch6,8	
+Apple Watch Series 7	45mm	8.0	Watch6,7;Watch6,9	

Data/iPads.tsv

@@ -7,11 +7,13 @@ iPad (5th Generation)	10.3	iPad6,11;iPad6,12
 iPad (6th Generation)	11.3	iPad7,5;iPad7,6	
 iPad (7th Generation)	13.1	iPad7,11;iPad7,12	
 iPad (8th Generation)	14.0	iPad11,6;iPad11,7	
+iPad (9th Generation)	15.0	iPad12,1;iPad12,2	
 iPad mini	6.0	iPad2,5;iPad2,6;iPad2,7	10.0
 iPad mini 2	7.0	iPad4,4;iPad4,5;iPad4,6	13.0
 iPad mini 3	8.0	iPad4,7;iPad4,8;iPad4,9	13.0
 iPad mini 4	9.0	iPad5,1;iPad5,2	
 iPad mini (5th Generation)	12.2	iPad11,1;iPad11,2	
+iPad mini (6th Generation)	15.0	iPad14,1;iPad14,2	
 iPad Air	7.0	iPad4,1;iPad4,2;iPad4,3	13.0
 iPad Air 2	8.1	iPad5,3;iPad5,4	
 iPad Air (3rd Generation)	12.2	iPad11,3;iPad11,4	
@@ -24,3 +26,5 @@ iPad Pro (12.9-inch) (3rd Generation)	12.1	iPad8,5;iPad8,6;iPad8,7;iPad8,8
 iPad Pro (11-inch)	12.1	iPad8,1;iPad8,2;iPad8,3;iPad8,4	
 iPad Pro (12.9-inch) (4th Generation)	13.4	iPad8,11;iPad8,12	
 iPad Pro (11-inch) (2nd Generation)	13.4	iPad8,9;iPad8,10	
+iPad Pro (12.9-inch) (5th Generation)	14.5	iPad13,8;iPad13,9;iPad13,10;iPad13,11	
+iPad Pro (11-inch) (3rd Generation)	14.5	iPad13,4;iPad13,5;iPad13,6;iPad13,7	

Data/iPhones.tsv

@@ -28,3 +28,7 @@ iPhone 12	14.1	iPhone13,2
 iPhone 12 mini	14.1	iPhone13,1	
 iPhone 12 Pro	14.1	iPhone13,3	
 iPhone 12 Pro Max	14.1	iPhone13,4	
+iPhone 13	15.0	iPhone14,5	
+iPhone 13 mini	15.0	iPhone14,4	
+iPhone 13 Pro	15.0	iPhone14,2	
+iPhone 13 Pro Max	15.0	iPhone14,3	

Gemfile.lock

@@ -1,23 +1,25 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
-    activesupport (5.2.4.4)
+    CFPropertyList (3.0.4)
+      rexml
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.10.1)
-      addressable (~> 2.6)
+    cocoapods (1.11.2)
+      addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.1)
+      cocoapods-core (= 1.11.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,60 +30,62 @@ GEM
       escape (~> 0.0.4)
       fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.6)
+      molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (~> 1.4)
-      xcodeproj (>= 1.19.0, < 2.0)
-    cocoapods-core (1.10.1)
-      activesupport (> 5.0, < 6)
-      addressable (~> 2.6)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.2)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
       netrc (~> 0.11)
-      public_suffix
+      public_suffix (~> 4.0)
       typhoeus (~> 1.0)
-    cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.4.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.5.1)
     cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (1.0.0)
-    cocoapods-trunk (1.5.0)
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     escape (0.0.4)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    ffi (1.14.2)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.4)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.8.7)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    json (2.5.1)
-    minitest (5.14.3)
-    molinillo (0.6.6)
+    json (2.6.0)
+    minitest (5.14.4)
+    molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
     public_suffix (4.0.6)
-    ruby-macho (1.4.0)
-    thread_safe (0.3.6)
+    rexml (3.2.5)
+    ruby-macho (2.5.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    xcodeproj (1.19.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.21.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

Orchard-ObjC/iOS/OrchardiOSDevice.h

@@ -55,6 +55,10 @@ typedef NS_ENUM(NSUInteger, OrchardiOSDevice) {
     OrchardiOSDeviceiPhone12Mini   NS_ENUM_AVAILABLE_IOS(14.1)       NS_SWIFT_NAME(iPhone12Mini),
     OrchardiOSDeviceiPhone12Pro    NS_ENUM_AVAILABLE_IOS(14.1)       NS_SWIFT_NAME(iPhone12Pro),
     OrchardiOSDeviceiPhone12ProMax NS_ENUM_AVAILABLE_IOS(14.1)       NS_SWIFT_NAME(iPhone12ProMax),
+    OrchardiOSDeviceiPhone13       NS_ENUM_AVAILABLE_IOS(15.0)       NS_SWIFT_NAME(iPhone13),
+    OrchardiOSDeviceiPhone13Mini   NS_ENUM_AVAILABLE_IOS(15.0)       NS_SWIFT_NAME(iPhone13Mini),
+    OrchardiOSDeviceiPhone13Pro    NS_ENUM_AVAILABLE_IOS(15.0)       NS_SWIFT_NAME(iPhone13Pro),
+    OrchardiOSDeviceiPhone13ProMax NS_ENUM_AVAILABLE_IOS(15.0)       NS_SWIFT_NAME(iPhone13ProMax),
 
     // iPads
     OrchardiOSDeviceiPad             NS_ENUM_DEPRECATED_IOS(3.2, 6.0)  NS_SWIFT_NAME(iPad),
@@ -65,11 +69,13 @@ typedef NS_ENUM(NSUInteger, OrchardiOSDevice) {
     OrchardiOSDeviceiPad6            NS_ENUM_AVAILABLE_IOS(11.3)       NS_SWIFT_NAME(iPad6),
     OrchardiOSDeviceiPad7            NS_ENUM_AVAILABLE_IOS(13.1)       NS_SWIFT_NAME(iPad7),
     OrchardiOSDeviceiPad8            NS_ENUM_AVAILABLE_IOS(14.0)       NS_SWIFT_NAME(iPad8),
+    OrchardiOSDeviceiPad9            NS_ENUM_AVAILABLE_IOS(15.0)       NS_SWIFT_NAME(iPad9),
     OrchardiOSDeviceiPadMini         NS_ENUM_DEPRECATED_IOS(6.0, 10.0) NS_SWIFT_NAME(iPadMini),
     OrchardiOSDeviceiPadMini2        NS_ENUM_DEPRECATED_IOS(7.0, 13.0) NS_SWIFT_NAME(iPadMini2),
     OrchardiOSDeviceiPadMini3        NS_ENUM_DEPRECATED_IOS(8.0, 13.0) NS_SWIFT_NAME(iPadMini3),
     OrchardiOSDeviceiPadMini4        NS_ENUM_AVAILABLE_IOS(9.0)        NS_SWIFT_NAME(iPadMini4),
     OrchardiOSDeviceiPadMini5        NS_ENUM_AVAILABLE_IOS(12.2)       NS_SWIFT_NAME(iPadMini5),
+    OrchardiOSDeviceiPadMini6        NS_ENUM_AVAILABLE_IOS(15.0)       NS_SWIFT_NAME(iPadMini6),
     OrchardiOSDeviceiPadAir          NS_ENUM_DEPRECATED_IOS(7.0, 13.0) NS_SWIFT_NAME(iPadAir),
     OrchardiOSDeviceiPadAir2         NS_ENUM_AVAILABLE_IOS(8.1)        NS_SWIFT_NAME(iPadAir2),
     OrchardiOSDeviceiPadAir3         NS_ENUM_AVAILABLE_IOS(12.2)       NS_SWIFT_NAME(iPadAir3),
@@ -82,6 +88,8 @@ typedef NS_ENUM(NSUInteger, OrchardiOSDevice) {
     OrchardiOSDeviceiPadPro11Inch    NS_ENUM_AVAILABLE_IOS(12.1)       NS_SWIFT_NAME(iPadPro11Inch),
     OrchardiOSDeviceiPadPro12_9Inch4 NS_ENUM_AVAILABLE_IOS(13.4)       NS_SWIFT_NAME(iPadPro12_9Inch4),
     OrchardiOSDeviceiPadPro11Inch2   NS_ENUM_AVAILABLE_IOS(13.4)       NS_SWIFT_NAME(iPadPro11Inch2),
+    OrchardiOSDeviceiPadPro12_9Inch5 NS_ENUM_AVAILABLE_IOS(14.5)       NS_SWIFT_NAME(iPadPro12_9Inch5),
+    OrchardiOSDeviceiPadPro11Inch3   NS_ENUM_AVAILABLE_IOS(14.5)       NS_SWIFT_NAME(iPadPro11Inch3),
 
     // iPods
     OrchardiOSDeviceiPodTouch  NS_ENUM_DEPRECATED_IOS(1.1, 3.2)  NS_SWIFT_NAME(iPodTouch),

Orchard-ObjC/iOS/OrchardiOSDevice.m

@@ -125,6 +125,18 @@ OrchardiOSDevice OrchardiOSDeviceFromNSString(NSString * _Nonnull string) {
     else if ([string isEqualToString:@"iPhone13,4"]) {
         return OrchardiOSDeviceiPhone12ProMax;
     }
+    else if ([string isEqualToString:@"iPhone14,5"]) {
+        return OrchardiOSDeviceiPhone13;
+    }
+    else if ([string isEqualToString:@"iPhone14,4"]) {
+        return OrchardiOSDeviceiPhone13Mini;
+    }
+    else if ([string isEqualToString:@"iPhone14,2"]) {
+        return OrchardiOSDeviceiPhone13Pro;
+    }
+    else if ([string isEqualToString:@"iPhone14,3"]) {
+        return OrchardiOSDeviceiPhone13ProMax;
+    }
 
 #pragma mark - iPads
 
@@ -163,6 +175,10 @@ OrchardiOSDevice OrchardiOSDeviceFromNSString(NSString * _Nonnull string) {
                                                      @"iPad11,7"]]) {
         return OrchardiOSDeviceiPad8;
     }
+    else if ([string orchard_isEqualToOneOfStrings:@[@"iPad12,1",
+                                                     @"iPad12,2"]]) {
+        return OrchardiOSDeviceiPad9;
+    }
     else if ([string orchard_isEqualToOneOfStrings:@[@"iPad2,5",
                                                      @"iPad2,6",
                                                      @"iPad2,7"]]) {
@@ -186,6 +202,10 @@ OrchardiOSDevice OrchardiOSDeviceFromNSString(NSString * _Nonnull string) {
                                                      @"iPad11,2"]]) {
         return OrchardiOSDeviceiPadMini5;
     }
+    else if ([string orchard_isEqualToOneOfStrings:@[@"iPad14,1",
+                                                     @"iPad14,2"]]) {
+        return OrchardiOSDeviceiPadMini6;
+    }
     else if ([string orchard_isEqualToOneOfStrings:@[@"iPad4,1",
                                                      @"iPad4,2",
                                                      @"iPad4,3"]]) {
@@ -239,6 +259,18 @@ OrchardiOSDevice OrchardiOSDeviceFromNSString(NSString * _Nonnull string) {
                                                      @"iPad8,10"]]) {
         return OrchardiOSDeviceiPadPro11Inch2;
     }
+    else if ([string orchard_isEqualToOneOfStrings:@[@"iPad13,8",
+                                                     @"iPad13,9",
+                                                     @"iPad13,10",
+                                                     @"iPad13,11"]]) {
+        return OrchardiOSDeviceiPadPro12_9Inch5;
+    }
+    else if ([string orchard_isEqualToOneOfStrings:@[@"iPad13,4",
+                                                     @"iPad13,5",
+                                                     @"iPad13,6",
+                                                     @"iPad13,7"]]) {
+        return OrchardiOSDeviceiPadPro11Inch3;
+    }
 
 #pragma mark - iPods
 
@@ -310,6 +342,10 @@ OrchardiOSDeviceFamily OrchardiOSDeviceFamilyForiOSDevice(OrchardiOSDevice devic
         case OrchardiOSDeviceiPhone12Mini:
         case OrchardiOSDeviceiPhone12Pro:
         case OrchardiOSDeviceiPhone12ProMax:
+        case OrchardiOSDeviceiPhone13:
+        case OrchardiOSDeviceiPhone13Mini:
+        case OrchardiOSDeviceiPhone13Pro:
+        case OrchardiOSDeviceiPhone13ProMax:
             return OrchardiOSDeviceFamilyiPhone;
 
 #pragma mark - iPads
@@ -322,11 +358,13 @@ OrchardiOSDeviceFamily OrchardiOSDeviceFamilyForiOSDevice(OrchardiOSDevice devic
         case OrchardiOSDeviceiPad6:
         case OrchardiOSDeviceiPad7:
         case OrchardiOSDeviceiPad8:
+        case OrchardiOSDeviceiPad9:
         case OrchardiOSDeviceiPadMini:
         case OrchardiOSDeviceiPadMini2:
         case OrchardiOSDeviceiPadMini3:
         case OrchardiOSDeviceiPadMini4:
         case OrchardiOSDeviceiPadMini5:
+        case OrchardiOSDeviceiPadMini6:
         case OrchardiOSDeviceiPadAir:
         case OrchardiOSDeviceiPadAir2:
         case OrchardiOSDeviceiPadAir3:
@@ -339,6 +377,8 @@ OrchardiOSDeviceFamily OrchardiOSDeviceFamilyForiOSDevice(OrchardiOSDevice devic
         case OrchardiOSDeviceiPadPro11Inch:
         case OrchardiOSDeviceiPadPro12_9Inch4:
         case OrchardiOSDeviceiPadPro11Inch2:
+        case OrchardiOSDeviceiPadPro12_9Inch5:
+        case OrchardiOSDeviceiPadPro11Inch3:
             return OrchardiOSDeviceFamilyiPad;
 
 #pragma mark - iPods
@@ -464,6 +504,18 @@ OrchardiOSDeviceFamily OrchardiOSDeviceFamilyForiOSDevice(OrchardiOSDevice devic
         case OrchardiOSDeviceiPhone12ProMax:
             return @"iPhone 12 Pro Max";
 
+        case OrchardiOSDeviceiPhone13:
+            return @"iPhone 13";
+
+        case OrchardiOSDeviceiPhone13Mini:
+            return @"iPhone 13 mini";
+
+        case OrchardiOSDeviceiPhone13Pro:
+            return @"iPhone 13 Pro";
+
+        case OrchardiOSDeviceiPhone13ProMax:
+            return @"iPhone 13 Pro Max";
+
 #pragma mark - iPads
 
         case OrchardiOSDeviceiPad:
@@ -490,6 +542,9 @@ OrchardiOSDeviceFamily OrchardiOSDeviceFamilyForiOSDevice(OrchardiOSDevice devic
         case OrchardiOSDeviceiPad8:
             return @"iPad (8th Generation)";
 
+        case OrchardiOSDeviceiPad9:
+            return @"iPad (9th Generation)";
+
         case OrchardiOSDeviceiPadMini:
             return @"iPad mini";
 
@@ -505,6 +560,9 @@ OrchardiOSDeviceFamily OrchardiOSDeviceFamilyForiOSDevice(OrchardiOSDevice devic
         case OrchardiOSDeviceiPadMini5:
             return @"iPad mini (5th Generation)";
 
+        case OrchardiOSDeviceiPadMini6:
+            return @"iPad mini (6th Generation)";
+
         case OrchardiOSDeviceiPadAir:
             return @"iPad Air";
 
@@ -541,6 +599,12 @@ OrchardiOSDeviceFamily OrchardiOSDeviceFamilyForiOSDevice(OrchardiOSDevice devic
         case OrchardiOSDeviceiPadPro11Inch2:
             return @"iPad Pro (11-inch) (2nd Generation)";
 
+        case OrchardiOSDeviceiPadPro12_9Inch5:
+            return @"iPad Pro (12.9-inch) (5th Generation)";
+
+        case OrchardiOSDeviceiPadPro11Inch3:
+            return @"iPad Pro (11-inch) (3rd Generation)";
+
 #pragma mark - iPods
 
         case OrchardiOSDeviceiPodTouch:

Orchard-ObjC/watchOS/OrchardwatchOSDevice.h

@@ -33,6 +33,8 @@ typedef NS_ENUM(NSUInteger, OrchardwatchOSDevice) {
     OrchardwatchOSDeviceAppleWatchSE_44mm      NS_ENUM_AVAILABLE_IOS(14.0)        NS_SWIFT_NAME(AppleWatchSE_44mm),
     OrchardwatchOSDeviceAppleWatchSeries6_40mm NS_ENUM_AVAILABLE_IOS(14.0)        NS_SWIFT_NAME(AppleWatchSeries6_40mm),
     OrchardwatchOSDeviceAppleWatchSeries6_44mm NS_ENUM_AVAILABLE_IOS(14.0)        NS_SWIFT_NAME(AppleWatchSeries6_44mm),
+    OrchardwatchOSDeviceAppleWatchSeries7_41mm NS_ENUM_AVAILABLE_IOS(15.0)        NS_SWIFT_NAME(AppleWatchSeries7_41mm),
+    OrchardwatchOSDeviceAppleWatchSeries7_45mm NS_ENUM_AVAILABLE_IOS(15.0)        NS_SWIFT_NAME(AppleWatchSeries7_45mm),
 
     OrchardwatchOSDeviceSimulator NS_SWIFT_NAME(simulator),
     OrchardwatchOSDeviceUnknown   NS_SWIFT_NAME(unknown)