Skip to content

ZipArchive 1.1 #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 27, 2016
Merged

ZipArchive 1.1 #557

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1051e87
Update ZipArchive to 1.1
phatblat Feb 26, 2016
baa9dd2
Consume ZipArchive framework instead of sources
phatblat Feb 26, 2016
6cab7e2
Remove unused frameworks folder path
phatblat Feb 26, 2016
9d483d8
Add ZipArchive project reference
phatblat Feb 26, 2016
ef17121
Use ZipArchive.framework for Mac Tests too
phatblat Feb 26, 2016
834d8b7
Remove obsolete SSZipArchive group
phatblat Feb 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use ZipArchive.framework for Mac Tests too
  • Loading branch information
@phatblat
phatblat committed Feb 26, 2016
commit ef17121be8a14a93d52e73fc198f7ecf1d7a52e7
22 changes: 6 additions & 16 deletions ObjectiveGitFramework.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,7 @@
2089E43C17D9A58000F451DA /* GTTagSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 2089E43B17D9A58000F451DA /* GTTagSpec.m */; };
20F43DE318A2F668007D3621 /* GTRepository+Blame.h in Headers */ = {isa = PBXBuildFile; fileRef = 20F43DE118A2F667007D3621 /* GTRepository+Blame.h */; settings = {ATTRIBUTES = (Public, ); }; };
20F43DE618A2F668007D3621 /* GTRepository+Blame.m in Sources */ = {isa = PBXBuildFile; fileRef = 20F43DE218A2F667007D3621 /* GTRepository+Blame.m */; };
23BB67B91C7DF3B600A37A66 /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D007801B4F9758009A8DAF /* SSZipArchive.m */; };
23BB67BA1C7DF3BC00A37A66 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007841B4F97F9009A8DAF /* unzip.c */; };
23BB67BC1C7DF45300A37A66 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 23BB67BB1C7DF45300A37A66 /* libz.tbd */; };
23BB67BD1C7DF49500A37A66 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007851B4F97F9009A8DAF /* zip.c */; };
23BB67BE1C7DF4B100A37A66 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007831B4F97F9009A8DAF /* mztools.c */; };
23BB67BF1C7DF4CD00A37A66 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007821B4F97F9009A8DAF /* ioapi.c */; };
23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; };
23BB67C21C7DF60400A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; };
3011D86B1668E48500CE3409 /* GTDiffFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3011D8691668E48500CE3409 /* GTDiffFile.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -325,6 +320,7 @@
F879D8451B4B8138002D5C07 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0A0128819F98475007F1914 /* Quick.framework */; };
F879D8471B4B8138002D5C07 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F879D8461B4B8138002D5C07 /* Nimble.framework */; };
F879D8481B4B83B9002D5C07 /* SwiftSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0A0129619F9A660007F1914 /* SwiftSpec.swift */; };
F895F4DF1C801E5F004EA221 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F895F4DE1C801E5F004EA221 /* ZipArchive.framework */; };
F8D007701B4F7CA8009A8DAF /* NSErrorGitSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F4E28917C7F24200BBDE30 /* NSErrorGitSpec.m */; };
F8D007711B4F7CB0009A8DAF /* NSDataGitSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D01EFD9F195DEF2200838D24 /* NSDataGitSpec.m */; };
F8D007721B4F7CB6009A8DAF /* NSArray+StringArraySpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 307623AA17C6C8BD00E2CDF1 /* NSArray+StringArraySpec.m */; };
Expand Down Expand Up @@ -633,6 +629,7 @@
F879D82F1B4B77F4002D5C07 /* Libgit2FeaturesSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Libgit2FeaturesSpec.m; sourceTree = "<group>"; };
F879D8361B4B7F7C002D5C07 /* ObjectiveGit-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ObjectiveGit-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
F879D8461B4B8138002D5C07 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = "Carthage/Checkouts/Nimble/build/Debug-iphoneos/Nimble.framework"; sourceTree = "<group>"; };
F895F4DE1C801E5F004EA221 /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZipArchive.framework; path = "/Volumes/DerivedData/ObjectiveGitFramework-drtqacfhlqybdcdpqayztrrwneun/Build/Products/Debug/ZipArchive.framework"; sourceTree = "<absolute>"; };
F8D007801B4F9758009A8DAF /* SSZipArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SSZipArchive.m; path = Carthage/Checkouts/ZipArchive/SSZipArchive/SSZipArchive.m; sourceTree = "<group>"; };
F8D007821B4F97F9009A8DAF /* ioapi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/ioapi.c; sourceTree = "<group>"; };
F8D007831B4F97F9009A8DAF /* mztools.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = mztools.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/mztools.c; sourceTree = "<group>"; };
Expand All @@ -657,6 +654,7 @@
D0A0128A19F98475007F1914 /* Quick.framework in Frameworks */,
88F05A9E16011F6E00B7AD1D /* ObjectiveGit.framework in Frameworks */,
D0A0128C19F9853D007F1914 /* Nimble.framework in Frameworks */,
F895F4DF1C801E5F004EA221 /* ZipArchive.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -711,8 +709,6 @@
0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */ = {
isa = PBXGroup;
children = (
F8E68E721C800B1600DBC517 /* ZipArchive.framework */,
23BB67BB1C7DF45300A37A66 /* libz.tbd */,
BDD8AB01130F01AB00CB5D40 /* README.md */,
887B948D1A3A38130070D41D /* ObjectiveGit.modulemap */,
BDE4C05E130EFE2C00851650 /* ObjectiveGit */,
Expand All @@ -736,6 +732,7 @@
8803DA861313145700E6E818 /* libz.dylib */,
F8D0078A1B4F9F9E009A8DAF /* libz.dylib */,
884C8A3619FF4B4D0017E98D /* libz.dylib */,
23BB67BB1C7DF45300A37A66 /* libz.tbd */,
884C8A3819FF4B6D0017E98D /* libiconv.dylib */,
6A1F2FD317C6A8F3003DFADE /* libcrypto.a */,
6A1F2FD417C6A8F3003DFADE /* libssl.a */,
Expand All @@ -746,6 +743,8 @@
D0A0128B19F9853D007F1914 /* Nimble.framework */,
F879D8461B4B8138002D5C07 /* Nimble.framework */,
889923F919FF5DD40092A9A6 /* git2 */,
F895F4DE1C801E5F004EA221 /* ZipArchive.framework */,
F8E68E721C800B1600DBC517 /* ZipArchive.framework */,
);
name = "External Frameworks and Libraries";
sourceTree = "<group>";
Expand Down Expand Up @@ -1396,11 +1395,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
23BB67BF1C7DF4CD00A37A66 /* ioapi.c in Sources */,
23BB67BE1C7DF4B100A37A66 /* mztools.c in Sources */,
23BB67BD1C7DF49500A37A66 /* zip.c in Sources */,
23BB67BA1C7DF3BC00A37A66 /* unzip.c in Sources */,
23BB67B91C7DF3B600A37A66 /* SSZipArchive.m in Sources */,
23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */,
D0751CD918BE520400134314 /* GTFilterListSpec.m in Sources */,
200578C518932A82001C06C3 /* GTBlameSpec.m in Sources */,
Expand Down Expand Up @@ -1826,7 +1820,6 @@
HEADER_SEARCH_PATHS = (
External/libgit2/include,
/usr/local/include,
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
);
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.9;
Expand All @@ -1846,7 +1839,6 @@
HEADER_SEARCH_PATHS = (
External/libgit2/include,
/usr/local/include,
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
);
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.9;
Expand Down Expand Up @@ -1920,7 +1912,6 @@
HEADER_SEARCH_PATHS = (
External/libgit2/include,
/usr/local/include,
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
);
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.9;
Expand Down Expand Up @@ -2158,7 +2149,6 @@
HEADER_SEARCH_PATHS = (
External/libgit2/include,
/usr/local/include,
"Carthage/Checkouts/ZipArchive/SSZipArchive/**",
);
INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.9;
Expand Down