Skip to content

Commit 9f3724e

Browse files
tiennoutiennou
committed
Bump Carthage dependencies
1 parent 1685502 commit 9f3724e

File tree

5 files changed

+41
-42
lines changed

5 files changed

+41
-42
lines changed

‎Cartfile.private

Lines changed: 3 additions & 3 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
4-
github "ZipArchive/ZipArchive" ~> 2.1.4
2+
github "Quick/Quick" ~> 2.1.0
3+
github "Quick/Nimble" ~> 8.0.1
4+
github "ZipArchive/ZipArchive" ~> 2.2.3

‎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 127 files

‎Carthage/Checkouts/Quick

Submodule Quick updated 96 files

‎ObjectiveGitFramework.xcodeproj/project.pbxproj

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,12 @@
490490
4D79C0ED17DF9F4D00997DE4 /* GTCredential.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTCredential.m; sourceTree = "<group>"; };
491491
4D79C0F617DFAA7100997DE4 /* GTCredential+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTCredential+Private.h"; sourceTree = "<group>"; };
492492
4D9BCD23206D84AD003CD3CE /* libgit2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgit2.a; path = External/build/lib/libgit2.a; sourceTree = "<group>"; };
493+
4DB97074264596AE00D14944 /* macOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Application.xcconfig"; sourceTree = "<group>"; };
494+
4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Framework.xcconfig"; sourceTree = "<group>"; };
495+
4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
496+
4DB97077264596AE00D14944 /* macOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Base.xcconfig"; sourceTree = "<group>"; };
497+
4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-XCTest.xcconfig"; sourceTree = "<group>"; };
498+
4DB97079264596AE00D14944 /* macOS-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
493499
4DBA4A3117DA73CE006CD5F5 /* GTRemoteSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemoteSpec.m; sourceTree = "<group>"; };
494500
4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTCheckoutOptions.h; sourceTree = "<group>"; };
495501
4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTCheckoutOptions.m; sourceTree = "<group>"; };
@@ -626,11 +632,6 @@
626632
D0D81863174421EB00995A2E /* iOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Application.xcconfig"; sourceTree = "<group>"; };
627633
D0D81864174421EB00995A2E /* iOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Base.xcconfig"; sourceTree = "<group>"; };
628634
D0D81865174421EB00995A2E /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
629-
D0D81867174421EB00995A2E /* Mac-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = "<group>"; };
630-
D0D81868174421EB00995A2E /* Mac-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Base.xcconfig"; sourceTree = "<group>"; };
631-
D0D81869174421EB00995A2E /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
632-
D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
633-
D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
634635
D0D8186C174421EB00995A2E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
635636
D0F4E28917C7F24200BBDE30 /* NSErrorGitSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSErrorGitSpec.m; sourceTree = "<group>"; };
636637
DD3D9510182A81E1004AF532 /* GTBlame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTBlame.h; sourceTree = "<group>"; };
@@ -639,7 +640,6 @@
639640
DD3D951B182AB25C004AF532 /* GTBlameHunk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBlameHunk.m; sourceTree = "<group>"; };
640641
F81B6B51207B0A7700AB0836 /* Extension.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Extension.xcconfig; sourceTree = "<group>"; };
641642
F81B6B53207B0A8B00AB0836 /* iOS-Extension.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Extension.xcconfig"; sourceTree = "<group>"; };
642-
F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-XCTest.xcconfig"; sourceTree = "<group>"; };
643643
F879D82F1B4B77F4002D5C07 /* Libgit2FeaturesSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Libgit2FeaturesSpec.m; sourceTree = "<group>"; };
644644
F879D8361B4B7F7C002D5C07 /* ObjectiveGit-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ObjectiveGit-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
645645
F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Pull.h"; sourceTree = "<group>"; };
@@ -819,6 +819,19 @@
819819
name = "Other Sources";
820820
sourceTree = "<group>";
821821
};
822+
4DB97073264596AE00D14944 /* macOS */ = {
823+
isa = PBXGroup;
824+
children = (
825+
4DB97074264596AE00D14944 /* macOS-Application.xcconfig */,
826+
4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */,
827+
4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */,
828+
4DB97077264596AE00D14944 /* macOS-Base.xcconfig */,
829+
4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */,
830+
4DB97079264596AE00D14944 /* macOS-DynamicLibrary.xcconfig */,
831+
);
832+
path = macOS;
833+
sourceTree = "<group>";
834+
};
822835
88F05A7516011E5400B7AD1D /* ObjectiveGitTests */ = {
823836
isa = PBXGroup;
824837
children = (
@@ -1029,9 +1042,9 @@
10291042
D0D81857174421EB00995A2E /* Configuration */ = {
10301043
isa = PBXGroup;
10311044
children = (
1045+
4DB97073264596AE00D14944 /* macOS */,
10321046
D0A463D517E57C45000F5021 /* Base */,
10331047
D0D81862174421EB00995A2E /* iOS */,
1034-
D0D81866174421EB00995A2E /* Mac OS X */,
10351048
D0D8186C174421EB00995A2E /* README.md */,
10361049
);
10371050
name = Configuration;
@@ -1050,19 +1063,6 @@
10501063
path = iOS;
10511064
sourceTree = "<group>";
10521065
};
1053-
D0D81866174421EB00995A2E /* Mac OS X */ = {
1054-
isa = PBXGroup;
1055-
children = (
1056-
D0D81867174421EB00995A2E /* Mac-Application.xcconfig */,
1057-
D0D81868174421EB00995A2E /* Mac-Base.xcconfig */,
1058-
D0D81869174421EB00995A2E /* Mac-DynamicLibrary.xcconfig */,
1059-
D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */,
1060-
D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */,
1061-
F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */,
1062-
);
1063-
path = "Mac OS X";
1064-
sourceTree = "<group>";
1065-
};
10661066
/* End PBXGroup section */
10671067

10681068
/* Begin PBXHeadersBuildPhase section */
@@ -1679,7 +1679,7 @@
16791679
/* Begin XCBuildConfiguration section */
16801680
1DEB91AE08733DA50010E9CD /* Debug */ = {
16811681
isa = XCBuildConfiguration;
1682-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
1682+
baseConfigurationReference = 4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */;
16831683
buildSettings = {
16841684
DYLIB_COMPATIBILITY_VERSION = 1;
16851685
DYLIB_CURRENT_VERSION = 1;
@@ -1708,7 +1708,7 @@
17081708
};
17091709
1DEB91AF08733DA50010E9CD /* Release */ = {
17101710
isa = XCBuildConfiguration;
1711-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
1711+
baseConfigurationReference = 4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */;
17121712
buildSettings = {
17131713
DYLIB_COMPATIBILITY_VERSION = 1;
17141714
DYLIB_CURRENT_VERSION = 1;
@@ -1863,7 +1863,7 @@
18631863
};
18641864
88F05A8016011E5400B7AD1D /* Debug */ = {
18651865
isa = XCBuildConfiguration;
1866-
baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */;
1866+
baseConfigurationReference = 4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */;
18671867
buildSettings = {
18681868
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
18691869
FRAMEWORK_SEARCH_PATHS = (
@@ -1880,15 +1880,14 @@
18801880
/usr/local/include,
18811881
);
18821882
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
1883-
MACOSX_DEPLOYMENT_TARGET = 10.9;
18841883
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
18851884
PRODUCT_NAME = "$(TARGET_NAME)";
18861885
};
18871886
name = Debug;
18881887
};
18891888
88F05A8116011E5400B7AD1D /* Release */ = {
18901889
isa = XCBuildConfiguration;
1891-
baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */;
1890+
baseConfigurationReference = 4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */;
18921891
buildSettings = {
18931892
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
18941893
FRAMEWORK_SEARCH_PATHS = (
@@ -1946,7 +1945,7 @@
19461945
};
19471946
D019778E19F830F500F523DA /* Test */ = {
19481947
isa = XCBuildConfiguration;
1949-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
1948+
baseConfigurationReference = 4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */;
19501949
buildSettings = {
19511950
DYLIB_COMPATIBILITY_VERSION = 1;
19521951
DYLIB_CURRENT_VERSION = 1;
@@ -1975,7 +1974,7 @@
19751974
};
19761975
D019778F19F830F500F523DA /* Test */ = {
19771976
isa = XCBuildConfiguration;
1978-
baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */;
1977+
baseConfigurationReference = 4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */;
19791978
buildSettings = {
19801979
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
19811980
FRAMEWORK_SEARCH_PATHS = (
@@ -2020,7 +2019,7 @@
20202019
};
20212020
D019779219F830F500F523DA /* Test */ = {
20222021
isa = XCBuildConfiguration;
2023-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2022+
baseConfigurationReference = 4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */;
20242023
buildSettings = {
20252024
PRODUCT_NAME = "$(TARGET_NAME)";
20262025
};
@@ -2165,7 +2164,7 @@
21652164
};
21662165
D03FC3D81602E97F00BCFA73 /* Profile */ = {
21672166
isa = XCBuildConfiguration;
2168-
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
2167+
baseConfigurationReference = 4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */;
21692168
buildSettings = {
21702169
DYLIB_COMPATIBILITY_VERSION = 1;
21712170
DYLIB_CURRENT_VERSION = 1;
@@ -2194,7 +2193,7 @@
21942193
};
21952194
D03FC3DA1602E97F00BCFA73 /* Profile */ = {
21962195
isa = XCBuildConfiguration;
2197-
baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */;
2196+
baseConfigurationReference = 4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */;
21982197
buildSettings = {
21992198
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
22002199
FRAMEWORK_SEARCH_PATHS = (
@@ -2214,7 +2213,7 @@
22142213
};
22152214
D03FC3DB1602E97F00BCFA73 /* Profile */ = {
22162215
isa = XCBuildConfiguration;
2217-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2216+
baseConfigurationReference = 4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */;
22182217
buildSettings = {
22192218
PRODUCT_NAME = "$(TARGET_NAME)";
22202219
};
@@ -2230,15 +2229,15 @@
22302229
};
22312230
D0A330EF16027F1E00A616FA /* Debug */ = {
22322231
isa = XCBuildConfiguration;
2233-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2232+
baseConfigurationReference = 4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */;
22342233
buildSettings = {
22352234
PRODUCT_NAME = "$(TARGET_NAME)";
22362235
};
22372236
name = Debug;
22382237
};
22392238
D0A330F016027F1E00A616FA /* Release */ = {
22402239
isa = XCBuildConfiguration;
2241-
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
2240+
baseConfigurationReference = 4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */;
22422241
buildSettings = {
22432242
PRODUCT_NAME = "$(TARGET_NAME)";
22442243
};

0 commit comments

Comments
 (0)