From 8c14b9265c60d74e727128bb9a9b13184013f8da Mon Sep 17 00:00:00 2001 From: joshaber Date: Fri, 16 Jan 2015 15:10:13 -0500 Subject: [PATCH 1/2] ++xcconfigs --- Cartfile.private | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/xcconfigs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 2aeb82b42..3ea4e900d 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ -github "jspahrsummers/xcconfigs" >= 0.7 +github "jspahrsummers/xcconfigs" >= 0.7.1 github "Quick/Quick" ~> 0.2 github "Quick/Nimble" ~> 0.2 diff --git a/Cartfile.resolved b/Cartfile.resolved index 0961ae602..c83ad3125 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ github "Quick/Nimble" "v0.2.0" github "Quick/Quick" "v0.2.2" -github "jspahrsummers/xcconfigs" "0.7" +github "jspahrsummers/xcconfigs" "0.7.1" diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs index 6c6423856..b09b4b632 160000 --- a/Carthage/Checkouts/xcconfigs +++ b/Carthage/Checkouts/xcconfigs @@ -1 +1 @@ -Subproject commit 6c64238566ef1126f1b7994aa9e6719229c50451 +Subproject commit b09b4b63235b760a3a48a8dd19c0415aaaa8f269 From 025579da82d8c30b38da7a4abd964ff71042d63a Mon Sep 17 00:00:00 2001 From: joshaber Date: Fri, 16 Jan 2015 15:10:20 -0500 Subject: [PATCH 2/2] OK Computer --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 3 ++- .../xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme | 2 +- .../xcshareddata/xcschemes/ObjectiveGit iOS.xcscheme | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 74bbf406c..009d9faeb 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1127,7 +1127,7 @@ isa = PBXProject; attributes = { LastTestingUpgradeCheck = 0510; - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0620; ORGANIZATIONNAME = "GitHub, Inc"; TargetAttributes = { D01B6ED219F82E2000D411BC = { @@ -1502,6 +1502,7 @@ External, ); MACOSX_DEPLOYMENT_TARGET = 10.8; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme index fe89b52dd..15a90201b 100644 --- a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme @@ -1,6 +1,6 @@