Skip to content

Commit ef17121

Browse files
committed
Use ZipArchive.framework for Mac Tests too
1 parent 9d483d8 commit ef17121

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

ObjectiveGitFramework.xcodeproj/project.pbxproj

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,7 @@
6060
2089E43C17D9A58000F451DA /* GTTagSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 2089E43B17D9A58000F451DA /* GTTagSpec.m */; };
6161
20F43DE318A2F668007D3621 /* GTRepository+Blame.h in Headers */ = {isa = PBXBuildFile; fileRef = 20F43DE118A2F667007D3621 /* GTRepository+Blame.h */; settings = {ATTRIBUTES = (Public, ); }; };
6262
20F43DE618A2F668007D3621 /* GTRepository+Blame.m in Sources */ = {isa = PBXBuildFile; fileRef = 20F43DE218A2F667007D3621 /* GTRepository+Blame.m */; };
63-
23BB67B91C7DF3B600A37A66 /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D007801B4F9758009A8DAF /* SSZipArchive.m */; };
64-
23BB67BA1C7DF3BC00A37A66 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007841B4F97F9009A8DAF /* unzip.c */; };
6563
23BB67BC1C7DF45300A37A66 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 23BB67BB1C7DF45300A37A66 /* libz.tbd */; };
66-
23BB67BD1C7DF49500A37A66 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007851B4F97F9009A8DAF /* zip.c */; };
67-
23BB67BE1C7DF4B100A37A66 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007831B4F97F9009A8DAF /* mztools.c */; };
68-
23BB67BF1C7DF4CD00A37A66 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007821B4F97F9009A8DAF /* ioapi.c */; };
6964
23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; };
7065
23BB67C21C7DF60400A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; };
7166
3011D86B1668E48500CE3409 /* GTDiffFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3011D8691668E48500CE3409 /* GTDiffFile.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -325,6 +320,7 @@
325320
F879D8451B4B8138002D5C07 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0A0128819F98475007F1914 /* Quick.framework */; };
326321
F879D8471B4B8138002D5C07 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F879D8461B4B8138002D5C07 /* Nimble.framework */; };
327322
F879D8481B4B83B9002D5C07 /* SwiftSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0A0129619F9A660007F1914 /* SwiftSpec.swift */; };
323+
F895F4DF1C801E5F004EA221 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F895F4DE1C801E5F004EA221 /* ZipArchive.framework */; };
328324
F8D007701B4F7CA8009A8DAF /* NSErrorGitSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F4E28917C7F24200BBDE30 /* NSErrorGitSpec.m */; };
329325
F8D007711B4F7CB0009A8DAF /* NSDataGitSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D01EFD9F195DEF2200838D24 /* NSDataGitSpec.m */; };
330326
F8D007721B4F7CB6009A8DAF /* NSArray+StringArraySpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 307623AA17C6C8BD00E2CDF1 /* NSArray+StringArraySpec.m */; };
@@ -633,6 +629,7 @@
633629
F879D82F1B4B77F4002D5C07 /* Libgit2FeaturesSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Libgit2FeaturesSpec.m; sourceTree = "<group>"; };
634630
F879D8361B4B7F7C002D5C07 /* ObjectiveGit-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ObjectiveGit-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
635631
F879D8461B4B8138002D5C07 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = "Carthage/Checkouts/Nimble/build/Debug-iphoneos/Nimble.framework"; sourceTree = "<group>"; };
632+
F895F4DE1C801E5F004EA221 /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZipArchive.framework; path = "/Volumes/DerivedData/ObjectiveGitFramework-drtqacfhlqybdcdpqayztrrwneun/Build/Products/Debug/ZipArchive.framework"; sourceTree = "<absolute>"; };
636633
F8D007801B4F9758009A8DAF /* SSZipArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SSZipArchive.m; path = Carthage/Checkouts/ZipArchive/SSZipArchive/SSZipArchive.m; sourceTree = "<group>"; };
637634
F8D007821B4F97F9009A8DAF /* ioapi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/ioapi.c; sourceTree = "<group>"; };
638635
F8D007831B4F97F9009A8DAF /* mztools.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = mztools.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/mztools.c; sourceTree = "<group>"; };
@@ -657,6 +654,7 @@
657654
D0A0128A19F98475007F1914 /* Quick.framework in Frameworks */,
658655
88F05A9E16011F6E00B7AD1D /* ObjectiveGit.framework in Frameworks */,
659656
D0A0128C19F9853D007F1914 /* Nimble.framework in Frameworks */,
657+
F895F4DF1C801E5F004EA221 /* ZipArchive.framework in Frameworks */,
660658
);
661659
runOnlyForDeploymentPostprocessing = 0;
662660
};
@@ -711,8 +709,6 @@
711709
0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */ = {
712710
isa = PBXGroup;
713711
children = (
714-
F8E68E721C800B1600DBC517 /* ZipArchive.framework */,
715-
23BB67BB1C7DF45300A37A66 /* libz.tbd */,
716712
BDD8AB01130F01AB00CB5D40 /* README.md */,
717713
887B948D1A3A38130070D41D /* ObjectiveGit.modulemap */,
718714
BDE4C05E130EFE2C00851650 /* ObjectiveGit */,
@@ -736,6 +732,7 @@
736732
8803DA861313145700E6E818 /* libz.dylib */,
737733
F8D0078A1B4F9F9E009A8DAF /* libz.dylib */,
738734
884C8A3619FF4B4D0017E98D /* libz.dylib */,
735+
23BB67BB1C7DF45300A37A66 /* libz.tbd */,
739736
884C8A3819FF4B6D0017E98D /* libiconv.dylib */,
740737
6A1F2FD317C6A8F3003DFADE /* libcrypto.a */,
741738
6A1F2FD417C6A8F3003DFADE /* libssl.a */,
@@ -746,6 +743,8 @@
746743
D0A0128B19F9853D007F1914 /* Nimble.framework */,
747744
F879D8461B4B8138002D5C07 /* Nimble.framework */,
748745
889923F919FF5DD40092A9A6 /* git2 */,
746+
F895F4DE1C801E5F004EA221 /* ZipArchive.framework */,
747+
F8E68E721C800B1600DBC517 /* ZipArchive.framework */,
749748
);
750749
name = "External Frameworks and Libraries";
751750
sourceTree = "<group>";
@@ -1396,11 +1395,6 @@
13961395
isa = PBXSourcesBuildPhase;
13971396
buildActionMask = 2147483647;
13981397
files = (
1399-
23BB67BF1C7DF4CD00A37A66 /* ioapi.c in Sources */,
1400-
23BB67BE1C7DF4B100A37A66 /* mztools.c in Sources */,
1401-
23BB67BD1C7DF49500A37A66 /* zip.c in Sources */,
1402-
23BB67BA1C7DF3BC00A37A66 /* unzip.c in Sources */,
1403-
23BB67B91C7DF3B600A37A66 /* SSZipArchive.m in Sources */,
14041398
23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */,
14051399
D0751CD918BE520400134314 /* GTFilterListSpec.m in Sources */,
14061400
200578C518932A82001C06C3 /* GTBlameSpec.m in Sources */,
@@ -1826,7 +1820,6 @@
18261820
HEADER_SEARCH_PATHS = (
18271821
External/libgit2/include,
18281822
/usr/local/include,
1829-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
18301823
);
18311824
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
18321825
MACOSX_DEPLOYMENT_TARGET = 10.9;
@@ -1846,7 +1839,6 @@
18461839
HEADER_SEARCH_PATHS = (
18471840
External/libgit2/include,
18481841
/usr/local/include,
1849-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
18501842
);
18511843
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
18521844
MACOSX_DEPLOYMENT_TARGET = 10.9;
@@ -1920,7 +1912,6 @@
19201912
HEADER_SEARCH_PATHS = (
19211913
External/libgit2/include,
19221914
/usr/local/include,
1923-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
19241915
);
19251916
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
19261917
MACOSX_DEPLOYMENT_TARGET = 10.9;
@@ -2158,7 +2149,6 @@
21582149
HEADER_SEARCH_PATHS = (
21592150
External/libgit2/include,
21602151
/usr/local/include,
2161-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
21622152
);
21632153
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
21642154
MACOSX_DEPLOYMENT_TARGET = 10.9;

0 commit comments

Comments
 (0)