From 5f435c4f5252987165292e24406ebce2c57cd284 Mon Sep 17 00:00:00 2001 From: Dani Arnaout Date: Mon, 4 Jul 2016 22:57:36 +0300 Subject: [PATCH] Fix build fail & all warnings on Xcode 7+ --- .../project.pbxproj | 10 ++++++++-- .../GGFullScreenImageViewController.m | 3 ++- .../GGFullscreenImageViewController-Info.plist | 2 +- GGFullscreenImageViewController/ViewController.m | 2 +- .../GGFullscreenImageViewControllerTests-Info.plist | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/GGFullscreenImageViewController.xcodeproj/project.pbxproj b/GGFullscreenImageViewController.xcodeproj/project.pbxproj index 3feb56b..9973370 100644 --- a/GGFullscreenImageViewController.xcodeproj/project.pbxproj +++ b/GGFullscreenImageViewController.xcodeproj/project.pbxproj @@ -211,7 +211,7 @@ name = GGFullscreenImageViewControllerTests; productName = GGFullscreenImageViewControllerTests; productReference = 72E4F78F17154F9600644B6C /* GGFullscreenImageViewControllerTests.octest */; - productType = "com.apple.product-type.bundle"; + productType = "com.apple.product-type.bundle.ocunit-test"; }; /* End PBXNativeTarget section */ @@ -219,7 +219,8 @@ 72E4F76117154F9600644B6C /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastTestingUpgradeCheck = 0730; + LastUpgradeCheck = 0730; ORGANIZATIONNAME = "John Wu"; }; buildConfigurationList = 72E4F76417154F9600644B6C /* Build configuration list for PBXProject "GGFullscreenImageViewController" */; @@ -354,6 +355,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -402,6 +404,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "GGFullscreenImageViewController/GGFullscreenImageViewController-Prefix.pch"; INFOPLIST_FILE = "GGFullscreenImageViewController/GGFullscreenImageViewController-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.tfm.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -413,6 +416,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "GGFullscreenImageViewController/GGFullscreenImageViewController-Prefix.pch"; INFOPLIST_FILE = "GGFullscreenImageViewController/GGFullscreenImageViewController-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.tfm.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -429,6 +433,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "GGFullscreenImageViewController/GGFullscreenImageViewController-Prefix.pch"; INFOPLIST_FILE = "GGFullscreenImageViewControllerTests/GGFullscreenImageViewControllerTests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.tfm.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = octest; @@ -446,6 +451,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "GGFullscreenImageViewController/GGFullscreenImageViewController-Prefix.pch"; INFOPLIST_FILE = "GGFullscreenImageViewControllerTests/GGFullscreenImageViewControllerTests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.tfm.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = octest; diff --git a/GGFullscreenImageViewController/GGFullScreenImageViewController.m b/GGFullscreenImageViewController/GGFullScreenImageViewController.m index 0d246df..a348360 100644 --- a/GGFullscreenImageViewController/GGFullScreenImageViewController.m +++ b/GGFullscreenImageViewController/GGFullScreenImageViewController.m @@ -26,6 +26,7 @@ static inline GGOrientation convertOrientation(UIInterfaceOrientation orientatio return GGOrientationLandscapeRight; break; default: + return GGOrientationPortrait; break; } } @@ -284,7 +285,7 @@ - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceO } -- (NSUInteger) supportedInterfaceOrientations { +- (UIInterfaceOrientationMask) supportedInterfaceOrientations { return self.supportedOrientations; } diff --git a/GGFullscreenImageViewController/GGFullscreenImageViewController-Info.plist b/GGFullscreenImageViewController/GGFullscreenImageViewController-Info.plist index 2e3c475..5b17076 100644 --- a/GGFullscreenImageViewController/GGFullscreenImageViewController-Info.plist +++ b/GGFullscreenImageViewController/GGFullscreenImageViewController-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.tfm.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/GGFullscreenImageViewController/ViewController.m b/GGFullscreenImageViewController/ViewController.m index ae228d4..7235ce9 100644 --- a/GGFullscreenImageViewController/ViewController.m +++ b/GGFullscreenImageViewController/ViewController.m @@ -38,7 +38,7 @@ - (void)didReceiveMemoryWarning // Dispose of any resources that can be recreated. } -- (NSUInteger) supportedInterfaceOrientations { +- (UIInterfaceOrientationMask) supportedInterfaceOrientations { return UIInterfaceOrientationMaskPortrait; } diff --git a/GGFullscreenImageViewControllerTests/GGFullscreenImageViewControllerTests-Info.plist b/GGFullscreenImageViewControllerTests/GGFullscreenImageViewControllerTests-Info.plist index 353e59d..169b6f7 100644 --- a/GGFullscreenImageViewControllerTests/GGFullscreenImageViewControllerTests-Info.plist +++ b/GGFullscreenImageViewControllerTests/GGFullscreenImageViewControllerTests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.tfm.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType