From 1051e8740e92d3d8a9c008b6861fbcc007e8c392 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Thu, 25 Feb 2016 21:23:03 -0700 Subject: [PATCH 1/6] Update ZipArchive to 1.1 --- Cartfile.private | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/ZipArchive | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 27124f747..6e6efae93 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,4 +1,4 @@ github "jspahrsummers/xcconfigs" >= 0.7.1 github "Quick/Quick" ~> 0.9.1 github "Quick/Nimble" ~> 3.1 -github "ZipArchive/ZipArchive" == 1.0.1 +github "ZipArchive/ZipArchive" ~> 1.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index 49f32b208..b3fea9146 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ github "Quick/Nimble" "v3.1.0" github "Quick/Quick" "v0.9.1" -github "ZipArchive/ZipArchive" "v1.0.1" +github "ZipArchive/ZipArchive" "v1.1" github "jspahrsummers/xcconfigs" "0.9" diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index d2799f60a..057c49375 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit d2799f60a8a2332da182489c78aedbe3985b6271 +Subproject commit 057c4937552f421d782e6d07ae09191b191bcc23 From baa9dd2c9f328d70705a8232b23dad3b93a453d2 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Thu, 25 Feb 2016 21:30:45 -0700 Subject: [PATCH 2/6] Consume ZipArchive framework instead of sources --- .../project.pbxproj | 38 ++++++------------- ObjectiveGitTests/QuickSpec+GTFixtures.m | 2 +- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 1493a3343..baf1cee01 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -331,11 +331,6 @@ F8D007731B4F7CC3009A8DAF /* GTSignatureSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D040AF77177B9A9E001AD9EB /* GTSignatureSpec.m */; }; F8D007741B4F7CCC009A8DAF /* GTOIDSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D040AF6F177B9779001AD9EB /* GTOIDSpec.m */; }; F8D007761B4F7D10009A8DAF /* GTTimeAdditionsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 30B1E7FF1703871900D0814D /* GTTimeAdditionsSpec.m */; }; - F8D007811B4F9758009A8DAF /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D007801B4F9758009A8DAF /* SSZipArchive.m */; }; - F8D007861B4F97F9009A8DAF /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007821B4F97F9009A8DAF /* ioapi.c */; }; - F8D007871B4F97F9009A8DAF /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007831B4F97F9009A8DAF /* mztools.c */; }; - F8D007881B4F97F9009A8DAF /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007841B4F97F9009A8DAF /* unzip.c */; }; - F8D007891B4F97F9009A8DAF /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007851B4F97F9009A8DAF /* zip.c */; }; F8D0078B1B4F9F9E009A8DAF /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D0078A1B4F9F9E009A8DAF /* libz.dylib */; }; F8D0078C1B4FA03B009A8DAF /* GTBlobSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1C40D7182C006D00BE2960 /* GTBlobSpec.m */; }; F8D0078D1B4FA03B009A8DAF /* GTBranchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994B916FCE7D400402C7B /* GTBranchSpec.m */; }; @@ -371,6 +366,7 @@ F8D1BDF01B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; }; F8D1BDF11B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; }; F8E4A2911A170CA6006485A8 /* GTRemotePushSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */; }; + F8E68E731C800B1600DBC517 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8E68E721C800B1600DBC517 /* ZipArchive.framework */; }; F8EFA03A1B4059ED000FF7D0 /* GTUtilityFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0391B4059ED000FF7D0 /* GTUtilityFunctions.m */; }; /* End PBXBuildFile section */ @@ -646,6 +642,7 @@ F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Pull.h"; sourceTree = ""; }; F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Pull.m"; sourceTree = ""; }; F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemotePushSpec.m; sourceTree = ""; }; + F8E68E721C800B1600DBC517 /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZipArchive.framework; path = "Carthage/Checkouts/ZipArchive/build/Debug-iphoneos/ZipArchive.framework"; sourceTree = ""; }; F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+PullSpec.m"; sourceTree = ""; }; F8EFA0381B4059ED000FF7D0 /* GTUtilityFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTUtilityFunctions.h; sourceTree = ""; }; F8EFA0391B4059ED000FF7D0 /* GTUtilityFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTUtilityFunctions.m; sourceTree = ""; }; @@ -693,6 +690,7 @@ F879D8471B4B8138002D5C07 /* Nimble.framework in Frameworks */, F879D8451B4B8138002D5C07 /* Quick.framework in Frameworks */, F879D83C1B4B7F7D002D5C07 /* ObjectiveGit.framework in Frameworks */, + F8E68E731C800B1600DBC517 /* ZipArchive.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -713,6 +711,7 @@ 0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */ = { isa = PBXGroup; children = ( + F8E68E721C800B1600DBC517 /* ZipArchive.framework */, 23BB67BB1C7DF45300A37A66 /* libz.tbd */, BDD8AB01130F01AB00CB5D40 /* README.md */, 887B948D1A3A38130070D41D /* ObjectiveGit.modulemap */, @@ -1603,11 +1602,6 @@ F8D007961B4FA03B009A8DAF /* GTRemotePushSpec.m in Sources */, F8D007A51B4FA03B009A8DAF /* GTDiffDeltaSpec.m in Sources */, F879D8481B4B83B9002D5C07 /* SwiftSpec.swift in Sources */, - F8D007811B4F9758009A8DAF /* SSZipArchive.m in Sources */, - F8D007861B4F97F9009A8DAF /* ioapi.c in Sources */, - F8D007871B4F97F9009A8DAF /* mztools.c in Sources */, - F8D007881B4F97F9009A8DAF /* unzip.c in Sources */, - F8D007891B4F97F9009A8DAF /* zip.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2244,6 +2238,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", + "$(SRCROOT)/Carthage/Build/iOS", ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -2263,10 +2258,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "Carthage/Checkouts/ZipArchive/SSZipArchive/**", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -2305,6 +2297,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", + "$(SRCROOT)/Carthage/Build/iOS", ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -2315,10 +2308,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "Carthage/Checkouts/ZipArchive/SSZipArchive/**", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -2358,6 +2348,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", + "$(SRCROOT)/Carthage/Build/iOS", ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -2368,10 +2359,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "Carthage/Checkouts/ZipArchive/SSZipArchive/**", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -2411,6 +2399,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", + "$(SRCROOT)/Carthage/Build/iOS", ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -2421,10 +2410,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "Carthage/Checkouts/ZipArchive/SSZipArchive/**", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; diff --git a/ObjectiveGitTests/QuickSpec+GTFixtures.m b/ObjectiveGitTests/QuickSpec+GTFixtures.m index cc63e887f..9d7302e65 100644 --- a/ObjectiveGitTests/QuickSpec+GTFixtures.m +++ b/ObjectiveGitTests/QuickSpec+GTFixtures.m @@ -9,7 +9,7 @@ #import #import "QuickSpec+GTFixtures.h" #import -#import "SSZipArchive.h" +#import static const NSInteger FixturesErrorUnzipFailed = 666; From 6cab7e21b366b377f0e912d3578e4dc05eadb22e Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Thu, 25 Feb 2016 21:32:44 -0700 Subject: [PATCH 3/6] Remove unused frameworks folder path Gets rid of warning: Directory not found for option '-F/Applications/Xcode7.2.1.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator9.2.sdk/Developer/Library/Frameworks' --- .../project.pbxproj | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index baf1cee01..01220b10d 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -2235,11 +2235,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(SRCROOT)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -2294,11 +2290,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(SRCROOT)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -2345,11 +2337,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(SRCROOT)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -2396,11 +2384,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(SRCROOT)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; From 9d483d8a37725833570487425c470a24d46448ba Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Thu, 25 Feb 2016 21:44:54 -0700 Subject: [PATCH 4/6] Add ZipArchive project reference This causes Xcode to build the framework as needed so it doesn't need to be prebuilt using carthage --- ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata b/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata index f9725c4b5..d37216e50 100644 --- a/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata +++ b/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata @@ -13,4 +13,7 @@ + + From ef17121be8a14a93d52e73fc198f7ecf1d7a52e7 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Thu, 25 Feb 2016 22:50:30 -0700 Subject: [PATCH 5/6] Use ZipArchive.framework for Mac Tests too --- .../project.pbxproj | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 01220b10d..e62fc83b0 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -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, ); }; }; @@ -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 */; }; @@ -633,6 +629,7 @@ F879D82F1B4B77F4002D5C07 /* Libgit2FeaturesSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Libgit2FeaturesSpec.m; sourceTree = ""; }; 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 = ""; }; + F895F4DE1C801E5F004EA221 /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZipArchive.framework; path = "/Volumes/DerivedData/ObjectiveGitFramework-drtqacfhlqybdcdpqayztrrwneun/Build/Products/Debug/ZipArchive.framework"; sourceTree = ""; }; F8D007801B4F9758009A8DAF /* SSZipArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SSZipArchive.m; path = Carthage/Checkouts/ZipArchive/SSZipArchive/SSZipArchive.m; sourceTree = ""; }; F8D007821B4F97F9009A8DAF /* ioapi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/ioapi.c; sourceTree = ""; }; F8D007831B4F97F9009A8DAF /* mztools.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = mztools.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/mztools.c; sourceTree = ""; }; @@ -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; }; @@ -711,8 +709,6 @@ 0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */ = { isa = PBXGroup; children = ( - F8E68E721C800B1600DBC517 /* ZipArchive.framework */, - 23BB67BB1C7DF45300A37A66 /* libz.tbd */, BDD8AB01130F01AB00CB5D40 /* README.md */, 887B948D1A3A38130070D41D /* ObjectiveGit.modulemap */, BDE4C05E130EFE2C00851650 /* ObjectiveGit */, @@ -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 */, @@ -746,6 +743,8 @@ D0A0128B19F9853D007F1914 /* Nimble.framework */, F879D8461B4B8138002D5C07 /* Nimble.framework */, 889923F919FF5DD40092A9A6 /* git2 */, + F895F4DE1C801E5F004EA221 /* ZipArchive.framework */, + F8E68E721C800B1600DBC517 /* ZipArchive.framework */, ); name = "External Frameworks and Libraries"; sourceTree = ""; @@ -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 */, @@ -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; @@ -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; @@ -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; @@ -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; From 834d8b7f54258f4d05707f0f193167429521da47 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Thu, 25 Feb 2016 22:50:53 -0700 Subject: [PATCH 6/6] Remove obsolete SSZipArchive group --- .../project.pbxproj | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index e62fc83b0..83ac06027 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -630,11 +630,6 @@ 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 = ""; }; F895F4DE1C801E5F004EA221 /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZipArchive.framework; path = "/Volumes/DerivedData/ObjectiveGitFramework-drtqacfhlqybdcdpqayztrrwneun/Build/Products/Debug/ZipArchive.framework"; sourceTree = ""; }; - F8D007801B4F9758009A8DAF /* SSZipArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SSZipArchive.m; path = Carthage/Checkouts/ZipArchive/SSZipArchive/SSZipArchive.m; sourceTree = ""; }; - F8D007821B4F97F9009A8DAF /* ioapi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/ioapi.c; sourceTree = ""; }; - F8D007831B4F97F9009A8DAF /* mztools.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = mztools.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/mztools.c; sourceTree = ""; }; - F8D007841B4F97F9009A8DAF /* unzip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = unzip.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/unzip.c; sourceTree = ""; }; - F8D007851B4F97F9009A8DAF /* zip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zip.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/zip.c; sourceTree = ""; }; 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; }; F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Pull.h"; sourceTree = ""; }; F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Pull.m"; sourceTree = ""; }; @@ -801,7 +796,6 @@ 88F05A7516011E5400B7AD1D /* ObjectiveGitTests */ = { isa = PBXGroup; children = ( - F84E92581B8B6EA30019F947 /* SSZipArchive */, 200578C418932A82001C06C3 /* GTBlameSpec.m */, 4D1C40D7182C006D00BE2960 /* GTBlobSpec.m */, 88A994B916FCE7D400402C7B /* GTBranchSpec.m */, @@ -1043,19 +1037,6 @@ path = Scripts; sourceTree = ""; }; - F84E92581B8B6EA30019F947 /* SSZipArchive */ = { - isa = PBXGroup; - children = ( - F8D007801B4F9758009A8DAF /* SSZipArchive.m */, - F8D007821B4F97F9009A8DAF /* ioapi.c */, - F8D007831B4F97F9009A8DAF /* mztools.c */, - F8D007841B4F97F9009A8DAF /* unzip.c */, - F8D007851B4F97F9009A8DAF /* zip.c */, - ); - name = SSZipArchive; - path = ..; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */