Skip to content

Commit 52b75ae

Browse files
tiennoutiennou
committed
Bump Xcode version
This updates the xconfigs, enables Swift 5, and fixes a few easy warnings/deprecations Xcode is worried about.
1 parent 43181da commit 52b75ae

File tree

7 files changed

+55
-38
lines changed

7 files changed

+55
-38
lines changed

‎Cartfile.private

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github "jspahrsummers/xcconfigs" "master"
2-
github "Quick/Quick" ~> 1.3.4
3-
github "Quick/Nimble" ~> 7.3.3
2+
github "Quick/Quick" ~> 2.1.0
3+
github "Quick/Nimble" ~> 8.0.1
44
github "ZipArchive/ZipArchive" ~> 2.1.4

‎Cartfile.resolved

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "Quick/Nimble" "v7.3.3"
2-
github "Quick/Quick" "v1.3.4"
3-
github "ZipArchive/ZipArchive" "v2.1.4"
4-
github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d"
1+
github "Quick/Nimble" "v8.1.2"
2+
github "Quick/Quick" "v2.2.1"
3+
github "ZipArchive/ZipArchive" "v2.2.3"
4+
github "jspahrsummers/xcconfigs" "4ced0ad5a971220917994a4edfa6abf9702e3818"

‎Carthage/Checkouts/Nimble

Submodule Nimble updated 128 files

‎Carthage/Checkouts/Quick

Submodule Quick updated 96 files

‎Carthage/Checkouts/ZipArchive

Submodule ZipArchive updated 159 files

‎Carthage/Checkouts/xcconfigs

‎ObjectiveGitFramework.xcodeproj/project.pbxproj

Lines changed: 45 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
30FDC08116835A8100654BF0 /* GTDiffLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 30FDC07E16835A8100654BF0 /* GTDiffLine.m */; };
9090
4D123240178E009E0048F785 /* GTRepositoryCommittingSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D12323F178E009E0048F785 /* GTRepositoryCommittingSpec.m */; };
9191
4D1C40D8182C006D00BE2960 /* GTBlobSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1C40D7182C006D00BE2960 /* GTBlobSpec.m */; };
92+
4D5AB893228742FE003CD3CE /* EXTScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 306123A917EA5261006591D4 /* EXTScope.h */; };
93+
4D5AB89422874300003CD3CE /* EXTScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 306123A917EA5261006591D4 /* EXTScope.h */; };
9294
4D79C0EE17DF9F4D00997DE4 /* GTCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D79C0EC17DF9F4D00997DE4 /* GTCredential.h */; settings = {ATTRIBUTES = (Public, ); }; };
9395
4D79C0EF17DF9F4D00997DE4 /* GTCredential.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D79C0ED17DF9F4D00997DE4 /* GTCredential.m */; };
9496
4D9BCD24206D84AD003CD3CE /* libgit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D9BCD23206D84AD003CD3CE /* libgit2.a */; };
@@ -487,6 +489,13 @@
487489
30FDC07E16835A8100654BF0 /* GTDiffLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTDiffLine.m; sourceTree = "<group>"; };
488490
4D12323F178E009E0048F785 /* GTRepositoryCommittingSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRepositoryCommittingSpec.m; sourceTree = "<group>"; };
489491
4D1C40D7182C006D00BE2960 /* GTBlobSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBlobSpec.m; sourceTree = "<group>"; };
492+
4D5AB88C22873EA3003CD3CE /* macOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Application.xcconfig"; sourceTree = "<group>"; };
493+
4D5AB88D22873EA3003CD3CE /* macOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Framework.xcconfig"; sourceTree = "<group>"; };
494+
4D5AB88E22873EA3003CD3CE /* macOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
495+
4D5AB88F22873EA3003CD3CE /* macOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Base.xcconfig"; sourceTree = "<group>"; };
496+
4D5AB89022873EA3003CD3CE /* macOS-XCTest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-XCTest.xcconfig"; sourceTree = "<group>"; };
497+
4D5AB89122873EA3003CD3CE /* macOS-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
498+
4D5AB8922287406E003CD3CE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
490499
4D79C0EC17DF9F4D00997DE4 /* GTCredential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTCredential.h; sourceTree = "<group>"; };
491500
4D79C0ED17DF9F4D00997DE4 /* GTCredential.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTCredential.m; sourceTree = "<group>"; };
492501
4D79C0F617DFAA7100997DE4 /* GTCredential+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTCredential+Private.h"; sourceTree = "<group>"; };
@@ -822,6 +831,19 @@
822831
name = "Other Sources";
823832
sourceTree = "<group>";
824833
};
834+
4D5AB88B22873EA3003CD3CE /* macOS */ = {
835+
isa = PBXGroup;
836+
children = (
837+
4D5AB88C22873EA3003CD3CE /* macOS-Application.xcconfig */,
838+
4D5AB88D22873EA3003CD3CE /* macOS-Framework.xcconfig */,
839+
4D5AB88E22873EA3003CD3CE /* macOS-StaticLibrary.xcconfig */,
840+
4D5AB88F22873EA3003CD3CE /* macOS-Base.xcconfig */,
841+
4D5AB89022873EA3003CD3CE /* macOS-XCTest.xcconfig */,
842+
4D5AB89122873EA3003CD3CE /* macOS-DynamicLibrary.xcconfig */,
843+
);
844+
path = macOS;
845+
sourceTree = "<group>";
846+
};
825847
88F05A7516011E5400B7AD1D /* ObjectiveGitTests */ = {
826848
isa = PBXGroup;
827849
children = (
@@ -1033,6 +1055,7 @@
10331055
isa = PBXGroup;
10341056
children = (
10351057
D0A463D517E57C45000F5021 /* Base */,
1058+
4D5AB88B22873EA3003CD3CE /* macOS */,
10361059
D0D81862174421EB00995A2E /* iOS */,
10371060
D0D81866174421EB00995A2E /* Mac OS X */,
10381061
D0D8186C174421EB00995A2E /* README.md */,
@@ -1124,6 +1147,7 @@
11241147
8821547617147A5200D76B76 /* GTReflogEntry.h in Headers */,
11251148
30DCBA5C17B45213009B0EBD /* GTStatusDelta.h in Headers */,
11261149
88746CC417FA1C950005888A /* GTRepository+Committing.h in Headers */,
1150+
4D5AB893228742FE003CD3CE /* EXTScope.h in Headers */,
11271151
D09C2E361755F16200065E36 /* GTSubmodule.h in Headers */,
11281152
F8D1BDEE1B31FE7C00CDEC90 /* GTRepository+Pull.h in Headers */,
11291153
F964D5F11CE9D9B200F1D8DD /* GTNote.h in Headers */,
@@ -1140,6 +1164,7 @@
11401164
D01B6F2319F82F8700D411BC /* GTRepository+Reset.h in Headers */,
11411165
D01B6F2D19F82F8700D411BC /* GTEnumerator.h in Headers */,
11421166
D01B6F5519F82FA600D411BC /* GTReflog.h in Headers */,
1167+
4D5AB89422874300003CD3CE /* EXTScope.h in Headers */,
11431168
23F39FAF1C86DD0A00849F3C /* GTRepository+Merging.h in Headers */,
11441169
D01B6F3519F82F8700D411BC /* GTBlob.h in Headers */,
11451170
D01B6F4D19F82F8700D411BC /* GTRemote.h in Headers */,
@@ -1694,7 +1719,7 @@
16941719
/* Begin XCBuildConfiguration section */
16951720
1DEB91AE08733DA50010E9CD /* Debug */ = {
16961721
isa = XCBuildConfiguration;
1697-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
1722+
baseConfigurationReference = 4D5AB88D22873EA3003CD3CE /* macOS-Framework.xcconfig */;
16981723
buildSettings = {
16991724
DYLIB_COMPATIBILITY_VERSION = 1;
17001725
DYLIB_CURRENT_VERSION = 1;
@@ -1723,7 +1748,7 @@
17231748
};
17241749
1DEB91AF08733DA50010E9CD /* Release */ = {
17251750
isa = XCBuildConfiguration;
1726-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
1751+
baseConfigurationReference = 4D5AB88D22873EA3003CD3CE /* macOS-Framework.xcconfig */;
17271752
buildSettings = {
17281753
DYLIB_COMPATIBILITY_VERSION = 1;
17291754
DYLIB_CURRENT_VERSION = 1;
@@ -1775,13 +1800,13 @@
17751800
.,
17761801
External,
17771802
);
1778-
MACOSX_DEPLOYMENT_TARGET = 10.8;
1803+
MACOSX_DEPLOYMENT_TARGET = 10.10;
17791804
ONLY_ACTIVE_ARCH = YES;
17801805
OTHER_CFLAGS = (
17811806
"$(inherited)",
17821807
"-DGIT_SSH",
17831808
);
1784-
SWIFT_VERSION = 3.0;
1809+
SWIFT_VERSION = 5.0;
17851810
TARGETED_DEVICE_FAMILY = "1,2";
17861811
WARNING_CFLAGS = (
17871812
"$(inherited)",
@@ -1814,12 +1839,12 @@
18141839
.,
18151840
External,
18161841
);
1817-
MACOSX_DEPLOYMENT_TARGET = 10.8;
1842+
MACOSX_DEPLOYMENT_TARGET = 10.10;
18181843
OTHER_CFLAGS = (
18191844
"$(inherited)",
18201845
"-DGIT_SSH",
18211846
);
1822-
SWIFT_VERSION = 3.0;
1847+
SWIFT_VERSION = 5.0;
18231848
TARGETED_DEVICE_FAMILY = "1,2";
18241849
WARNING_CFLAGS = (
18251850
"$(inherited)",
@@ -1878,7 +1903,7 @@
18781903
};
18791904
88F05A8016011E5400B7AD1D /* Debug */ = {
18801905
isa = XCBuildConfiguration;
1881-
baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */;
1906+
baseConfigurationReference = 4D5AB89022873EA3003CD3CE /* macOS-XCTest.xcconfig */;
18821907
buildSettings = {
18831908
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
18841909
FRAMEWORK_SEARCH_PATHS = (
@@ -1895,16 +1920,14 @@
18951920
/usr/local/include,
18961921
);
18971922
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
1898-
MACOSX_DEPLOYMENT_TARGET = 10.9;
18991923
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
19001924
PRODUCT_NAME = "$(TARGET_NAME)";
1901-
SWIFT_VERSION = 3.0;
19021925
};
19031926
name = Debug;
19041927
};
19051928
88F05A8116011E5400B7AD1D /* Release */ = {
19061929
isa = XCBuildConfiguration;
1907-
baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */;
1930+
baseConfigurationReference = 4D5AB89022873EA3003CD3CE /* macOS-XCTest.xcconfig */;
19081931
buildSettings = {
19091932
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
19101933
FRAMEWORK_SEARCH_PATHS = (
@@ -1916,10 +1939,8 @@
19161939
/usr/local/include,
19171940
);
19181941
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
1919-
MACOSX_DEPLOYMENT_TARGET = 10.9;
19201942
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
19211943
PRODUCT_NAME = "$(TARGET_NAME)";
1922-
SWIFT_VERSION = 3.0;
19231944
};
19241945
name = Release;
19251946
};
@@ -1947,12 +1968,12 @@
19471968
.,
19481969
External,
19491970
);
1950-
MACOSX_DEPLOYMENT_TARGET = 10.8;
1971+
MACOSX_DEPLOYMENT_TARGET = 10.10;
19511972
OTHER_CFLAGS = (
19521973
"$(inherited)",
19531974
"-DGIT_SSH",
19541975
);
1955-
SWIFT_VERSION = 3.0;
1976+
SWIFT_VERSION = 5.0;
19561977
TARGETED_DEVICE_FAMILY = "1,2";
19571978
WARNING_CFLAGS = (
19581979
"$(inherited)",
@@ -1963,7 +1984,7 @@
19631984
};
19641985
D019778E19F830F500F523DA /* Test */ = {
19651986
isa = XCBuildConfiguration;
1966-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
1987+
baseConfigurationReference = 4D5AB88D22873EA3003CD3CE /* macOS-Framework.xcconfig */;
19671988
buildSettings = {
19681989
DYLIB_COMPATIBILITY_VERSION = 1;
19691990
DYLIB_CURRENT_VERSION = 1;
@@ -1992,7 +2013,7 @@
19922013
};
19932014
D019778F19F830F500F523DA /* Test */ = {
19942015
isa = XCBuildConfiguration;
1995-
baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */;
2016+
baseConfigurationReference = 4D5AB89022873EA3003CD3CE /* macOS-XCTest.xcconfig */;
19962017
buildSettings = {
19972018
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
19982019
FRAMEWORK_SEARCH_PATHS = (
@@ -2004,10 +2025,8 @@
20042025
/usr/local/include,
20052026
);
20062027
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
2007-
MACOSX_DEPLOYMENT_TARGET = 10.9;
20082028
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
20092029
PRODUCT_NAME = "$(TARGET_NAME)";
2010-
SWIFT_VERSION = 3.0;
20112030
};
20122031
name = Test;
20132032
};
@@ -2038,7 +2057,7 @@
20382057
};
20392058
D019779219F830F500F523DA /* Test */ = {
20402059
isa = XCBuildConfiguration;
2041-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2060+
baseConfigurationReference = 4D5AB88E22873EA3003CD3CE /* macOS-StaticLibrary.xcconfig */;
20422061
buildSettings = {
20432062
PRODUCT_NAME = "$(TARGET_NAME)";
20442063
};
@@ -2167,12 +2186,12 @@
21672186
.,
21682187
External,
21692188
);
2170-
MACOSX_DEPLOYMENT_TARGET = 10.8;
2189+
MACOSX_DEPLOYMENT_TARGET = 10.10;
21712190
OTHER_CFLAGS = (
21722191
"$(inherited)",
21732192
"-DGIT_SSH",
21742193
);
2175-
SWIFT_VERSION = 3.0;
2194+
SWIFT_VERSION = 5.0;
21762195
TARGETED_DEVICE_FAMILY = "1,2";
21772196
WARNING_CFLAGS = (
21782197
"$(inherited)",
@@ -2183,7 +2202,7 @@
21832202
};
21842203
D03FC3D81602E97F00BCFA73 /* Profile */ = {
21852204
isa = XCBuildConfiguration;
2186-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
2205+
baseConfigurationReference = 4D5AB88D22873EA3003CD3CE /* macOS-Framework.xcconfig */;
21872206
buildSettings = {
21882207
DYLIB_COMPATIBILITY_VERSION = 1;
21892208
DYLIB_CURRENT_VERSION = 1;
@@ -2212,7 +2231,7 @@
22122231
};
22132232
D03FC3DA1602E97F00BCFA73 /* Profile */ = {
22142233
isa = XCBuildConfiguration;
2215-
baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */;
2234+
baseConfigurationReference = 4D5AB89022873EA3003CD3CE /* macOS-XCTest.xcconfig */;
22162235
buildSettings = {
22172236
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
22182237
FRAMEWORK_SEARCH_PATHS = (
@@ -2224,16 +2243,14 @@
22242243
/usr/local/include,
22252244
);
22262245
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
2227-
MACOSX_DEPLOYMENT_TARGET = 10.9;
22282246
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
22292247
PRODUCT_NAME = "$(TARGET_NAME)";
2230-
SWIFT_VERSION = 3.0;
22312248
};
22322249
name = Profile;
22332250
};
22342251
D03FC3DB1602E97F00BCFA73 /* Profile */ = {
22352252
isa = XCBuildConfiguration;
2236-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2253+
baseConfigurationReference = 4D5AB88E22873EA3003CD3CE /* macOS-StaticLibrary.xcconfig */;
22372254
buildSettings = {
22382255
PRODUCT_NAME = "$(TARGET_NAME)";
22392256
};
@@ -2249,15 +2266,15 @@
22492266
};
22502267
D0A330EF16027F1E00A616FA /* Debug */ = {
22512268
isa = XCBuildConfiguration;
2252-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2269+
baseConfigurationReference = 4D5AB88E22873EA3003CD3CE /* macOS-StaticLibrary.xcconfig */;
22532270
buildSettings = {
22542271
PRODUCT_NAME = "$(TARGET_NAME)";
22552272
};
22562273
name = Debug;
22572274
};
22582275
D0A330F016027F1E00A616FA /* Release */ = {
22592276
isa = XCBuildConfiguration;
2260-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2277+
baseConfigurationReference = 4D5AB88E22873EA3003CD3CE /* macOS-StaticLibrary.xcconfig */;
22612278
buildSettings = {
22622279
PRODUCT_NAME = "$(TARGET_NAME)";
22632280
};

0 commit comments

Comments
 (0)