Skip to content

Commit 4a4cdac

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 28aa2b4 commit 4a4cdac

File tree

8 files changed

+60
-45
lines changed

8 files changed

+60
-45
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.0.1"
2+
github "Quick/Quick" "v2.1.0"
3+
github "ZipArchive/ZipArchive" "v2.2.1"
4+
github "jspahrsummers/xcconfigs" "d0f8992afad45262cfe3a3cf512e7127fdcf296c"

‎Carthage/Checkouts/Nimble

Submodule Nimble updated 97 files

‎Carthage/Checkouts/Quick

Submodule Quick updated 67 files

‎Carthage/Checkouts/ZipArchive

Submodule ZipArchive updated 158 files

‎Carthage/Checkouts/xcconfigs

‎ObjectiveGitFramework.xcodeproj/project.pbxproj

Lines changed: 50 additions & 35 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 */; };
@@ -452,7 +454,6 @@
452454
/* End PBXCopyFilesBuildPhase section */
453455

454456
/* Begin PBXFileReference section */
455-
089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
456457
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
457458
200578C418932A82001C06C3 /* GTBlameSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBlameSpec.m; sourceTree = "<group>"; };
458459
2089E43B17D9A58000F451DA /* GTTagSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTTagSpec.m; sourceTree = "<group>"; };
@@ -488,6 +489,13 @@
488489
30FDC07E16835A8100654BF0 /* GTDiffLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTDiffLine.m; sourceTree = "<group>"; };
489490
4D12323F178E009E0048F785 /* GTRepositoryCommittingSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRepositoryCommittingSpec.m; sourceTree = "<group>"; };
490491
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>"; };
491499
4D79C0EC17DF9F4D00997DE4 /* GTCredential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTCredential.h; sourceTree = "<group>"; };
492500
4D79C0ED17DF9F4D00997DE4 /* GTCredential.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTCredential.m; sourceTree = "<group>"; };
493501
4D79C0F617DFAA7100997DE4 /* GTCredential+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTCredential+Private.h"; sourceTree = "<group>"; };
@@ -822,6 +830,19 @@
822830
name = "Other Sources";
823831
sourceTree = "<group>";
824832
};
833+
4D5AB88B22873EA3003CD3CE /* macOS */ = {
834+
isa = PBXGroup;
835+
children = (
836+
4D5AB88C22873EA3003CD3CE /* macOS-Application.xcconfig */,
837+
4D5AB88D22873EA3003CD3CE /* macOS-Framework.xcconfig */,
838+
4D5AB88E22873EA3003CD3CE /* macOS-StaticLibrary.xcconfig */,
839+
4D5AB88F22873EA3003CD3CE /* macOS-Base.xcconfig */,
840+
4D5AB89022873EA3003CD3CE /* macOS-XCTest.xcconfig */,
841+
4D5AB89122873EA3003CD3CE /* macOS-DynamicLibrary.xcconfig */,
842+
);
843+
path = macOS;
844+
sourceTree = "<group>";
845+
};
825846
88F05A7516011E5400B7AD1D /* ObjectiveGitTests */ = {
826847
isa = PBXGroup;
827848
children = (
@@ -1033,6 +1054,7 @@
10331054
isa = PBXGroup;
10341055
children = (
10351056
D0A463D517E57C45000F5021 /* Base */,
1057+
4D5AB88B22873EA3003CD3CE /* macOS */,
10361058
D0D81862174421EB00995A2E /* iOS */,
10371059
D0D81866174421EB00995A2E /* Mac OS X */,
10381060
D0D8186C174421EB00995A2E /* README.md */,
@@ -1124,6 +1146,7 @@
11241146
8821547617147A5200D76B76 /* GTReflogEntry.h in Headers */,
11251147
30DCBA5C17B45213009B0EBD /* GTStatusDelta.h in Headers */,
11261148
88746CC417FA1C950005888A /* GTRepository+Committing.h in Headers */,
1149+
4D5AB893228742FE003CD3CE /* EXTScope.h in Headers */,
11271150
D09C2E361755F16200065E36 /* GTSubmodule.h in Headers */,
11281151
F8D1BDEE1B31FE7C00CDEC90 /* GTRepository+Pull.h in Headers */,
11291152
F964D5F11CE9D9B200F1D8DD /* GTNote.h in Headers */,
@@ -1140,6 +1163,7 @@
11401163
D01B6F2319F82F8700D411BC /* GTRepository+Reset.h in Headers */,
11411164
D01B6F2D19F82F8700D411BC /* GTEnumerator.h in Headers */,
11421165
D01B6F5519F82FA600D411BC /* GTReflog.h in Headers */,
1166+
4D5AB89422874300003CD3CE /* EXTScope.h in Headers */,
11431167
23F39FAF1C86DD0A00849F3C /* GTRepository+Merging.h in Headers */,
11441168
D01B6F3519F82F8700D411BC /* GTBlob.h in Headers */,
11451169
D01B6F4D19F82F8700D411BC /* GTRemote.h in Headers */,
@@ -1303,14 +1327,13 @@
13031327
};
13041328
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjectiveGitFramework" */;
13051329
compatibilityVersion = "Xcode 3.2";
1306-
developmentRegion = English;
1330+
developmentRegion = en;
13071331
hasScannedForEncodings = 1;
13081332
knownRegions = (
1309-
English,
1310-
Japanese,
1311-
French,
1312-
German,
13131333
en,
1334+
de,
1335+
fr,
1336+
ja,
13141337
);
13151338
mainGroup = 0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */;
13161339
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
@@ -1684,7 +1707,7 @@
16841707
089C1666FE841158C02AAC07 /* InfoPlist.strings */ = {
16851708
isa = PBXVariantGroup;
16861709
children = (
1687-
089C1667FE841158C02AAC07 /* English */,
1710+
4D5AB8922287406E003CD3CE /* en */,
16881711
);
16891712
name = InfoPlist.strings;
16901713
sourceTree = "<group>";
@@ -1694,7 +1717,7 @@
16941717
/* Begin XCBuildConfiguration section */
16951718
1DEB91AE08733DA50010E9CD /* Debug */ = {
16961719
isa = XCBuildConfiguration;
1697-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
1720+
baseConfigurationReference = 4D5AB88D22873EA3003CD3CE /* macOS-Framework.xcconfig */;
16981721
buildSettings = {
16991722
DYLIB_COMPATIBILITY_VERSION = 1;
17001723
DYLIB_CURRENT_VERSION = 1;
@@ -1723,7 +1746,7 @@
17231746
};
17241747
1DEB91AF08733DA50010E9CD /* Release */ = {
17251748
isa = XCBuildConfiguration;
1726-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
1749+
baseConfigurationReference = 4D5AB88D22873EA3003CD3CE /* macOS-Framework.xcconfig */;
17271750
buildSettings = {
17281751
DYLIB_COMPATIBILITY_VERSION = 1;
17291752
DYLIB_CURRENT_VERSION = 1;
@@ -1775,13 +1798,13 @@
17751798
.,
17761799
External,
17771800
);
1778-
MACOSX_DEPLOYMENT_TARGET = 10.8;
1801+
MACOSX_DEPLOYMENT_TARGET = 10.10;
17791802
ONLY_ACTIVE_ARCH = YES;
17801803
OTHER_CFLAGS = (
17811804
"$(inherited)",
17821805
"-DGIT_SSH",
17831806
);
1784-
SWIFT_VERSION = 3.0;
1807+
SWIFT_VERSION = 5.0;
17851808
TARGETED_DEVICE_FAMILY = "1,2";
17861809
WARNING_CFLAGS = (
17871810
"$(inherited)",
@@ -1814,12 +1837,12 @@
18141837
.,
18151838
External,
18161839
);
1817-
MACOSX_DEPLOYMENT_TARGET = 10.8;
1840+
MACOSX_DEPLOYMENT_TARGET = 10.10;
18181841
OTHER_CFLAGS = (
18191842
"$(inherited)",
18201843
"-DGIT_SSH",
18211844
);
1822-
SWIFT_VERSION = 3.0;
1845+
SWIFT_VERSION = 5.0;
18231846
TARGETED_DEVICE_FAMILY = "1,2";
18241847
WARNING_CFLAGS = (
18251848
"$(inherited)",
@@ -1878,7 +1901,7 @@
18781901
};
18791902
88F05A8016011E5400B7AD1D /* Debug */ = {
18801903
isa = XCBuildConfiguration;
1881-
baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */;
1904+
baseConfigurationReference = 4D5AB89022873EA3003CD3CE /* macOS-XCTest.xcconfig */;
18821905
buildSettings = {
18831906
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
18841907
FRAMEWORK_SEARCH_PATHS = (
@@ -1895,16 +1918,14 @@
18951918
/usr/local/include,
18961919
);
18971920
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
1898-
MACOSX_DEPLOYMENT_TARGET = 10.9;
18991921
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
19001922
PRODUCT_NAME = "$(TARGET_NAME)";
1901-
SWIFT_VERSION = 3.0;
19021923
};
19031924
name = Debug;
19041925
};
19051926
88F05A8116011E5400B7AD1D /* Release */ = {
19061927
isa = XCBuildConfiguration;
1907-
baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */;
1928+
baseConfigurationReference = 4D5AB89022873EA3003CD3CE /* macOS-XCTest.xcconfig */;
19081929
buildSettings = {
19091930
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
19101931
FRAMEWORK_SEARCH_PATHS = (
@@ -1916,10 +1937,8 @@
19161937
/usr/local/include,
19171938
);
19181939
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
1919-
MACOSX_DEPLOYMENT_TARGET = 10.9;
19201940
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
19211941
PRODUCT_NAME = "$(TARGET_NAME)";
1922-
SWIFT_VERSION = 3.0;
19231942
};
19241943
name = Release;
19251944
};
@@ -1947,12 +1966,12 @@
19471966
.,
19481967
External,
19491968
);
1950-
MACOSX_DEPLOYMENT_TARGET = 10.8;
1969+
MACOSX_DEPLOYMENT_TARGET = 10.10;
19511970
OTHER_CFLAGS = (
19521971
"$(inherited)",
19531972
"-DGIT_SSH",
19541973
);
1955-
SWIFT_VERSION = 3.0;
1974+
SWIFT_VERSION = 5.0;
19561975
TARGETED_DEVICE_FAMILY = "1,2";
19571976
WARNING_CFLAGS = (
19581977
"$(inherited)",
@@ -1963,7 +1982,7 @@
19631982
};
19641983
D019778E19F830F500F523DA /* Test */ = {
19651984
isa = XCBuildConfiguration;
1966-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
1985+
baseConfigurationReference = 4D5AB88D22873EA3003CD3CE /* macOS-Framework.xcconfig */;
19671986
buildSettings = {
19681987
DYLIB_COMPATIBILITY_VERSION = 1;
19691988
DYLIB_CURRENT_VERSION = 1;
@@ -1992,7 +2011,7 @@
19922011
};
19932012
D019778F19F830F500F523DA /* Test */ = {
19942013
isa = XCBuildConfiguration;
1995-
baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */;
2014+
baseConfigurationReference = 4D5AB89022873EA3003CD3CE /* macOS-XCTest.xcconfig */;
19962015
buildSettings = {
19972016
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
19982017
FRAMEWORK_SEARCH_PATHS = (
@@ -2004,10 +2023,8 @@
20042023
/usr/local/include,
20052024
);
20062025
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
2007-
MACOSX_DEPLOYMENT_TARGET = 10.9;
20082026
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
20092027
PRODUCT_NAME = "$(TARGET_NAME)";
2010-
SWIFT_VERSION = 3.0;
20112028
};
20122029
name = Test;
20132030
};
@@ -2038,7 +2055,7 @@
20382055
};
20392056
D019779219F830F500F523DA /* Test */ = {
20402057
isa = XCBuildConfiguration;
2041-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2058+
baseConfigurationReference = 4D5AB88E22873EA3003CD3CE /* macOS-StaticLibrary.xcconfig */;
20422059
buildSettings = {
20432060
PRODUCT_NAME = "$(TARGET_NAME)";
20442061
};
@@ -2167,12 +2184,12 @@
21672184
.,
21682185
External,
21692186
);
2170-
MACOSX_DEPLOYMENT_TARGET = 10.8;
2187+
MACOSX_DEPLOYMENT_TARGET = 10.10;
21712188
OTHER_CFLAGS = (
21722189
"$(inherited)",
21732190
"-DGIT_SSH",
21742191
);
2175-
SWIFT_VERSION = 3.0;
2192+
SWIFT_VERSION = 5.0;
21762193
TARGETED_DEVICE_FAMILY = "1,2";
21772194
WARNING_CFLAGS = (
21782195
"$(inherited)",
@@ -2183,7 +2200,7 @@
21832200
};
21842201
D03FC3D81602E97F00BCFA73 /* Profile */ = {
21852202
isa = XCBuildConfiguration;
2186-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
2203+
baseConfigurationReference = 4D5AB88D22873EA3003CD3CE /* macOS-Framework.xcconfig */;
21872204
buildSettings = {
21882205
DYLIB_COMPATIBILITY_VERSION = 1;
21892206
DYLIB_CURRENT_VERSION = 1;
@@ -2212,7 +2229,7 @@
22122229
};
22132230
D03FC3DA1602E97F00BCFA73 /* Profile */ = {
22142231
isa = XCBuildConfiguration;
2215-
baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */;
2232+
baseConfigurationReference = 4D5AB89022873EA3003CD3CE /* macOS-XCTest.xcconfig */;
22162233
buildSettings = {
22172234
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
22182235
FRAMEWORK_SEARCH_PATHS = (
@@ -2224,16 +2241,14 @@
22242241
/usr/local/include,
22252242
);
22262243
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
2227-
MACOSX_DEPLOYMENT_TARGET = 10.9;
22282244
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
22292245
PRODUCT_NAME = "$(TARGET_NAME)";
2230-
SWIFT_VERSION = 3.0;
22312246
};
22322247
name = Profile;
22332248
};
22342249
D03FC3DB1602E97F00BCFA73 /* Profile */ = {
22352250
isa = XCBuildConfiguration;
2236-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2251+
baseConfigurationReference = 4D5AB88E22873EA3003CD3CE /* macOS-StaticLibrary.xcconfig */;
22372252
buildSettings = {
22382253
PRODUCT_NAME = "$(TARGET_NAME)";
22392254
};
@@ -2249,15 +2264,15 @@
22492264
};
22502265
D0A330EF16027F1E00A616FA /* Debug */ = {
22512266
isa = XCBuildConfiguration;
2252-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2267+
baseConfigurationReference = 4D5AB88E22873EA3003CD3CE /* macOS-StaticLibrary.xcconfig */;
22532268
buildSettings = {
22542269
PRODUCT_NAME = "$(TARGET_NAME)";
22552270
};
22562271
name = Debug;
22572272
};
22582273
D0A330F016027F1E00A616FA /* Release */ = {
22592274
isa = XCBuildConfiguration;
2260-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2275+
baseConfigurationReference = 4D5AB88E22873EA3003CD3CE /* macOS-StaticLibrary.xcconfig */;
22612276
buildSettings = {
22622277
PRODUCT_NAME = "$(TARGET_NAME)";
22632278
};

‎English.lproj/InfoPlist.strings renamed to ‎en.lproj/InfoPlist.strings

File renamed without changes.

0 commit comments

Comments
 (0)