Skip to content

Commit baa9dd2

Browse files
phatblatphatblat
committed
Consume ZipArchive framework instead of sources
1 parent 1051e87 commit baa9dd2

File tree

2 files changed

+13
-27
lines changed

2 files changed

+13
-27
lines changed

‎ObjectiveGitFramework.xcodeproj/project.pbxproj

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -331,11 +331,6 @@
331331
F8D007731B4F7CC3009A8DAF /* GTSignatureSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D040AF77177B9A9E001AD9EB /* GTSignatureSpec.m */; };
332332
F8D007741B4F7CCC009A8DAF /* GTOIDSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D040AF6F177B9779001AD9EB /* GTOIDSpec.m */; };
333333
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 */; };
339334
F8D0078B1B4F9F9E009A8DAF /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D0078A1B4F9F9E009A8DAF /* libz.dylib */; };
340335
F8D0078C1B4FA03B009A8DAF /* GTBlobSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1C40D7182C006D00BE2960 /* GTBlobSpec.m */; };
341336
F8D0078D1B4FA03B009A8DAF /* GTBranchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994B916FCE7D400402C7B /* GTBranchSpec.m */; };
@@ -371,6 +366,7 @@
371366
F8D1BDF01B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; };
372367
F8D1BDF11B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; };
373368
F8E4A2911A170CA6006485A8 /* GTRemotePushSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */; };
369+
F8E68E731C800B1600DBC517 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8E68E721C800B1600DBC517 /* ZipArchive.framework */; };
374370
F8EFA03A1B4059ED000FF7D0 /* GTUtilityFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0391B4059ED000FF7D0 /* GTUtilityFunctions.m */; };
375371
/* End PBXBuildFile section */
376372

@@ -646,6 +642,7 @@
646642
F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Pull.h"; sourceTree = "<group>"; };
647643
F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Pull.m"; sourceTree = "<group>"; };
648644
F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemotePushSpec.m; sourceTree = "<group>"; };
645+
F8E68E721C800B1600DBC517 /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZipArchive.framework; path = "Carthage/Checkouts/ZipArchive/build/Debug-iphoneos/ZipArchive.framework"; sourceTree = "<group>"; };
649646
F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+PullSpec.m"; sourceTree = "<group>"; };
650647
F8EFA0381B4059ED000FF7D0 /* GTUtilityFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTUtilityFunctions.h; sourceTree = "<group>"; };
651648
F8EFA0391B4059ED000FF7D0 /* GTUtilityFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTUtilityFunctions.m; sourceTree = "<group>"; };
@@ -693,6 +690,7 @@
693690
F879D8471B4B8138002D5C07 /* Nimble.framework in Frameworks */,
694691
F879D8451B4B8138002D5C07 /* Quick.framework in Frameworks */,
695692
F879D83C1B4B7F7D002D5C07 /* ObjectiveGit.framework in Frameworks */,
693+
F8E68E731C800B1600DBC517 /* ZipArchive.framework in Frameworks */,
696694
);
697695
runOnlyForDeploymentPostprocessing = 0;
698696
};
@@ -713,6 +711,7 @@
713711
0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */ = {
714712
isa = PBXGroup;
715713
children = (
714+
F8E68E721C800B1600DBC517 /* ZipArchive.framework */,
716715
23BB67BB1C7DF45300A37A66 /* libz.tbd */,
717716
BDD8AB01130F01AB00CB5D40 /* README.md */,
718717
887B948D1A3A38130070D41D /* ObjectiveGit.modulemap */,
@@ -1603,11 +1602,6 @@
16031602
F8D007961B4FA03B009A8DAF /* GTRemotePushSpec.m in Sources */,
16041603
F8D007A51B4FA03B009A8DAF /* GTDiffDeltaSpec.m in Sources */,
16051604
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 */,
16111605
);
16121606
runOnlyForDeploymentPostprocessing = 0;
16131607
};
@@ -2244,6 +2238,7 @@
22442238
FRAMEWORK_SEARCH_PATHS = (
22452239
"$(SDKROOT)/Developer/Library/Frameworks",
22462240
"$(inherited)",
2241+
"$(SRCROOT)/Carthage/Build/iOS",
22472242
);
22482243
GCC_C_LANGUAGE_STANDARD = gnu99;
22492244
GCC_DYNAMIC_NO_PIC = NO;
@@ -2263,10 +2258,7 @@
22632258
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
22642259
GCC_WARN_UNUSED_FUNCTION = YES;
22652260
GCC_WARN_UNUSED_VARIABLE = YES;
2266-
HEADER_SEARCH_PATHS = (
2267-
"$(inherited)",
2268-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
2269-
);
2261+
HEADER_SEARCH_PATHS = "$(inherited)";
22702262
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
22712263
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
22722264
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -2305,6 +2297,7 @@
23052297
FRAMEWORK_SEARCH_PATHS = (
23062298
"$(SDKROOT)/Developer/Library/Frameworks",
23072299
"$(inherited)",
2300+
"$(SRCROOT)/Carthage/Build/iOS",
23082301
);
23092302
GCC_C_LANGUAGE_STANDARD = gnu99;
23102303
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -2315,10 +2308,7 @@
23152308
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
23162309
GCC_WARN_UNUSED_FUNCTION = YES;
23172310
GCC_WARN_UNUSED_VARIABLE = YES;
2318-
HEADER_SEARCH_PATHS = (
2319-
"$(inherited)",
2320-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
2321-
);
2311+
HEADER_SEARCH_PATHS = "$(inherited)";
23222312
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
23232313
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
23242314
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -2358,6 +2348,7 @@
23582348
FRAMEWORK_SEARCH_PATHS = (
23592349
"$(SDKROOT)/Developer/Library/Frameworks",
23602350
"$(inherited)",
2351+
"$(SRCROOT)/Carthage/Build/iOS",
23612352
);
23622353
GCC_C_LANGUAGE_STANDARD = gnu99;
23632354
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -2368,10 +2359,7 @@
23682359
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
23692360
GCC_WARN_UNUSED_FUNCTION = YES;
23702361
GCC_WARN_UNUSED_VARIABLE = YES;
2371-
HEADER_SEARCH_PATHS = (
2372-
"$(inherited)",
2373-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
2374-
);
2362+
HEADER_SEARCH_PATHS = "$(inherited)";
23752363
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
23762364
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
23772365
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -2411,6 +2399,7 @@
24112399
FRAMEWORK_SEARCH_PATHS = (
24122400
"$(SDKROOT)/Developer/Library/Frameworks",
24132401
"$(inherited)",
2402+
"$(SRCROOT)/Carthage/Build/iOS",
24142403
);
24152404
GCC_C_LANGUAGE_STANDARD = gnu99;
24162405
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -2421,10 +2410,7 @@
24212410
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
24222411
GCC_WARN_UNUSED_FUNCTION = YES;
24232412
GCC_WARN_UNUSED_VARIABLE = YES;
2424-
HEADER_SEARCH_PATHS = (
2425-
"$(inherited)",
2426-
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
2427-
);
2413+
HEADER_SEARCH_PATHS = "$(inherited)";
24282414
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
24292415
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
24302416
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

‎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)