diff --git a/.gitignore b/.gitignore index 6910fd5..a4265cf 100644 --- a/.gitignore +++ b/.gitignore @@ -28,5 +28,5 @@ Pods/ # Carthage # # Add this line if you want to avoid checking in source code from Carthage dependencies. -Carthage/Checkouts -Carthage/Build +**/Carthage/Checkouts +**/Carthage/Build \ No newline at end of file diff --git a/README.md b/README.md index 9ec51c8..593f26d 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,9 @@ ZipArchive is a simple utility class for zipping and unzipping files on iOS and `pod install SSZipArchive` +### Carthage +`github "ZipArchive/ZipArchive"` + ### Manual 1. Add the `SSZipArchive` and `minizip` folders to your project. diff --git a/SSZipArchive/SSZipArchive.h b/SSZipArchive/SSZipArchive.h index fba2840..35d70d8 100755 --- a/SSZipArchive/SSZipArchive.h +++ b/SSZipArchive/SSZipArchive.h @@ -50,7 +50,7 @@ - (instancetype)initWithPath:(NSString *)path; @property (NS_NONATOMIC_IOSONLY, readonly, getter = isOpen) BOOL open; - (BOOL)writeFile:(NSString *)path withPassword:(NSString *)password; -- (BOOL)writeFolderAtPath:(NSString *)path withFolderName:(NSString *)folderName; +- (BOOL)writeFolderAtPath:(NSString *)path withFolderName:(NSString *)folderName withPassword:(NSString *)password; - (BOOL)writeFileAtPath:(NSString *)path withFileName:(NSString *)fileName withPassword:(NSString *)password; - (BOOL)writeData:(NSData *)data filename:(NSString *)filename withPassword:(NSString *)password; @property (NS_NONATOMIC_IOSONLY, readonly, getter = isClosed) BOOL close; diff --git a/SSZipArchive/ZipArchive.h b/SSZipArchive/ZipArchive.h index 5ce44e3..e0c96fc 100644 --- a/SSZipArchive/ZipArchive.h +++ b/SSZipArchive/ZipArchive.h @@ -6,7 +6,7 @@ // Copyright © 2015 smumryak. All rights reserved. // -#import +#import //! Project version number for ZipArchive. FOUNDATION_EXPORT double ZipArchiveVersionNumber; diff --git a/SwiftExample/Cartfile b/SwiftExample/Cartfile new file mode 100644 index 0000000..d261763 --- /dev/null +++ b/SwiftExample/Cartfile @@ -0,0 +1 @@ +github "ZipArchive/ZipArchive" \ No newline at end of file diff --git a/SwiftExample/SwiftExample.xcodeproj/project.pbxproj b/SwiftExample/SwiftExample.xcodeproj/project.pbxproj index 396a740..9c63206 100644 --- a/SwiftExample/SwiftExample.xcodeproj/project.pbxproj +++ b/SwiftExample/SwiftExample.xcodeproj/project.pbxproj @@ -7,6 +7,14 @@ objects = { /* Begin PBXBuildFile section */ + 2B4B24671C21500E00CC99E5 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 8DFE19391BDA7D8C00709011 /* mztools.c */; }; + 2B4B24681C21500E00CC99E5 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFE190E1BDA74F800709011 /* ViewController.swift */; }; + 2B4B24691C21500E00CC99E5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFE190C1BDA74F800709011 /* AppDelegate.swift */; }; + 2B4B246D1C21500E00CC99E5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DFE19151BDA74F800709011 /* LaunchScreen.storyboard */; }; + 2B4B246E1C21500E00CC99E5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8DFE19131BDA74F800709011 /* Assets.xcassets */; }; + 2B4B246F1C21500E00CC99E5 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DFE19101BDA74F800709011 /* Main.storyboard */; }; + 2B4B24701C21500E00CC99E5 /* Sample Data in Resources */ = {isa = PBXBuildFile; fileRef = 8DFE19461BDA82EA00709011 /* Sample Data */; }; + 57AA942E1C28397000858D82 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57AA942D1C28397000858D82 /* ZipArchive.framework */; }; 5914648EC4509E192D31CA42 /* Pods_SwiftExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E81180168B01E0210FE1E3F /* Pods_SwiftExample.framework */; }; 8DFE190D1BDA74F800709011 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFE190C1BDA74F800709011 /* AppDelegate.swift */; }; 8DFE190F1BDA74F800709011 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DFE190E1BDA74F800709011 /* ViewController.swift */; }; @@ -29,6 +37,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 2B4B24761C21500E00CC99E5 /* SwiftExampleCarthage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftExampleCarthage.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 2B4B247A1C21508900CC99E5 /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZipArchive.framework; path = ../Carthage/Build/iOS/ZipArchive.framework; sourceTree = ""; }; + 57AA942D1C28397000858D82 /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZipArchive.framework; path = Carthage/Build/iOS/ZipArchive.framework; sourceTree = ""; }; 8DFE19091BDA74F800709011 /* SwiftExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8DFE190C1BDA74F800709011 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 8DFE190E1BDA74F800709011 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -58,6 +69,14 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 2B4B24791C21507400CC99E5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 57AA942E1C28397000858D82 /* ZipArchive.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8DFE19061BDA74F800709011 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -79,6 +98,8 @@ 1B67DA700507825BD99DCEA7 /* Frameworks */ = { isa = PBXGroup; children = ( + 57AA942D1C28397000858D82 /* ZipArchive.framework */, + 2B4B247A1C21508900CC99E5 /* ZipArchive.framework */, 9E81180168B01E0210FE1E3F /* Pods_SwiftExample.framework */, ); name = Frameworks; @@ -101,6 +122,7 @@ children = ( 8DFE19091BDA74F800709011 /* SwiftExample.app */, 8DFE191D1BDA74F800709011 /* SwiftExampleTests.xctest */, + 2B4B24761C21500E00CC99E5 /* SwiftExampleCarthage.app */, ); name = Products; sourceTree = ""; @@ -168,6 +190,24 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 2B4B24641C21500E00CC99E5 /* SwiftExampleCarthage */ = { + isa = PBXNativeTarget; + buildConfigurationList = 2B4B24731C21500E00CC99E5 /* Build configuration list for PBXNativeTarget "SwiftExampleCarthage" */; + buildPhases = ( + 2B4B24661C21500E00CC99E5 /* Sources */, + 2B4B24791C21507400CC99E5 /* Frameworks */, + 2B4B246C1C21500E00CC99E5 /* Resources */, + 2B4B247D1C2150A600CC99E5 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SwiftExampleCarthage; + productName = SwiftExample; + productReference = 2B4B24761C21500E00CC99E5 /* SwiftExampleCarthage.app */; + productType = "com.apple.product-type.application"; + }; 8DFE19081BDA74F800709011 /* SwiftExample */ = { isa = PBXNativeTarget; buildConfigurationList = 8DFE19261BDA74F800709011 /* Build configuration list for PBXNativeTarget "SwiftExample" */; @@ -239,11 +279,23 @@ targets = ( 8DFE19081BDA74F800709011 /* SwiftExample */, 8DFE191C1BDA74F800709011 /* SwiftExampleTests */, + 2B4B24641C21500E00CC99E5 /* SwiftExampleCarthage */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 2B4B246C1C21500E00CC99E5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2B4B246D1C21500E00CC99E5 /* LaunchScreen.storyboard in Resources */, + 2B4B246E1C21500E00CC99E5 /* Assets.xcassets in Resources */, + 2B4B246F1C21500E00CC99E5 /* Main.storyboard in Resources */, + 2B4B24701C21500E00CC99E5 /* Sample Data in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8DFE19071BDA74F800709011 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -265,6 +317,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 2B4B247D1C2150A600CC99E5 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/Carthage/Build/iOS/ZipArchive.framework", + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/usr/local/bin/carthage copy-frameworks"; + showEnvVarsInLog = 0; + }; AEFD7A965DD623210F3FCEAA /* Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -313,6 +380,16 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 2B4B24661C21500E00CC99E5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2B4B24671C21500E00CC99E5 /* mztools.c in Sources */, + 2B4B24681C21500E00CC99E5 /* ViewController.swift in Sources */, + 2B4B24691C21500E00CC99E5 /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8DFE19051BDA74F800709011 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -361,6 +438,38 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 2B4B24741C21500E00CC99E5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + FRAMEWORK_SEARCH_PATHS = ( + "$(SRCROOT)/../Carthage/Build/ios/**", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = SwiftExample/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + OTHER_SWIFT_FLAGS = "-DUseCarthage"; + PRODUCT_BUNDLE_IDENTIFIER = com.samsoffes.SwiftExample; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 2B4B24751C21500E00CC99E5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + FRAMEWORK_SEARCH_PATHS = ( + "$(SRCROOT)/../Carthage/Build/ios/**", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = SwiftExample/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + OTHER_SWIFT_FLAGS = "-DUseCarthage"; + PRODUCT_BUNDLE_IDENTIFIER = com.samsoffes.SwiftExample; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; 8DFE19241BDA74F800709011 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -495,6 +604,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 2B4B24731C21500E00CC99E5 /* Build configuration list for PBXNativeTarget "SwiftExampleCarthage" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2B4B24741C21500E00CC99E5 /* Debug */, + 2B4B24751C21500E00CC99E5 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 8DFE19041BDA74F800709011 /* Build configuration list for PBXProject "SwiftExample" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/SwiftExample/SwiftExample/ViewController.swift b/SwiftExample/SwiftExample/ViewController.swift index 10a30f8..8684e63 100644 --- a/SwiftExample/SwiftExample/ViewController.swift +++ b/SwiftExample/SwiftExample/ViewController.swift @@ -7,7 +7,12 @@ // import UIKit -import SSZipArchive + +#if UseCarthage + import ZipArchive +#else + import SSZipArchive +#endif class ViewController: UIViewController { diff --git a/ZipArchive.xcodeproj/project.pbxproj b/ZipArchive.xcodeproj/project.pbxproj index b3f1d39..7a72d6d 100644 --- a/ZipArchive.xcodeproj/project.pbxproj +++ b/ZipArchive.xcodeproj/project.pbxproj @@ -7,6 +7,41 @@ objects = { /* Begin PBXBuildFile section */ + AFF75A2D1C3727F000F450AC /* ZipArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE4A1C0DF7950004A2F1 /* ZipArchive.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AFF75A2E1C37280200F450AC /* SSZipArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE481C0DF7950004A2F1 /* SSZipArchive.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AFF75A2F1C37280200F450AC /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = B423AE491C0DF7950004A2F1 /* SSZipArchive.m */; }; + AFF75A301C37280900F450AC /* Common.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE3C1C0DF7950004A2F1 /* Common.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AFF75A311C37281700F450AC /* aes.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE271C0DF7950004A2F1 /* aes.h */; }; + AFF75A321C37281700F450AC /* aes_via_ace.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE281C0DF7950004A2F1 /* aes_via_ace.h */; }; + AFF75A331C37281700F450AC /* aescrypt.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE291C0DF7950004A2F1 /* aescrypt.c */; }; + AFF75A341C37281700F450AC /* aeskey.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE2A1C0DF7950004A2F1 /* aeskey.c */; }; + AFF75A351C37281700F450AC /* aesopt.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE2B1C0DF7950004A2F1 /* aesopt.h */; }; + AFF75A361C37281700F450AC /* aestab.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE2C1C0DF7950004A2F1 /* aestab.c */; }; + AFF75A371C37281700F450AC /* aestab.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE2D1C0DF7950004A2F1 /* aestab.h */; }; + AFF75A381C37281700F450AC /* brg_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE2E1C0DF7950004A2F1 /* brg_endian.h */; }; + AFF75A391C37281700F450AC /* brg_types.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE2F1C0DF7950004A2F1 /* brg_types.h */; }; + AFF75A3A1C37281700F450AC /* entropy.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE301C0DF7950004A2F1 /* entropy.c */; }; + AFF75A3B1C37281700F450AC /* entropy.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE311C0DF7950004A2F1 /* entropy.h */; }; + AFF75A3C1C37281700F450AC /* fileenc.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE321C0DF7950004A2F1 /* fileenc.c */; }; + AFF75A3D1C37281700F450AC /* fileenc.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE331C0DF7950004A2F1 /* fileenc.h */; }; + AFF75A3E1C37281700F450AC /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE341C0DF7950004A2F1 /* hmac.c */; }; + AFF75A3F1C37281700F450AC /* hmac.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE351C0DF7950004A2F1 /* hmac.h */; }; + AFF75A401C37281700F450AC /* prng.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE361C0DF7950004A2F1 /* prng.c */; }; + AFF75A411C37281700F450AC /* prng.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE371C0DF7950004A2F1 /* prng.h */; }; + AFF75A421C37281700F450AC /* pwd2key.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE381C0DF7950004A2F1 /* pwd2key.c */; }; + AFF75A431C37281700F450AC /* pwd2key.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE391C0DF7950004A2F1 /* pwd2key.h */; }; + AFF75A441C37281700F450AC /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE3A1C0DF7950004A2F1 /* sha1.c */; }; + AFF75A451C37281700F450AC /* sha1.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE3B1C0DF7950004A2F1 /* sha1.h */; }; + AFF75A461C37282700F450AC /* crypt.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE3F1C0DF7950004A2F1 /* crypt.h */; }; + AFF75A471C37282700F450AC /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE401C0DF7950004A2F1 /* ioapi.c */; }; + AFF75A481C37282700F450AC /* ioapi.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE411C0DF7950004A2F1 /* ioapi.h */; }; + AFF75A491C37282700F450AC /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE421C0DF7950004A2F1 /* mztools.c */; }; + AFF75A4A1C37282700F450AC /* mztools.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE431C0DF7950004A2F1 /* mztools.h */; }; + AFF75A4B1C37282700F450AC /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE441C0DF7950004A2F1 /* unzip.c */; }; + AFF75A4C1C37282700F450AC /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE451C0DF7950004A2F1 /* unzip.h */; }; + AFF75A4D1C37282700F450AC /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE461C0DF7950004A2F1 /* zip.c */; }; + AFF75A4E1C37282700F450AC /* zip.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE471C0DF7950004A2F1 /* zip.h */; }; + AFF75A511C3728F000F450AC /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B423AE6E1C0DF83F0004A2F1 /* libz.tbd */; }; B423AE4B1C0DF7950004A2F1 /* aes.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE271C0DF7950004A2F1 /* aes.h */; }; B423AE4C1C0DF7950004A2F1 /* aes_via_ace.h in Headers */ = {isa = PBXBuildFile; fileRef = B423AE281C0DF7950004A2F1 /* aes_via_ace.h */; }; B423AE4D1C0DF7950004A2F1 /* aescrypt.c in Sources */ = {isa = PBXBuildFile; fileRef = B423AE291C0DF7950004A2F1 /* aescrypt.c */; }; @@ -45,6 +80,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + AFF75A241C37279600F450AC /* ZipArchive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ZipArchive.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B423AE1A1C0DF76A0004A2F1 /* ZipArchive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ZipArchive.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B423AE271C0DF7950004A2F1 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = ""; }; B423AE281C0DF7950004A2F1 /* aes_via_ace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes_via_ace.h; sourceTree = ""; }; @@ -85,6 +121,14 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + AFF75A201C37279600F450AC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + AFF75A511C3728F000F450AC /* libz.tbd in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; B423AE161C0DF76A0004A2F1 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -109,6 +153,7 @@ isa = PBXGroup; children = ( B423AE1A1C0DF76A0004A2F1 /* ZipArchive.framework */, + AFF75A241C37279600F450AC /* ZipArchive.framework */, ); name = Products; sourceTree = ""; @@ -174,6 +219,33 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + AFF75A211C37279600F450AC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + AFF75A411C37281700F450AC /* prng.h in Headers */, + AFF75A431C37281700F450AC /* pwd2key.h in Headers */, + AFF75A311C37281700F450AC /* aes.h in Headers */, + AFF75A3F1C37281700F450AC /* hmac.h in Headers */, + AFF75A3D1C37281700F450AC /* fileenc.h in Headers */, + AFF75A2D1C3727F000F450AC /* ZipArchive.h in Headers */, + AFF75A351C37281700F450AC /* aesopt.h in Headers */, + AFF75A381C37281700F450AC /* brg_endian.h in Headers */, + AFF75A321C37281700F450AC /* aes_via_ace.h in Headers */, + AFF75A2E1C37280200F450AC /* SSZipArchive.h in Headers */, + AFF75A451C37281700F450AC /* sha1.h in Headers */, + AFF75A4C1C37282700F450AC /* unzip.h in Headers */, + AFF75A4A1C37282700F450AC /* mztools.h in Headers */, + AFF75A301C37280900F450AC /* Common.h in Headers */, + AFF75A371C37281700F450AC /* aestab.h in Headers */, + AFF75A3B1C37281700F450AC /* entropy.h in Headers */, + AFF75A481C37282700F450AC /* ioapi.h in Headers */, + AFF75A391C37281700F450AC /* brg_types.h in Headers */, + AFF75A4E1C37282700F450AC /* zip.h in Headers */, + AFF75A461C37282700F450AC /* crypt.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; B423AE171C0DF76A0004A2F1 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -204,9 +276,27 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - B423AE191C0DF76A0004A2F1 /* ZipArchive */ = { + AFF75A231C37279600F450AC /* ZipArchive-Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = B423AE221C0DF76A0004A2F1 /* Build configuration list for PBXNativeTarget "ZipArchive" */; + buildConfigurationList = AFF75A291C37279600F450AC /* Build configuration list for PBXNativeTarget "ZipArchive-Mac" */; + buildPhases = ( + AFF75A1F1C37279600F450AC /* Sources */, + AFF75A201C37279600F450AC /* Frameworks */, + AFF75A211C37279600F450AC /* Headers */, + AFF75A221C37279600F450AC /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "ZipArchive-Mac"; + productName = "ZipArchive-Mac"; + productReference = AFF75A241C37279600F450AC /* ZipArchive.framework */; + productType = "com.apple.product-type.framework"; + }; + B423AE191C0DF76A0004A2F1 /* ZipArchive-iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B423AE221C0DF76A0004A2F1 /* Build configuration list for PBXNativeTarget "ZipArchive-iOS" */; buildPhases = ( B423AE151C0DF76A0004A2F1 /* Sources */, B423AE161C0DF76A0004A2F1 /* Frameworks */, @@ -217,7 +307,7 @@ ); dependencies = ( ); - name = ZipArchive; + name = "ZipArchive-iOS"; productName = ZipArchive; productReference = B423AE1A1C0DF76A0004A2F1 /* ZipArchive.framework */; productType = "com.apple.product-type.framework"; @@ -231,6 +321,9 @@ LastUpgradeCheck = 0710; ORGANIZATIONNAME = smumryak; TargetAttributes = { + AFF75A231C37279600F450AC = { + CreatedOnToolsVersion = 7.2; + }; B423AE191C0DF76A0004A2F1 = { CreatedOnToolsVersion = 7.1.1; }; @@ -248,12 +341,20 @@ projectDirPath = ""; projectRoot = ""; targets = ( - B423AE191C0DF76A0004A2F1 /* ZipArchive */, + B423AE191C0DF76A0004A2F1 /* ZipArchive-iOS */, + AFF75A231C37279600F450AC /* ZipArchive-Mac */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + AFF75A221C37279600F450AC /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; B423AE181C0DF76A0004A2F1 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -264,6 +365,27 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + AFF75A1F1C37279600F450AC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + AFF75A441C37281700F450AC /* sha1.c in Sources */, + AFF75A3C1C37281700F450AC /* fileenc.c in Sources */, + AFF75A491C37282700F450AC /* mztools.c in Sources */, + AFF75A3E1C37281700F450AC /* hmac.c in Sources */, + AFF75A4B1C37282700F450AC /* unzip.c in Sources */, + AFF75A341C37281700F450AC /* aeskey.c in Sources */, + AFF75A361C37281700F450AC /* aestab.c in Sources */, + AFF75A331C37281700F450AC /* aescrypt.c in Sources */, + AFF75A3A1C37281700F450AC /* entropy.c in Sources */, + AFF75A401C37281700F450AC /* prng.c in Sources */, + AFF75A471C37282700F450AC /* ioapi.c in Sources */, + AFF75A4D1C37282700F450AC /* zip.c in Sources */, + AFF75A421C37281700F450AC /* pwd2key.c in Sources */, + AFF75A2F1C37280200F450AC /* SSZipArchive.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; B423AE151C0DF76A0004A2F1 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -288,6 +410,49 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ + AFF75A2A1C37279600F450AC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "$(SRCROOT)/SSZipArchive/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = com.samsoffes.ZipArchive; + PRODUCT_NAME = "$(PROJECT_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + AFF75A2B1C37279600F450AC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "$(SRCROOT)/SSZipArchive/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = com.samsoffes.ZipArchive; + PRODUCT_NAME = "$(PROJECT_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + }; + name = Release; + }; B423AE201C0DF76A0004A2F1 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -305,8 +470,6 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; @@ -353,8 +516,6 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -383,6 +544,7 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; BITCODE_GENERATION_MODE = marker; + CODE_SIGN_IDENTITY = "iPhone Developer"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -392,7 +554,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.samsoffes.ZipArchive; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "$(PROJECT_NAME)"; SKIP_INSTALL = YES; }; name = Debug; @@ -402,6 +564,7 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; BITCODE_GENERATION_MODE = bitcode; + CODE_SIGN_IDENTITY = "iPhone Developer"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -411,7 +574,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.samsoffes.ZipArchive; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "$(PROJECT_NAME)"; SKIP_INSTALL = YES; }; name = Release; @@ -419,6 +582,14 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + AFF75A291C37279600F450AC /* Build configuration list for PBXNativeTarget "ZipArchive-Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + AFF75A2A1C37279600F450AC /* Debug */, + AFF75A2B1C37279600F450AC /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; B423AE141C0DF76A0004A2F1 /* Build configuration list for PBXProject "ZipArchive" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -428,7 +599,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B423AE221C0DF76A0004A2F1 /* Build configuration list for PBXNativeTarget "ZipArchive" */ = { + B423AE221C0DF76A0004A2F1 /* Build configuration list for PBXNativeTarget "ZipArchive-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( B423AE231C0DF76A0004A2F1 /* Debug */, diff --git a/ZipArchive.xcodeproj/xcshareddata/xcschemes/ZipArchive-Mac.xcscheme b/ZipArchive.xcodeproj/xcshareddata/xcschemes/ZipArchive-Mac.xcscheme new file mode 100644 index 0000000..9c7fbb2 --- /dev/null +++ b/ZipArchive.xcodeproj/xcshareddata/xcschemes/ZipArchive-Mac.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ZipArchive.xcodeproj/xcshareddata/xcschemes/ZipArchive.xcscheme b/ZipArchive.xcodeproj/xcshareddata/xcschemes/ZipArchive-iOS.xcscheme similarity index 88% rename from ZipArchive.xcodeproj/xcshareddata/xcschemes/ZipArchive.xcscheme rename to ZipArchive.xcodeproj/xcshareddata/xcschemes/ZipArchive-iOS.xcscheme index 05bb272..8575c54 100644 --- a/ZipArchive.xcodeproj/xcshareddata/xcschemes/ZipArchive.xcscheme +++ b/ZipArchive.xcodeproj/xcshareddata/xcschemes/ZipArchive-iOS.xcscheme @@ -1,6 +1,6 @@ @@ -46,8 +46,8 @@ @@ -64,8 +64,8 @@