Merge pull request #18 from detroit-labs/2.0.0

2.0.0: The Millimeter Release
detroit-labs · Nov 6, 2018 · d423506 · d423506
2 parents c9fb8e8 + 6014a3e
commit d423506
Show file tree

Hide file tree

Showing 46 changed files with 965 additions and 2,034 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,6 @@ DerivedData
 
 # Bundler
 .bundle
+
+# Code Signing Settings
+Example/DevelopmentTeam.xcconfig
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode10.0
 cache: cocoapods
 podfile: Example/Podfile
 notifications:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,16 @@
+# IRLSize Change Log
+
+## [2.0.0](https://github.com/detroit-labs/IRLSize/releases/tag/2.0.0)
+**Released:** 2018-11-06
+
+### Breaking Changes
+  - Renamed `IRLRawLengthMeasurement` to `IRLRawMillimeters`
+  - All measurements are now in terms of millimeters
+  - Updated deployment target to iOS 10.0 and watchOS 3.0.
+
+### Updated
+  - Re-sourced all device size data from [official Apple documentation](https://developer.apple.com/accessories)
+  - Refactored test suite to have much less repeated code.
+
+### Fixed
+  - Fixed incorrect values for landscape devices
diff --git a/Example/IRLSizeExample-Watch Extension/ExtensionDelegate.h b/Example/IRLSizeExample-Watch Extension/ExtensionDelegate.h
@@ -3,7 +3,7 @@
 //  IRLSizeExample-Watch Extension
 //
 //  Created by Jeff Kelley on 6/29/2016.
-//  Copyright © 2017 Detroit Labs. All rights reserved.
+//  Copyright © 2018 Detroit Labs. All rights reserved.
 //
 
 #import <WatchKit/WatchKit.h>

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

diff --git a/Example/IRLSizeExample-Watch Extension/Info.plist b/Example/IRLSizeExample-Watch Extension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

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

diff --git a/Example/IRLSizeExample-Watch Extension/InterfaceController.m b/Example/IRLSizeExample-Watch Extension/InterfaceController.m
@@ -3,7 +3,7 @@
 //  IRLSizeExample-Watch Extension
 //
 //  Created by Jeff Kelley on 6/29/2016.
-//  Copyright © 2017 Detroit Labs. All rights reserved.
+//  Copyright © 2018 Detroit Labs. All rights reserved.
 //
 
 #import "InterfaceController.h"

diff --git a/Example/IRLSizeExample-Watch/Info.plist b/Example/IRLSizeExample-Watch/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Example/IRLSizeExample.xcodeproj/project.pbxproj b/Example/IRLSizeExample.xcodeproj/project.pbxproj
@@ -99,16 +99,18 @@
 		1F5EC3871D241DBF0068E86F /* ExtensionDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExtensionDelegate.m; sourceTree = "<group>"; };
 		1F5EC3891D241DBF0068E86F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		1F5EC38B1D241DBF0068E86F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		1F8A1FE821923170006ED4EC /* SigningSettings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SigningSettings.xcconfig; sourceTree = "<group>"; };
 		1FBC8FD31D236DFD00015A75 /* IRLSizeExample-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "IRLSizeExample-Bridging-Header.h"; sourceTree = "<group>"; };
 		1FBC8FD41D236DFD00015A75 /* RulerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RulerView.swift; sourceTree = "<group>"; };
 		1FC7E2001D5F99D400274C2A /* NSMeasurement+Equality.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMeasurement+Equality.h"; sourceTree = "<group>"; };
 		1FC7E2011D5F99D400274C2A /* NSMeasurement+Equality.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMeasurement+Equality.m"; sourceTree = "<group>"; };
 		1FC7E2031D5F9EB500274C2A /* IRLMeasurementBeWithinMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRLMeasurementBeWithinMatcher.h; sourceTree = "<group>"; };
 		1FC7E2041D5F9EB500274C2A /* IRLMeasurementBeWithinMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IRLMeasurementBeWithinMatcher.m; sourceTree = "<group>"; };
+		1FD4587321913DD500982651 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../CHANGELOG.md; sourceTree = "<group>"; };
 		2D7A6FA6D99E271DC58A3FDB /* Pods-IRLSizeExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IRLSizeExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-IRLSizeExample/Pods-IRLSizeExample.release.xcconfig"; sourceTree = "<group>"; };
 		3B52ABAB0F4897702004A1C3 /* Pods-IRLSizeExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IRLSizeExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IRLSizeExample/Pods-IRLSizeExample.debug.xcconfig"; sourceTree = "<group>"; };
 		3F468B881C59569556F61E7D /* Pods-IRLSizeExample-Watch Extension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IRLSizeExample-Watch Extension.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IRLSizeExample-Watch Extension/Pods-IRLSizeExample-Watch Extension.debug.xcconfig"; sourceTree = "<group>"; };
-		41B6AD569D60E1A0310A509C /* IRLSize.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = IRLSize.podspec; path = ../IRLSize.podspec; sourceTree = "<group>"; };
+		41B6AD569D60E1A0310A509C /* IRLSize.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = IRLSize.podspec; path = ../IRLSize.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		5BEF1258540BA1981AF80DB5 /* libPods-IRLSizeExample-Watch Extension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-IRLSizeExample-Watch Extension.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6003F58A195388D20070C39A /* IRLSizeExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = IRLSizeExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -199,6 +201,8 @@
 		6003F581195388D10070C39A = {
 			isa = PBXGroup;
 			children = (
+				1F8A1FE821923170006ED4EC /* SigningSettings.xcconfig */,
+				1FD4587321913DD500982651 /* CHANGELOG.md */,
 				60FF7A9C1954A5C5007DD14C /* Podspec Metadata */,
 				6003F593195388D20070C39A /* IRLSizeExample */,
 				6003F5B5195388D20070C39A /* IRLSizeTests */,
@@ -270,7 +274,8 @@
 				6003F5BB195388D20070C39A /* IRLSizeTests.m */,
 				6003F5B6195388D20070C39A /* Supporting Files */,
 			);
-			path = IRLSizeTests;
+			name = IRLSizeTests;
+			path = ../IRLSizeTests;
 			sourceTree = SOURCE_ROOT;
 		};
 		6003F5B6195388D20070C39A /* Supporting Files */ = {
@@ -686,6 +691,7 @@
 		};
 		6003F5BD195388D20070C39A /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1F8A1FE821923170006ED4EC /* SigningSettings.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -740,6 +746,7 @@
 		};
 		6003F5BE195388D20070C39A /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1F8A1FE821923170006ED4EC /* SigningSettings.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -839,7 +846,7 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = "IRLSizeTests/IRLSizeTests-Info.plist";
+				INFOPLIST_FILE = "../IRLSizeTests/IRLSizeTests-Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.detroitlabs.demo.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = xctest;
@@ -855,7 +862,7 @@
 					"$(inherited)",
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
-				INFOPLIST_FILE = "IRLSizeTests/IRLSizeTests-Info.plist";
+				INFOPLIST_FILE = "../IRLSizeTests/IRLSizeTests-Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.detroitlabs.demo.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = xctest;

diff --git a/Example/IRLSizeExample/IRLAppDelegate.h b/Example/IRLSizeExample/IRLAppDelegate.h
@@ -3,7 +3,7 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 11/13/2014.
-//  Copyright © 2017 Detroit Labs. All rights reserved.
+//  Copyright © 2018 Detroit Labs. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Example/IRLSizeExample/IRLAppDelegate.m b/Example/IRLSizeExample/IRLAppDelegate.m
@@ -3,7 +3,7 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 11/13/2014.
-//  Copyright © 2017 Detroit Labs. All rights reserved.
+//  Copyright © 2018 Detroit Labs. All rights reserved.
 //
 
 #import "IRLAppDelegate.h"

diff --git a/Example/IRLSizeExample/IRLSizeExample-Info.plist b/Example/IRLSizeExample/IRLSizeExample-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Example/IRLSizeExample/IRLViewController.h b/Example/IRLSizeExample/IRLViewController.h
@@ -3,7 +3,7 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 11/13/2014.
-//  Copyright © 2017 Detroit Labs. All rights reserved.
+//  Copyright © 2018 Detroit Labs. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Example/IRLSizeExample/IRLViewController.m b/Example/IRLSizeExample/IRLViewController.m
@@ -3,7 +3,7 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 11/13/2014.
-//  Copyright © 2017 Detroit Labs. All rights reserved.
+//  Copyright © 2018 Detroit Labs. All rights reserved.
 //
 
 #import "IRLViewController.h"

diff --git a/Example/IRLSizeExample/Launch Screen.xib b/Example/IRLSizeExample/Launch Screen.xib
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
+<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="12088"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <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 © 2017 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="633.5" width="335" height="13.5"/>
+                <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"/>
                     <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"/>
@@ -26,7 +25,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="202" width="335" height="43"/>
+                    <rect key="frame" x="20" y="278.33333333333331" 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"/>

diff --git a/Example/IRLSizeExample/RulerView.swift b/Example/IRLSizeExample/RulerView.swift
@@ -3,7 +3,7 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 6/28/2016.
-//  Copyright © 2017 Detroit Labs. All rights reserved.
+//  Copyright © 2018 Detroit Labs. All rights reserved.
 //
 
 import Foundation

diff --git a/Example/IRLSizeExample/main.m b/Example/IRLSizeExample/main.m
@@ -3,7 +3,7 @@
 //  IRLSizeExample
 //
 //  Created by Jeff Kelley on 11/13/2014.
-//  Copyright © 2017 Detroit Labs. All rights reserved.
+//  Copyright © 2018 Detroit Labs. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>