Fix warnings in Xcode 7

Modernize project for Xcode 7
mutualmobile · Sep 19, 2015 · 8ad325d · 8ad325d
1 parent 7996a61
commit 8ad325d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 27 deletions.
diff --git a/Demo/LogicTests/LogicTests-Info.plist b/Demo/LogicTests/LogicTests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.mutualmobile.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

diff --git a/Demo/LogicTests/MMProgressHUDTests.m b/Demo/LogicTests/MMProgressHUDTests.m
@@ -190,10 +190,10 @@ - (void)testGlowAnimationGroupNotNil{
 - (void)testGlowAnimationGroupContainsProperSubAnimations{
     CAAnimationGroup *glowAnimation = [self.progressHUD _glowAnimation];
 
-    NSUInteger animationCount = glowAnimation.animations.count;
-    NSUInteger validNumerOfAnimations = 3;
+    NSInteger animationCount = glowAnimation.animations.count;
+    NSInteger validNumerOfAnimations = 3;
 
-    XCTAssertTrue(animationCount == validNumerOfAnimations, @"Number of animations for glow should be %i, is %i", validNumerOfAnimations, animationCount);
+    XCTAssertTrue(animationCount == validNumerOfAnimations, @"Number of animations for glow should be %zd, is %zd", validNumerOfAnimations, animationCount);
 }
 
 - (void)testGlowAnimationGroupGetsAdded{

diff --git a/Demo/MMProgressHUDDemo.xcodeproj/project.pbxproj b/Demo/MMProgressHUDDemo.xcodeproj/project.pbxproj
@@ -275,7 +275,6 @@
 				69DA08C3158261EE000DC29E /* Sources */,
 				69DA08C4158261EE000DC29E /* Frameworks */,
 				69DA08C5158261EE000DC29E /* Resources */,
-				69DA08C6158261EE000DC29E /* ShellScript */,
 				81445B9F2CEBFE8914AB4D50 /* Copy Pods Resources */,
 			);
 			buildRules = (
@@ -296,7 +295,7 @@
 			attributes = {
 				CLASSPREFIX = MM;
 				LastTestingUpgradeCheck = 0610;
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Mutual Mobile";
 				TargetAttributes = {
 					69DA08C7158261EE000DC29E = {
@@ -392,19 +391,6 @@
 			shellPath = /bin/sh;
 			shellScript = "KEYWORDS=\"TODO:|FIXME:|\\?\\?\\?:|\\!\\!\\!:\"\nfind \"${SRCROOT}/..\" \\( -name \"*.h\" -or -name \"*.m\" \\) -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($KEYWORDS).*\\$\" | perl -p -e \"s/($KEYWORDS)/ warning: \\$1/\"";
 		};
-		69DA08C6158261EE000DC29E /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
-		};
 		81445B9F2CEBFE8914AB4D50 /* Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -505,6 +491,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -583,6 +570,7 @@
 				INFOPLIST_FILE = "MMProgressHUDDemo/MMProgressHUDDemo-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				OTHER_LDFLAGS = "$(inherited)";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mutualmobile.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				VALID_ARCHS = "$(ARCHS_STANDARD)";
@@ -619,6 +607,7 @@
 				INFOPLIST_FILE = "MMProgressHUDDemo/MMProgressHUDDemo-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				OTHER_LDFLAGS = "$(inherited)";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mutualmobile.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				VALID_ARCHS = "$(ARCHS_STANDARD)";
@@ -661,6 +650,7 @@
 					"$(PROJECT_DIR)/Pods/build/Debug-iphoneos",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mutualmobile.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MMProgressHUDDemo.app/MMProgressHUDDemo";
 				VALID_ARCHS = "$(ARCHS_STANDARD)";
@@ -692,6 +682,7 @@
 					"$(PROJECT_DIR)/Pods/build/Debug-iphoneos",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mutualmobile.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MMProgressHUDDemo.app/MMProgressHUDDemo";
 				VALID_ARCHS = "$(ARCHS_STANDARD)";

diff --git a/Demo/MMProgressHUDDemo.xcodeproj/xcshareddata/xcschemes/MMProgressHUDDemo.xcscheme b/Demo/MMProgressHUDDemo.xcodeproj/xcshareddata/xcschemes/MMProgressHUDDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,17 +23,18 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "69DA08C7158261EE000DC29E"
-               BuildableName = "LogicTests.octest"
+               BuildableName = "LogicTests.xctest"
                BlueprintName = "LogicTests"
                ReferencedContainer = "container:MMProgressHUDDemo.xcodeproj">
             </BuildableReference>
@@ -48,15 +49,18 @@
             ReferencedContainer = "container:MMProgressHUDDemo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -72,10 +76,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

diff --git a/Demo/MMProgressHUDDemo/MMProgressHUDDemo-Info.plist b/Demo/MMProgressHUDDemo/MMProgressHUDDemo-Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleIcons~ipad</key>
 	<dict/>
 	<key>CFBundleIdentifier</key>
-	<string>com.mutualmobile.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/Demo/MMProgressHUDDemo/MMViewController.m b/Demo/MMProgressHUDDemo/MMViewController.m
@@ -75,7 +75,7 @@ - (BOOL)shouldAutorotate{
     return YES;
 }
 
-- (NSUInteger)supportedInterfaceOrientations{
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations{
     return UIInterfaceOrientationMaskAllButUpsideDown;
 }
 

diff --git a/Source/MMProgressHUDViewController.m b/Source/MMProgressHUDViewController.m
@@ -78,7 +78,7 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfa
     }
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     MMProgressHUDWindow *win = (MMProgressHUDWindow *)self.view.window;
     UIViewController *rootViewController = win.oldWindow.rootViewController;