Skip to content

Commit

Permalink
Merge pull request #433 from libgit2/pacify-xcode
Browse files Browse the repository at this point in the history
Pacify Xcode
  • Loading branch information
jspahrsummers committed Jan 16, 2015
2 parents 492c6be + 025579d commit d3ecf14
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cartfile.private
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
3 changes: 2 additions & 1 deletion ObjectiveGitFramework.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@
isa = PBXProject;
attributes = {
LastTestingUpgradeCheck = 0510;
LastUpgradeCheck = 0510;
LastUpgradeCheck = 0620;
ORGANIZATIONNAME = "GitHub, Inc";
TargetAttributes = {
D01B6ED219F82E2000D411BC = {
Expand Down Expand Up @@ -1502,6 +1502,7 @@
External,
);
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
"-DGIT_SSH",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
LastUpgradeVersion = "0620"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
LastUpgradeVersion = "0620"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down

0 comments on commit d3ecf14

Please sign in to comment.