Browse files

Merge pull request #39 from alanjrogers/xcode7

Silence Xcode 7 warnings.
  • Loading branch information...
2 parents 90bf632 + 9793575 commit 063bcccf1abc7b53871d21d790bce06718c38ec0 @robb robb committed Sep 21, 2015
View
7 Archimedes.xcodeproj/project.pbxproj
@@ -440,7 +440,7 @@
isa = PBXProject;
attributes = {
LastTestingUpgradeCheck = 0510;
- LastUpgradeCheck = 0620;
+ LastUpgradeCheck = 0700;
ORGANIZATIONNAME = GitHub;
TargetAttributes = {
D038E05A19DDC7A200ABCE67 = {
@@ -584,6 +584,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D038E04219DDC74A00ABCE67 /* Debug.xcconfig */;
buildSettings = {
+ ENABLE_TESTABILITY = YES;
+ GCC_NO_COMMON_BLOCKS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
@@ -595,6 +597,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D038E04419DDC74A00ABCE67 /* Release.xcconfig */;
buildSettings = {
+ GCC_NO_COMMON_BLOCKS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.8;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -605,6 +608,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D038E04319DDC74A00ABCE67 /* Profile.xcconfig */;
buildSettings = {
+ GCC_NO_COMMON_BLOCKS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.8;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -823,6 +827,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D038E04519DDC74A00ABCE67 /* Test.xcconfig */;
buildSettings = {
+ GCC_NO_COMMON_BLOCKS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.8;
TARGETED_DEVICE_FAMILY = "1,2";
View
13 Archimedes.xcodeproj/xcshareddata/xcschemes/Archimedes Mac.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0620"
+ LastUpgradeVersion = "0700"
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:Archimedes.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">
<MacroExpansion>
<BuildableReference
@@ -85,10 +88,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
+ buildConfiguration = "Profile"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Profile"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
View
13 Archimedes.xcodeproj/xcshareddata/xcschemes/Archimedes iOS.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0620"
+ LastUpgradeVersion = "0700"
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:Archimedes.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">
<MacroExpansion>
<BuildableReference
@@ -85,10 +88,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
+ buildConfiguration = "Profile"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Profile"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
View
2 Archimedes/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
- <string>com.github.$(PRODUCT_NAME:rfc1034identifier)</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
View
2 ArchimedesTests/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
- <string>com.github.$(PRODUCT_NAME:rfc1034identifier)</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
View
4 Cartfile.resolved
@@ -1,3 +1,3 @@
github "Quick/Nimble" "v0.2.0"
-github "Quick/Quick" "v0.2.2"
-github "jspahrsummers/xcconfigs" "0.7.1"
+github "Quick/Quick" "v0.2.3"
+github "jspahrsummers/xcconfigs" "0.8.1"
2 Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit b0e98286db7e9d1f1e73cd4e69eac2aae2a1e3f8
+Subproject commit ce729620fa9db8d3c76b69bbfc429cece97dbe36
2 Carthage/Checkouts/xcconfigs
@@ -1 +1 @@
-Subproject commit b09b4b63235b760a3a48a8dd19c0415aaaa8f269
+Subproject commit 99624a6af366c015b678a1135e4c558776a59be6

0 comments on commit 063bccc

Please sign in to comment.