Merge pull request #22 from detroit-labs/orchard

2.2.0: The Apple Orchard

.ruby-version

@@ -1 +1 @@
-2.6.1
+2.6.3

CHANGELOG.md

@@ -1,5 +1,14 @@
 # IRLSize Change Log
 
+## [2.2.0](https://github.com/detroit-labs/IRLSize/releases/tag/2.2.0)
+**Released:** 2019-04-29
+
+### Updated
+  - Switch from SDVersion to Orchard for device identification
+
+### Added
+  - Support for 2019 iPad models
+
 ## [2.1.0](https://github.com/detroit-labs/IRLSize/releases/tag/2.1.0)
 **Released:** 2018-11-16
 

Example/IRLSizeExample-Watch Extension/ExtensionDelegate.h

@@ -3,7 +3,7 @@
 //  IRLSizeExample-Watch Extension
 //
 //  Created by Jeff Kelley on 6/29/2016.
-//  Copyright © 2018 Detroit Labs. All rights reserved.
+//  Copyright © 2019 Detroit Labs. All rights reserved.
 //
 
 #import <WatchKit/WatchKit.h>

Example/IRLSizeExample-Watch Extension/ExtensionDelegate.m

@@ -3,7 +3,7 @@
 //  IRLSizeExample-Watch Extension
 //
 //  Created by Jeff Kelley on 6/29/2016.
-//  Copyright © 2018 Detroit Labs. All rights reserved.
+//  Copyright © 2019 Detroit Labs. All rights reserved.
 //
 
 #import "ExtensionDelegate.h"

Example/IRLSizeExample-Watch Extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/IRLSizeExample-Watch Extension/InterfaceController.h

@@ -3,7 +3,7 @@
 //  IRLSizeExample-Watch Extension
 //
 //  Created by Jeff Kelley on 6/29/2016.
-//  Copyright © 2018 Detroit Labs. All rights reserved.
+//  Copyright © 2019 Detroit Labs. All rights reserved.
 //
 
 #import <WatchKit/WatchKit.h>

Example/IRLSizeExample-Watch Extension/InterfaceController.m

@@ -3,18 +3,21 @@
 //  IRLSizeExample-Watch Extension
 //
 //  Created by Jeff Kelley on 6/29/2016.
-//  Copyright © 2018 Detroit Labs. All rights reserved.
+//  Copyright © 2019 Detroit Labs. All rights reserved.
 //
 
 #import "InterfaceController.h"
 
 #import <IRLSize/IRLSize.h>
+#import <Orchard/Orchard.h>
 
 #import "IRLSizeExampleConstants.h"
 
 @interface InterfaceController()
 
 @property (weak, nonatomic) IBOutlet WKInterfaceGroup *halfInchGroup;
+
+@property (weak, nonatomic) IBOutlet WKInterfaceLabel *deviceLabel;
 
 @property (weak, nonatomic) IBOutlet WKInterfaceLabel *widthLabel;
 @property (weak, nonatomic) IBOutlet WKInterfaceLabel *heightLabel;
@@ -27,9 +30,18 @@ - (void)willActivate
 {
     [super willActivate];
 
+    [self configureDeviceLabel];
     [self configureHalfInchGroup];
     [self configureLabels];
 }
+
+- (void)configureDeviceLabel
+{
+    OrchardwatchOSDevice device = [WKInterfaceDevice.currentDevice
+                                   orchardwatchOSDevice];
+
+    [self.deviceLabel setText:OrchardMarketingNameForWatchOSDevice(device)];
+}
 
 - (void)configureHalfInchGroup
 {

Example/IRLSizeExample-Watch/Base.lproj/Interface.storyboard

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="14313.18" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
+<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="14490.70" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
     <device id="watch38" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="watchOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="14238.10"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="14490.21"/>
     </dependencies>
     <scenes>
         <!--Interface Controller-->
@@ -25,10 +25,14 @@
                             </items>
                             <color key="backgroundColor" red="1" green="0.50196081400000003" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         </group>
+                        <label alignment="center" text="Device" minimumScaleFactor="0.5" id="49V-Pa-KtO">
+                            <fontDescription key="font" style="UICTFontTextStyleFootnote"/>
+                        </label>
                         <label alignment="right" verticalAlignment="center" text="Height" id="JRJ-ts-6eX"/>
                         <label alignment="center" verticalAlignment="bottom" text="Width" id="bUp-Kd-mbY"/>
                     </items>
                     <connections>
+                        <outlet property="deviceLabel" destination="49V-Pa-KtO" id="mvl-I7-aX3"/>
                         <outlet property="halfInchGroup" destination="Z2X-2K-oFk" id="qgF-dd-usg"/>
                         <outlet property="heightLabel" destination="JRJ-ts-6eX" id="6pj-fz-Ger"/>
                         <outlet property="widthLabel" destination="bUp-Kd-mbY" id="mLn-MA-wAo"/>

Example/IRLSizeExample-Watch/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/IRLSizeExample.xcodeproj/project.pbxproj

@@ -410,7 +410,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = IRL;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Detroit Labs";
 				TargetAttributes = {
 					1F5EC3711D241DBF0068E86F = {
@@ -422,7 +422,7 @@
 						ProvisioningStyle = Automatic;
 					};
 					6003F589195388D20070C39A = {
-						LastSwiftMigration = "";
+						LastSwiftMigration = 1020;
 					};
 					6003F5AD195388D20070C39A = {
 						ProvisioningStyle = Automatic;
@@ -431,7 +431,7 @@
 			};
 			buildConfigurationList = 6003F585195388D10070C39A /* Build configuration list for PBXProject "IRLSizeExample" */;
 			compatibilityVersion = "Xcode 8.0";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -711,6 +711,7 @@
 			baseConfigurationReference = 1F8A1FE821923170006ED4EC /* SigningSettings.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -767,6 +768,7 @@
 			baseConfigurationReference = 1F8A1FE821923170006ED4EC /* SigningSettings.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -827,7 +829,7 @@
 				PROVISIONING_PROFILE = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "IRLSizeExample/IRLSizeExample-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -847,7 +849,7 @@
 				PROVISIONING_PROFILE = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "IRLSizeExample/IRLSizeExample-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;

Example/IRLSizeExample.xcodeproj/xcshareddata/xcschemes/IRLSizeExample 🇬🇧.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/IRLSizeExample.xcodeproj/xcshareddata/xcschemes/IRLSizeExample 🇺🇸.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/IRLSizeExample.xcodeproj/xcshareddata/xcschemes/IRLSizeExample-Watch.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/IRLSizeExample.xcodeproj/xcshareddata/xcschemes/IRLSizeExample.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/IRLSizeExample.xcodeproj/xcshareddata/xcschemes/IRLSizeTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/IRLSizeExample/IRLAppDelegate.h

@@ -3,7 +3,7 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 11/13/2014.
-//  Copyright © 2018 Detroit Labs. All rights reserved.
+//  Copyright © 2019 Detroit Labs. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Example/IRLSizeExample/IRLAppDelegate.m

@@ -3,7 +3,7 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 11/13/2014.
-//  Copyright © 2018 Detroit Labs. All rights reserved.
+//  Copyright © 2019 Detroit Labs. All rights reserved.
 //
 
 #import "IRLAppDelegate.h"

Example/IRLSizeExample/IRLSizeExample-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/IRLSizeExample/IRLSizeExampleConstants.h

@@ -3,7 +3,7 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 11/16/18.
-//  Copyright © 2018 Detroit Labs. All rights reserved.
+//  Copyright © 2019 Detroit Labs. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Example/IRLSizeExample/IRLSizeExampleConstants.m

@@ -3,7 +3,7 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 11/16/18.
-//  Copyright © 2018 Detroit Labs. All rights reserved.
+//  Copyright © 2019 Detroit Labs. All rights reserved.
 //
 
 #import "IRLSizeExampleConstants.h"

Example/IRLSizeExample/IRLViewController.h

@@ -3,7 +3,7 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 11/13/2014.
-//  Copyright © 2018 Detroit Labs. All rights reserved.
+//  Copyright © 2019 Detroit Labs. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

Example/IRLSizeExample/IRLViewController.m

@@ -3,12 +3,13 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 11/13/2014.
-//  Copyright © 2018 Detroit Labs. All rights reserved.
+//  Copyright © 2019 Detroit Labs. All rights reserved.
 //
 
 #import "IRLViewController.h"
 
 #import <IRLSize/IRLSize.h>
+#import <Orchard/Orchard.h>
 
 #import "IRLSizeExample-Swift.h"
 
@@ -21,7 +22,7 @@ @interface IRLViewController ()
 
 @property (weak, nonatomic) IBOutlet UIView *rulerContainerView;
 @property (weak, nonatomic) IBOutlet UIView *rulerView;
-
+@property (weak, nonatomic) IBOutlet UILabel *deviceLabel;
 @property (weak, nonatomic) IBOutlet UILabel *widthLabel;
 @property (weak, nonatomic) IBOutlet UILabel *heightLabel;
 
@@ -40,6 +41,7 @@ - (void)viewDidLoad
     [super viewDidLoad];
 
     if (@available(iOS 10.0, *)) {
+        self.deviceLabel.adjustsFontForContentSizeCategory = YES;
         self.widthLabel.adjustsFontForContentSizeCategory = YES;
         self.heightLabel.adjustsFontForContentSizeCategory = YES;
     }
@@ -124,6 +126,9 @@ - (void)configureLabels
 
     self.widthLabel.text = widthString;
     self.heightLabel.text = heightString;
+
+    OrchardiOSDevice device = [UIDevice.currentDevice orchardiOSDevice];
+    self.deviceLabel.text = OrchardMarketingNameForiOSDevice(device);
 }
 
 @end

Example/IRLSizeExample/Launch Screen.xib

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina6_5" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -15,8 +11,8 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2018 Detroit Labs. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="862.66666666666663" width="374" height="13.333333333333371"/>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2019 Detroit Labs. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="855.5" width="374" height="20.5"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
@@ -25,7 +21,7 @@
                     </variation>
                 </label>
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="IRLSizeExample" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="277.33333333333331" width="374" height="43"/>
+                    <rect key="frame" x="20" y="277" width="374" height="43"/>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>