diff --git a/.gitignore b/.gitignore index 0e1f044..6cf16b2 100644 --- 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 index 609768a..693dd61 100644 --- 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 new file mode 100644 index 0000000..8f96989 --- /dev/null +++ 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 index 1f14302..cc8ca88 100644 --- 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 diff --git a/Example/IRLSizeExample-Watch Extension/ExtensionDelegate.m b/Example/IRLSizeExample-Watch Extension/ExtensionDelegate.m index d92ba4a..23e7ac1 100644 --- 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 index ee0d154..f662752 100644 --- a/Example/IRLSizeExample-Watch Extension/Info.plist +++ b/Example/IRLSizeExample-Watch Extension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.3.0 + 2.0.0 CFBundleSignature ???? CFBundleVersion diff --git a/Example/IRLSizeExample-Watch Extension/InterfaceController.h b/Example/IRLSizeExample-Watch Extension/InterfaceController.h index 57295bb..7b6d7e6 100644 --- 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 diff --git a/Example/IRLSizeExample-Watch Extension/InterfaceController.m b/Example/IRLSizeExample-Watch Extension/InterfaceController.m index fd282b4..ef460a9 100644 --- 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 index 8c6cd2e..8674790 100644 --- a/Example/IRLSizeExample-Watch/Info.plist +++ b/Example/IRLSizeExample-Watch/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.3.0 + 2.0.0 CFBundleSignature ???? CFBundleVersion diff --git a/Example/IRLSizeExample.xcodeproj/project.pbxproj b/Example/IRLSizeExample.xcodeproj/project.pbxproj index b02a675..ff04763 100644 --- 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 = ""; }; 1F5EC3891D241DBF0068E86F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 1F5EC38B1D241DBF0068E86F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 1F8A1FE821923170006ED4EC /* SigningSettings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SigningSettings.xcconfig; sourceTree = ""; }; 1FBC8FD31D236DFD00015A75 /* IRLSizeExample-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "IRLSizeExample-Bridging-Header.h"; sourceTree = ""; }; 1FBC8FD41D236DFD00015A75 /* RulerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RulerView.swift; sourceTree = ""; }; 1FC7E2001D5F99D400274C2A /* NSMeasurement+Equality.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMeasurement+Equality.h"; sourceTree = ""; }; 1FC7E2011D5F99D400274C2A /* NSMeasurement+Equality.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMeasurement+Equality.m"; sourceTree = ""; }; 1FC7E2031D5F9EB500274C2A /* IRLMeasurementBeWithinMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRLMeasurementBeWithinMatcher.h; sourceTree = ""; }; 1FC7E2041D5F9EB500274C2A /* IRLMeasurementBeWithinMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IRLMeasurementBeWithinMatcher.m; sourceTree = ""; }; + 1FD4587321913DD500982651 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../CHANGELOG.md; sourceTree = ""; }; 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 = ""; }; 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 = ""; }; 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 = ""; }; - 41B6AD569D60E1A0310A509C /* IRLSize.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = IRLSize.podspec; path = ../IRLSize.podspec; sourceTree = ""; }; + 41B6AD569D60E1A0310A509C /* IRLSize.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = IRLSize.podspec; path = ../IRLSize.podspec; sourceTree = ""; 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 index 33ebb63..c6f367a 100644 --- 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 diff --git a/Example/IRLSizeExample/IRLAppDelegate.m b/Example/IRLSizeExample/IRLAppDelegate.m index 35ff222..0f2f932 100644 --- 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 index 7f768bd..0633b67 100644 --- a/Example/IRLSizeExample/IRLSizeExample-Info.plist +++ b/Example/IRLSizeExample/IRLSizeExample-Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.3.0 + 2.0.0 CFBundleSignature ???? CFBundleVersion diff --git a/Example/IRLSizeExample/IRLViewController.h b/Example/IRLSizeExample/IRLViewController.h index a0d37a9..8220de7 100644 --- 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 diff --git a/Example/IRLSizeExample/IRLViewController.m b/Example/IRLSizeExample/IRLViewController.m index 025fc11..cf34589 100644 --- 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 index 1c76273..59d9d3a 100644 --- a/Example/IRLSizeExample/Launch Screen.xib +++ b/Example/IRLSizeExample/Launch Screen.xib @@ -1,23 +1,22 @@ - - + + - - + - + -