fix xcode 7 warnings

jcavar · Oct 31, 2015 · 34afd0f · 34afd0f
1 parent 3fad386
commit 34afd0f
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 24 deletions.
diff --git a/PullToRefresh.xcodeproj/project.pbxproj b/PullToRefresh.xcodeproj/project.pbxproj
@@ -296,7 +296,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0600;
+				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = "Josip Cavar";
 				TargetAttributes = {
 					C7AC6CCB19A7FE6D007107DF = {
@@ -443,6 +443,7 @@
 				INFOPLIST_FILE = Refresher/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "JCA.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -463,6 +464,7 @@
 				INFOPLIST_FILE = Refresher/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "JCA.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -483,6 +485,7 @@
 				);
 				INFOPLIST_FILE = RefresherTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "JCA.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PullToRefresh.app/PullToRefresh";
 			};
@@ -497,6 +500,7 @@
 				);
 				INFOPLIST_FILE = RefresherTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "JCA.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PullToRefresh.app/PullToRefresh";
 			};
@@ -522,6 +526,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -589,6 +594,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				INFOPLIST_FILE = "$(SRCROOT)/PullToRefreshDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "JCA.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -601,6 +607,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				INFOPLIST_FILE = "$(SRCROOT)/PullToRefreshDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "JCA.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

diff --git a/PullToRefresh.xcodeproj/xcshareddata/xcschemes/PullToRefresh.xcscheme b/PullToRefresh.xcodeproj/xcshareddata/xcschemes/PullToRefresh.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -48,17 +48,21 @@
             ReferencedContainer = "container:PullToRefresh.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>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C7D1CF8E199BB3C8009FD485"
@@ -71,12 +75,13 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C7D1CF8E199BB3C8009FD485"

diff --git a/PullToRefresh.xcodeproj/xcshareddata/xcschemes/Refresher.xcscheme b/PullToRefresh.xcodeproj/xcshareddata/xcschemes/Refresher.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:PullToRefresh.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -85,10 +88,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

diff --git a/PullToRefreshDemo/Info.plist b/PullToRefreshDemo/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>JCA.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/Refresher/Info.plist b/Refresher/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>JCA.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/RefresherTests/BouncesTests.swift b/RefresherTests/BouncesTests.swift
@@ -38,7 +38,7 @@ class BouncesTests: XCTestCase {
 
     func testScrollViewBouncesWhenFalse() {
 
-        var scrollView = UIScrollView()
+        let scrollView = UIScrollView()
         scrollView.bounces = false;
         scrollView.addPullToRefreshWithAction({ () -> () in
         })
@@ -50,7 +50,7 @@ class BouncesTests: XCTestCase {
 
     func testScrollViewBouncesWhenTrue() {
 
-        var scrollView = UIScrollView()
+        let scrollView = UIScrollView()
         scrollView.bounces = true;
         scrollView.addPullToRefreshWithAction({ () -> () in
         })

diff --git a/RefresherTests/FrameTests.swift b/RefresherTests/FrameTests.swift
@@ -38,7 +38,7 @@ class FrameTests: XCTestCase {
 
     func testPullToRefreshViewFrame() {
 
-        var scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: 100, height: 500))
+        let scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: 100, height: 500))
         scrollView.addPullToRefreshWithAction({ () -> () in
         })
         if (scrollView.pullToRefreshView != nil) {
@@ -51,7 +51,7 @@ class FrameTests: XCTestCase {
 
     func testPullToRefreshViewFrameWithInsets() {
 
-        var scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: 100, height: 500))
+        let scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: 100, height: 500))
         scrollView.contentInset = UIEdgeInsets(top: 40, left: 0, bottom: 0, right: 0)
         scrollView.addPullToRefreshWithAction({ () -> () in
         })
@@ -65,7 +65,7 @@ class FrameTests: XCTestCase {
 
     func testPullToRefreshViewFrameWhenStarted() {
 
-        var scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: 100, height: 500))
+        let scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: 100, height: 500))
         scrollView.addPullToRefreshWithAction({ () -> () in
         })
         scrollView.startPullToRefresh()
@@ -78,7 +78,7 @@ class FrameTests: XCTestCase {
 
     func testPullToRefreshViewOffsetWhenStarted() {
 
-        var scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: 100, height: 500))
+        let scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: 100, height: 500))
         scrollView.addPullToRefreshWithAction({ () -> () in
         })
         scrollView.startPullToRefresh()

diff --git a/RefresherTests/Info.plist b/RefresherTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>JCA.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/RefresherTests/LoadingTests.swift b/RefresherTests/LoadingTests.swift
@@ -38,7 +38,7 @@ class LoadingTests: XCTestCase {
 
     func testPullToRefreshViewLoading() {
 
-        var scrollView = UIScrollView()
+        let scrollView = UIScrollView()
         scrollView.addPullToRefreshWithAction({ () -> () in
         })
         scrollView.startPullToRefresh()
@@ -53,7 +53,7 @@ class LoadingTests: XCTestCase {
 
     func testPullToRefreshViewLoadingWithInsets() {
 
-        var scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: 100, height: 500))
+        let scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: 100, height: 500))
         scrollView.contentInset = UIEdgeInsets(top: 40, left: 0, bottom: 0, right: 0)
 
         scrollView.addPullToRefreshWithAction({ () -> () in