Merge branch 'release-1.5.6'

Cocoanetics · Jul 7, 2015 · 1a1dc73 · 1a1dc73
2 parents 7129fa4 + 29f014a
commit 1a1dc73
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Core/Source/DTLoupeView.m b/Core/Source/DTLoupeView.m
@@ -260,6 +260,7 @@ - (UIInterfaceOrientation)_inferredInterfaceOrientation
 
 	// try interface orientation of root view controller next
 	// note: going to be removed in iOS 9
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_8_0
 	if ([_targetView.window.rootViewController respondsToSelector:@selector(interfaceOrientation)])
 	{
 		orientation = _targetView.window.rootViewController.interfaceOrientation;
@@ -269,6 +270,7 @@ - (UIInterfaceOrientation)_inferredInterfaceOrientation
 			return orientation;
 		}
 	}
+#endif
 
 	// last resort, get it from device, might fail for face up and face down
 	UIDeviceOrientation deviceOrientation = [[UIDevice currentDevice] orientation];

diff --git a/DTLoupe.xcodeproj/project.pbxproj b/DTLoupe.xcodeproj/project.pbxproj
@@ -34,7 +34,7 @@
 		A7D8FEFB14E1699F00BF8CCD /* AppleLoupeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A7D8FEF814E1699F00BF8CCD /* AppleLoupeView.xib */; };
 		A7D8FEFC14E1699F00BF8CCD /* LoupeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A7D8FEF914E1699F00BF8CCD /* LoupeView.xib */; };
 		A7D8FEFD14E1699F00BF8CCD /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A7D8FEFA14E1699F00BF8CCD /* MainWindow.xib */; };
-		A7D8FF1214E169E500BF8CCD /* DTLoupeView.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8FF0E14E169E500BF8CCD /* DTLoupeView.h */; };
+		A7D8FF1214E169E500BF8CCD /* DTLoupeView.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8FF0E14E169E500BF8CCD /* DTLoupeView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A7D8FF1314E169E500BF8CCD /* DTLoupeView.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D8FF0F14E169E500BF8CCD /* DTLoupeView.m */; };
 		A7D8FF1814E16A2400BF8CCD /* LoupeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D8FF1714E16A2400BF8CCD /* LoupeViewController.m */; };
 		A7D8FF1B14E16A6000BF8CCD /* SnappySlider.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D8FF1A14E16A6000BF8CCD /* SnappySlider.m */; };
@@ -582,6 +582,7 @@
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = DTLoupe;
+				PUBLIC_HEADERS_FOLDER_PATH = ../../DTLoupeView;
 				SKIP_INSTALL = YES;
 			};
 			name = Debug;
@@ -604,6 +605,7 @@
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = DTLoupe;
+				PUBLIC_HEADERS_FOLDER_PATH = ../../DTLoupeView;
 				SKIP_INSTALL = YES;
 				VALIDATE_PRODUCT = YES;
 			};

diff --git a/Documentation/Change Log-template.markdown b/Documentation/Change Log-template.markdown
@@ -6,6 +6,7 @@ This is the history of version updates.
 Version 1.5.6
 
 - FIXED: Invalid layer geometry might cause crash
+- FIXED: iOS 8 deprecation warning about using interfaceOrientation 
 
 Version 1.5.5