Merge pull request #8 from SlaunchaMan/update-ipad-air-4-identifier

Update iPad Air (4th Generation) identifier.
detroit-labs · Oct 9, 2020 · a0f571c · a0f571c
2 parents fe91a28 + d323a20
commit a0f571c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Orchard Change Log
 
+## [1.7.1](https://github.com/SlaunchaMan/Orchard/releases/tag/1.7.1)
+**Released:** 2020-10-09
+
+### Updated
+- Additional identifier for iPad Air (4th Generation).
+
 ## [1.7.0](https://github.com/SlaunchaMan/Orchard/releases/tag/1.7.0)
 **Released:** 2020-09-17
 

diff --git a/Data/iPads.tsv b/Data/iPads.tsv
@@ -23,4 +23,4 @@ iPad (7th Generation)	13.1	iPad7,11;iPad7,12
 iPad Pro (11-inch) (2nd Generation)	13.4	iPad8,9;iPad8,10	
 iPad Pro (12.9-inch) (4th Generation)	13.4	iPad8,11;iPad8,12	
 iPad (8th Generation)	14.0	iPad11,6;iPad11,7	
-iPad Air (4th Generation)	14.0	iPad13,1	
+iPad Air (4th Generation)	14.0	iPad13,1;iPad13,2	
diff --git a/Orchard-ObjC/iOS/OrchardiOSDevice.m b/Orchard-ObjC/iOS/OrchardiOSDevice.m
@@ -223,7 +223,8 @@ OrchardiOSDevice OrchardiOSDeviceFromNSString(NSString * _Nonnull string) {
                                                      @"iPad11,7"]]) {
         return OrchardiOSDeviceiPad8;
     }
-    else if ([string isEqualToString:@"iPad13,1"]) {
+    else if ([string orchard_isEqualToOneOfStrings:@[@"iPad13,1",
+                                                     @"iPad13,2"]]) {
         return OrchardiOSDeviceiPadAir4;
     }
 

diff --git a/Orchard-Swift/iOS/iPads.swift b/Orchard-Swift/iOS/iPads.swift
@@ -198,7 +198,7 @@ public enum iPads {
                 self = .iPad8
             }
 
-        case "iPad13,1":
+        case "iPad13,1", "iPad13,2":
             if #available(iOS 14.0, *) {
                 self = .iPadAir4
             }

diff --git a/Orchard.podspec b/Orchard.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
 
   spec.name         = "Orchard"
-  spec.version      = "1.7.0"
+  spec.version      = "1.7.1"
   spec.summary      = "Device identification for iOS, watchOS, and tvOS."
 
   spec.description  = <<-DESC

diff --git a/Orchard.xcodeproj/project.pbxproj b/Orchard.xcodeproj/project.pbxproj
@@ -321,7 +321,7 @@
 			attributes = {
 				CLASSPREFIX = Orchard;
 				LastSwiftUpdateCheck = 1000;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Jeff Kelley";
 				TargetAttributes = {
 					1F6D236B2244810B001E0B28 = {
@@ -558,6 +558,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -574,7 +575,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MARKETING_VERSION = 1.7.0;
+				MARKETING_VERSION = 1.7.1;
 				ONLY_ACTIVE_ARCH = YES;
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchsimulator watchos appletvsimulator appletvos";
@@ -599,6 +600,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -615,7 +617,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MARKETING_VERSION = 1.7.0;
+				MARKETING_VERSION = 1.7.1;
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchsimulator watchos appletvsimulator appletvos";
 				SWIFT_COMPILATION_MODE = wholemodule;

diff --git a/Orchard.xcodeproj/xcshareddata/xcschemes/Orchard-ObjC.xcscheme b/Orchard.xcodeproj/xcshareddata/xcschemes/Orchard-ObjC.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:Orchard.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"