Skip to content

Commit 41d4e28

Browse files
pietbrauerpietbrauer
committed
Merge pull request #557 from libgit2/ben/ziparchive1.1
ZipArchive 1.1
2 parents 66bf92c + 834d8b7 commit 41d4e28

File tree

6 files changed

+24
-80
lines changed

6 files changed

+24
-80
lines changed

‎Cartfile.private

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github "jspahrsummers/xcconfigs" >= 0.7.1
22
github "Quick/Quick" ~> 0.9.1
33
github "Quick/Nimble" ~> 3.1
4-
github "ZipArchive/ZipArchive" == 1.0.1
4+
github "ZipArchive/ZipArchive" ~> 1.1

‎Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github "Quick/Nimble" "v3.1.0"
22
github "Quick/Quick" "v0.9.1"
3-
github "ZipArchive/ZipArchive" "v1.0.1"
3+
github "ZipArchive/ZipArchive" "v1.1"
44
github "jspahrsummers/xcconfigs" "0.9"

‎Carthage/Checkouts/ZipArchive

Submodule ZipArchive updated 46 files

‎ObjectiveGitFramework.xcodeproj/project.pbxproj

Lines changed: 17 additions & 76 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,17 +320,13 @@
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 */; };
331327
F8D007731B4F7CC3009A8DAF /* GTSignatureSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D040AF77177B9A9E001AD9EB /* GTSignatureSpec.m */; };
332328
F8D007741B4F7CCC009A8DAF /* GTOIDSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D040AF6F177B9779001AD9EB /* GTOIDSpec.m */; };
333329
F8D007761B4F7D10009A8DAF /* GTTimeAdditionsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 30B1E7FF1703871900D0814D /* GTTimeAdditionsSpec.m */; };
334-
F8D007811B4F9758009A8DAF /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D007801B4F9758009A8DAF /* SSZipArchive.m */; };
335-
F8D007861B4F97F9009A8DAF /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007821B4F97F9009A8DAF /* ioapi.c */; };
336-
F8D007871B4F97F9009A8DAF /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007831B4F97F9009A8DAF /* mztools.c */; };
337-
F8D007881B4F97F9009A8DAF /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007841B4F97F9009A8DAF /* unzip.c */; };
338-
F8D007891B4F97F9009A8DAF /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007851B4F97F9009A8DAF /* zip.c */; };
339330
F8D0078B1B4F9F9E009A8DAF /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D0078A1B4F9F9E009A8DAF /* libz.dylib */; };
340331
F8D0078C1B4FA03B009A8DAF /* GTBlobSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1C40D7182C006D00BE2960 /* GTBlobSpec.m */; };
341332
F8D0078D1B4FA03B009A8DAF /* GTBranchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994B916FCE7D400402C7B /* GTBranchSpec.m */; };
@@ -371,6 +362,7 @@
371362
F8D1BDF01B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; };
372363
F8D1BDF11B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; };
373364
F8E4A2911A170CA6006485A8 /* GTRemotePushSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */; };
365+
F8E68E731C800B1600DBC517 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8E68E721C800B1600DBC517 /* ZipArchive.framework */; };
374366
F8EFA03A1B4059ED000FF7D0 /* GTUtilityFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0391B4059ED000FF7D0 /* GTUtilityFunctions.m */; };
375367
/* End PBXBuildFile section */
376368

@@ -637,15 +629,12 @@
637629
F879D82F1B4B77F4002D5C07 /* Libgit2FeaturesSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Libgit2FeaturesSpec.m; sourceTree = "<group>"; };
638630
F879D8361B4B7F7C002D5C07 /* ObjectiveGit-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ObjectiveGit-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
639631
F879D8461B4B8138002D5C07 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = "Carthage/Checkouts/Nimble/build/Debug-iphoneos/Nimble.framework"; sourceTree = "<group>"; };
640-
F8D007801B4F9758009A8DAF /* SSZipArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SSZipArchive.m; path = Carthage/Checkouts/ZipArchive/SSZipArchive/SSZipArchive.m; sourceTree = "<group>"; };
641-
F8D007821B4F97F9009A8DAF /* ioapi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/ioapi.c; sourceTree = "<group>"; };
642-
F8D007831B4F97F9009A8DAF /* mztools.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = mztools.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/mztools.c; sourceTree = "<group>"; };
643-
F8D007841B4F97F9009A8DAF /* unzip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = unzip.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/unzip.c; sourceTree = "<group>"; };
644-
F8D007851B4F97F9009A8DAF /* zip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zip.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/zip.c; 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>"; };
645633
F8D0078A1B4F9F9E009A8DAF /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
646634
F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Pull.h"; sourceTree = "<group>"; };
647635
F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Pull.m"; sourceTree = "<group>"; };
648636
F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemotePushSpec.m; sourceTree = "<group>"; };
637+
F8E68E721C800B1600DBC517 /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZipArchive.framework; path = "Carthage/Checkouts/ZipArchive/build/Debug-iphoneos/ZipArchive.framework"; sourceTree = "<group>"; };
649638
F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+PullSpec.m"; sourceTree = "<group>"; };
650639
F8EFA0381B4059ED000FF7D0 /* GTUtilityFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTUtilityFunctions.h; sourceTree = "<group>"; };
651640
F8EFA0391B4059ED000FF7D0 /* GTUtilityFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTUtilityFunctions.m; sourceTree = "<group>"; };
@@ -660,6 +649,7 @@
660649
D0A0128A19F98475007F1914 /* Quick.framework in Frameworks */,
661650
88F05A9E16011F6E00B7AD1D /* ObjectiveGit.framework in Frameworks */,
662651
D0A0128C19F9853D007F1914 /* Nimble.framework in Frameworks */,
652+
F895F4DF1C801E5F004EA221 /* ZipArchive.framework in Frameworks */,
663653
);
664654
runOnlyForDeploymentPostprocessing = 0;
665655
};
@@ -693,6 +683,7 @@
693683
F879D8471B4B8138002D5C07 /* Nimble.framework in Frameworks */,
694684
F879D8451B4B8138002D5C07 /* Quick.framework in Frameworks */,
695685
F879D83C1B4B7F7D002D5C07 /* ObjectiveGit.framework in Frameworks */,
686+
F8E68E731C800B1600DBC517 /* ZipArchive.framework in Frameworks */,
696687
);
697688
runOnlyForDeploymentPostprocessing = 0;
698689
};
@@ -713,7 +704,6 @@
713704
0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */ = {
714705
isa = PBXGroup;
715706
children = (
716-
23BB67BB1C7DF45300A37A66 /* libz.tbd */,
717707
BDD8AB01130F01AB00CB5D40 /* README.md */,
718708
887B948D1A3A38130070D41D /* ObjectiveGit.modulemap */,
719709
BDE4C05E130EFE2C00851650 /* ObjectiveGit */,
@@ -737,6 +727,7 @@
737727
8803DA861313145700E6E818 /* libz.dylib */,
738728
F8D0078A1B4F9F9E009A8DAF /* libz.dylib */,
739729
884C8A3619FF4B4D0017E98D /* libz.dylib */,
730+
23BB67BB1C7DF45300A37A66 /* libz.tbd */,
740731
884C8A3819FF4B6D0017E98D /* libiconv.dylib */,
741732
6A1F2FD317C6A8F3003DFADE /* libcrypto.a */,
742733
6A1F2FD417C6A8F3003DFADE /* libssl.a */,
@@ -747,6 +738,8 @@
747738
D0A0128B19F9853D007F1914 /* Nimble.framework */,
748739
F879D8461B4B8138002D5C07 /* Nimble.framework */,
749740
889923F919FF5DD40092A9A6 /* git2 */,
741+
F895F4DE1C801E5F004EA221 /* ZipArchive.framework */,
742+
F8E68E721C800B1600DBC517 /* ZipArchive.framework */,
750743
);
751744
name = "External Frameworks and Libraries";
752745
sourceTree = "<group>";
@@ -803,7 +796,6 @@
803796
88F05A7516011E5400B7AD1D /* ObjectiveGitTests */ = {
804797
isa = PBXGroup;
805798
children = (
806-
F84E92581B8B6EA30019F947 /* SSZipArchive */,
807799
200578C418932A82001C06C3 /* GTBlameSpec.m */,
808800
4D1C40D7182C006D00BE2960 /* GTBlobSpec.m */,
809801
88A994B916FCE7D400402C7B /* GTBranchSpec.m */,
@@ -1045,19 +1037,6 @@
10451037
path = Scripts;
10461038
sourceTree = "<group>";
10471039
};
1048-
F84E92581B8B6EA30019F947 /* SSZipArchive */ = {
1049-
isa = PBXGroup;
1050-
children = (
1051-
F8D007801B4F9758009A8DAF /* SSZipArchive.m */,
1052-
F8D007821B4F97F9009A8DAF /* ioapi.c */,
1053-
F8D007831B4F97F9009A8DAF /* mztools.c */,
1054-
F8D007841B4F97F9009A8DAF /* unzip.c */,
1055-
F8D007851B4F97F9009A8DAF /* zip.c */,
1056-
);
1057-
name = SSZipArchive;
1058-
path = ..;
1059-
sourceTree = "<group>";
1060-
};
10611040
/* End PBXGroup section */
10621041

10631042
/* Begin PBXHeadersBuildPhase section */
@@ -1397,11 +1376,6 @@
13971376
isa = PBXSourcesBuildPhase;
13981377
buildActionMask = 2147483647;
13991378
files = (
1400-
23BB67BF1C7DF4CD00A37A66 /* ioapi.c in Sources */,
1401-
23BB67BE1C7DF4B100A37A66 /* mztools.c in Sources */,
1402-
23BB67BD1C7DF49500A37A66 /* zip.c in Sources */,
1403-
23BB67BA1C7DF3BC00A37A66 /* unzip.c in Sources */,
1404-
23BB67B91C7DF3B600A37A66 /* SSZipArchive.m in Sources */,
14051379
23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */,
14061380
D0751CD918BE520400134314 /* GTFilterListSpec.m in Sources */,
14071381
200578C518932A82001C06C3 /* GTBlameSpec.m in Sources */,
@@ -1603,11 +1577,6 @@
16031577
F8D007961B4FA03B009A8DAF /* GTRemotePushSpec.m in Sources */,
16041578
F8D007A51B4FA03B009A8DAF /* GTDiffDeltaSpec.m in Sources */,
16051579
F879D8481B4B83B9002D5C07 /* SwiftSpec.swift in Sources */,
1606-
F8D007811B4F9758009A8DAF /* SSZipArchive.m in Sources */,
1607-
F8D007861B4F97F9009A8DAF /* ioapi.c in Sources */,
1608-
F8D007871B4F97F9009A8DAF /* mztools.c in Sources */,
1609-
F8D007881B4F97F9009A8DAF /* unzip.c in Sources */,
1610-
F8D007891B4F97F9009A8DAF /* zip.c in Sources */,
16111580
);
16121581
runOnlyForDeploymentPostprocessing = 0;
16131582
};
@@ -1832,7 +1801,6 @@
18321801
HEADER_SEARCH_PATHS = (
18331802
External/libgit2/include,
18341803
/usr/local/include,
1835-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
18361804
);
18371805
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
18381806
MACOSX_DEPLOYMENT_TARGET = 10.9;
@@ -1852,7 +1820,6 @@
18521820
HEADER_SEARCH_PATHS = (
18531821
External/libgit2/include,
18541822
/usr/local/include,
1855-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
18561823
);
18571824
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
18581825
MACOSX_DEPLOYMENT_TARGET = 10.9;
@@ -1926,7 +1893,6 @@
19261893
HEADER_SEARCH_PATHS = (
19271894
External/libgit2/include,
19281895
/usr/local/include,
1929-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
19301896
);
19311897
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
19321898
MACOSX_DEPLOYMENT_TARGET = 10.9;
@@ -2160,7 +2126,6 @@
21602126
HEADER_SEARCH_PATHS = (
21612127
External/libgit2/include,
21622128
/usr/local/include,
2163-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
21642129
);
21652130
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
21662131
MACOSX_DEPLOYMENT_TARGET = 10.9;
@@ -2237,10 +2202,7 @@
22372202
COPY_PHASE_STRIP = NO;
22382203
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
22392204
ENABLE_STRICT_OBJC_MSGSEND = YES;
2240-
FRAMEWORK_SEARCH_PATHS = (
2241-
"$(SDKROOT)/Developer/Library/Frameworks",
2242-
"$(inherited)",
2243-
);
2205+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
22442206
GCC_C_LANGUAGE_STANDARD = gnu99;
22452207
GCC_DYNAMIC_NO_PIC = NO;
22462208
GCC_OPTIMIZATION_LEVEL = 0;
@@ -2259,10 +2221,7 @@
22592221
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
22602222
GCC_WARN_UNUSED_FUNCTION = YES;
22612223
GCC_WARN_UNUSED_VARIABLE = YES;
2262-
HEADER_SEARCH_PATHS = (
2263-
"$(inherited)",
2264-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
2265-
);
2224+
HEADER_SEARCH_PATHS = "$(inherited)";
22662225
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
22672226
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
22682227
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -2298,10 +2257,7 @@
22982257
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
22992258
ENABLE_NS_ASSERTIONS = NO;
23002259
ENABLE_STRICT_OBJC_MSGSEND = YES;
2301-
FRAMEWORK_SEARCH_PATHS = (
2302-
"$(SDKROOT)/Developer/Library/Frameworks",
2303-
"$(inherited)",
2304-
);
2260+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
23052261
GCC_C_LANGUAGE_STANDARD = gnu99;
23062262
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
23072263
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -2311,10 +2267,7 @@
23112267
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
23122268
GCC_WARN_UNUSED_FUNCTION = YES;
23132269
GCC_WARN_UNUSED_VARIABLE = YES;
2314-
HEADER_SEARCH_PATHS = (
2315-
"$(inherited)",
2316-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
2317-
);
2270+
HEADER_SEARCH_PATHS = "$(inherited)";
23182271
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
23192272
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
23202273
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -2351,10 +2304,7 @@
23512304
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
23522305
ENABLE_NS_ASSERTIONS = NO;
23532306
ENABLE_STRICT_OBJC_MSGSEND = YES;
2354-
FRAMEWORK_SEARCH_PATHS = (
2355-
"$(SDKROOT)/Developer/Library/Frameworks",
2356-
"$(inherited)",
2357-
);
2307+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
23582308
GCC_C_LANGUAGE_STANDARD = gnu99;
23592309
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
23602310
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -2364,10 +2314,7 @@
23642314
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
23652315
GCC_WARN_UNUSED_FUNCTION = YES;
23662316
GCC_WARN_UNUSED_VARIABLE = YES;
2367-
HEADER_SEARCH_PATHS = (
2368-
"$(inherited)",
2369-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
2370-
);
2317+
HEADER_SEARCH_PATHS = "$(inherited)";
23712318
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
23722319
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
23732320
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -2404,10 +2351,7 @@
24042351
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
24052352
ENABLE_NS_ASSERTIONS = NO;
24062353
ENABLE_STRICT_OBJC_MSGSEND = YES;
2407-
FRAMEWORK_SEARCH_PATHS = (
2408-
"$(SDKROOT)/Developer/Library/Frameworks",
2409-
"$(inherited)",
2410-
);
2354+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
24112355
GCC_C_LANGUAGE_STANDARD = gnu99;
24122356
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
24132357
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -2417,10 +2361,7 @@
24172361
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
24182362
GCC_WARN_UNUSED_FUNCTION = YES;
24192363
GCC_WARN_UNUSED_VARIABLE = YES;
2420-
HEADER_SEARCH_PATHS = (
2421-
"$(inherited)",
2422-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
2423-
);
2364+
HEADER_SEARCH_PATHS = "$(inherited)";
24242365
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
24252366
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
24262367
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

‎ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ObjectiveGitTests/QuickSpec+GTFixtures.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#import <ObjectiveGit/ObjectiveGit.h>
1010
#import "QuickSpec+GTFixtures.h"
1111
#import <objc/runtime.h>
12-
#import "SSZipArchive.h"
12+
#import <ZipArchive/ZipArchive.h>
1313

1414
static const NSInteger FixturesErrorUnzipFailed = 666;
1515

0 commit comments

Comments
 (0)