Upgrade to Xcode 7

binaryage · Jun 14, 2015 · 263fe1d · 263fe1d
1 parent 2ccd4dc
commit 263fe1d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/Asepsis.xcodeproj/xcshareddata/xcschemes/build.xcscheme b/Asepsis.xcodeproj/xcshareddata/xcschemes/build.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,6 +29,8 @@
       buildConfiguration = "Debug">
       <Testables>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -38,6 +40,7 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference

diff --git a/test/test.xcodeproj/project.pbxproj b/test/test.xcodeproj/project.pbxproj
@@ -86,7 +86,7 @@
 		D6138A7D13FA6A0F000019A2 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastUpgradeCheck = 0700;
 			};
 			buildConfigurationList = D6138A8013FA6A0F000019A2 /* Build configuration list for PBXProject "test" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -130,9 +130,11 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -169,6 +171,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;

diff --git a/wrapper/DesktopServicesPrivWrapper-Info.plist b/wrapper/DesktopServicesPrivWrapper-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.binaryage.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/wrapper/wrapper.xcodeproj/project.pbxproj b/wrapper/wrapper.xcodeproj/project.pbxproj
@@ -114,7 +114,7 @@
 		D67C33BE1560EAF3007E9A0A /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastUpgradeCheck = 0700;
 			};
 			buildConfigurationList = D67C33C11560EAF3007E9A0A /* Build configuration list for PBXProject "wrapper" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -247,6 +247,7 @@
 					DesktopServicesPriv,
 				);
 				OTHER_TEST_FLAGS = "-reexport_framework /System/Library/PrivateFrameworks/DesktopServicesPriv.framework/DesktopServicesPriv";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.binaryage.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = DesktopServicesPrivWrapper;
 			};
 			name = Debug;
@@ -275,6 +276,7 @@
 					DesktopServicesPriv,
 				);
 				OTHER_TEST_FLAGS = "-reexport_framework /System/Library/PrivateFrameworks/DesktopServicesPriv.framework/DesktopServicesPriv";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.binaryage.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = DesktopServicesPrivWrapper;
 			};
 			name = Release;