diff --git a/.travis.yml b/.travis.yml index 03c04fb..4acb926 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,39 @@ language: objective-c -osx_image: xcode8.3 podfile: ObjectiveCExample/Podfile xcode_workspace: ObjectiveCExample/ObjectiveCExample.xcworkspace xcode_scheme: ObjectiveCExample +matrix: + include: + - osx_image: xcode9 + before_install: xcrun simctl erase "49D35834-277E-4C67-917F-A4C0769EBAC3" + env: DESTINATION="id=49D35834-277E-4C67-917F-A4C0769EBAC3" #`OS:11.0,name:iPhone 7 Plus` #oldest/newest for iOS 11.x + + - osx_image: xcode9 + before_install: xcrun simctl erase "F60B87EC-8969-41A7-90ED-D0826ECC32DB" + env: DESTINATION="id=F60B87EC-8969-41A7-90ED-D0826ECC32DB" #`OS:10.3.1,name:iPhone 7 Plus` #latest for iOS 10.x + + - osx_image: xcode8.3 + before_install: xcrun simctl erase "3AA26DE0-C2F0-4CAF-936D-09F1ECCF9BDA" + env: DESTINATION="id=3AA26DE0-C2F0-4CAF-936D-09F1ECCF9BDA" #`OS:10.0,name:iPhone 5` #oldest for iOS 10.x + + - osx_image: xcode8.3 + before_install: xcrun simctl erase "43CD88FF-F754-4EA7-BB04-D879504B943B" + env: DESTINATION="id=43CD88FF-F754-4EA7-BB04-D879504B943B" #`OS:9.3,name:iPhone 6s Plus` #latest for iOS 9.x + + - osx_image: xcode7.3 + before_install: xcrun simctl erase "0CFF0929-C816-40DD-82EE-5D39A252BC27" + env: DESTINATION="OS=9.0,name=iPhone 4s" #oldest for iOS 9.x + + - osx_image: xcode7.3 + before_install: xcrun simctl erase "AECF5DE0-D8C3-4FFE-B5B2-FA69A730B17F" + env: DESTINATION="OS=8.4,name=iPhone 6 Plus" #latest for iOS 8.x + + - osx_image: xcode7.3 + before_install: xcrun simctl erase "D72029C0-E8E1-4349-B423-E458466135B3" + env: DESTINATION="OS=8.1,name=iPhone 4s" #oldest for iOS 8.x + script: xcodebuild `` -workspace ObjectiveCExample/ObjectiveCExample.xcworkspace `` -scheme ObjectiveCExample -sdk iphonesimulator - `` -destination "id=F60B87EC-8969-41A7-90ED-D0826ECC32DB" + `` -destination "$DESTINATION" `` -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test diff --git a/ObjectiveCExample/ObjectiveCExample.xcodeproj/project.pbxproj b/ObjectiveCExample/ObjectiveCExample.xcodeproj/project.pbxproj index d27eed8..39e64a7 100644 --- a/ObjectiveCExample/ObjectiveCExample.xcodeproj/project.pbxproj +++ b/ObjectiveCExample/ObjectiveCExample.xcodeproj/project.pbxproj @@ -265,7 +265,7 @@ 8DFE19E21BDA9FF300709011 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0820; + LastUpgradeCheck = 0900; TargetAttributes = { 8DFE19E91BDA9FF300709011 = { CreatedOnToolsVersion = 7.1; @@ -531,7 +531,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -577,7 +577,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/ObjectiveCExample/Podfile.lock b/ObjectiveCExample/Podfile.lock index 2bc933a..034fed4 100644 --- a/ObjectiveCExample/Podfile.lock +++ b/ObjectiveCExample/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - SSZipArchive (2.0.5) + - SSZipArchive (2.0.6) DEPENDENCIES: - SSZipArchive (from `..`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: .. SPEC CHECKSUMS: - SSZipArchive: 5d129436b3d37fbe5b2befc51fba3badf925e459 + SSZipArchive: be986987cc955e02b89094337573689735cd1913 PODFILE CHECKSUM: 7f4058a9cbc69b4e63808729577a8bb2098bc527 diff --git a/README.md b/README.md index d82005e..5cb3089 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ ZipArchive is a simple utility class for zipping and unzipping files on iOS and *The main release branch is configured to support Objective C and Swift 3+. There is a 'swift23' branch which is a tied to a older 1.x release and will not be upgraded. Xcode 8.3+ removes support for Swift 2.3* +SSZipArchive works on Xcode 7-9 and above, iOS 8-11 and above. + ### CocoaPods In your Podfile: `pod 'SSZipArchive'` diff --git a/SSZipArchive.podspec b/SSZipArchive.podspec index 6cecdac..383b412 100644 --- a/SSZipArchive.podspec +++ b/SSZipArchive.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'SSZipArchive' - s.version = '2.0.5' + s.version = '2.0.6' s.summary = 'Utility class for zipping and unzipping files on iOS, tvOS, watchOS, and Mac.' s.description = 'SSZipArchive is a simple utility class for zipping and unzipping files on iOS, tvOS, watchOS, and Mac.' s.homepage = 'https://github.com/ZipArchive/ZipArchive' diff --git a/SSZipArchive/SSZipArchive.m b/SSZipArchive/SSZipArchive.m index f697b64..b47cb5e 100755 --- a/SSZipArchive/SSZipArchive.m +++ b/SSZipArchive/SSZipArchive.m @@ -154,7 +154,7 @@ NSString *const SSZipArchiveErrorDomain = @"SSZipArchiveErrorDomain"; overwrite:(BOOL)overwrite password:(NSString *)password progressHandler:(void (^)(NSString *entry, unz_file_info zipInfo, long entryNumber, long total))progressHandler - completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *__nullable error))completionHandler + completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError * __nullable error))completionHandler { return [self unzipFileAtPath:path toDestination:destination preserveAttributes:YES overwrite:overwrite password:password error:nil delegate:nil progressHandler:progressHandler completionHandler:completionHandler]; } @@ -819,7 +819,7 @@ NSString *const SSZipArchiveErrorDomain = @"SSZipArchiveErrorDomain"; { return NO; } - + zipOpenNewFileInZip3(_zip, aFileName, &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION, 0, -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, [password UTF8String], 0); unsigned int len = 0; diff --git a/SSZipArchive/ZipArchive.h b/SSZipArchive/ZipArchive.h index f9391cb..7a53df8 100644 --- a/SSZipArchive/ZipArchive.h +++ b/SSZipArchive/ZipArchive.h @@ -14,6 +14,6 @@ FOUNDATION_EXPORT double ZipArchiveVersionNumber; //! Project version string for ZipArchive. FOUNDATION_EXPORT const unsigned char ZipArchiveVersionString[]; -// In this header, you should import all the public headers of your framework using statements like #import +// In this header, you should import all the public headers of your framework using statements like #import #import "SSZipArchive.h" diff --git a/SwiftExample/Podfile.lock b/SwiftExample/Podfile.lock index 9432f9e..540a952 100644 --- a/SwiftExample/Podfile.lock +++ b/SwiftExample/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - SSZipArchive (2.0.5) + - SSZipArchive (2.0.6) DEPENDENCIES: - SSZipArchive (from `..`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: .. SPEC CHECKSUMS: - SSZipArchive: 5d129436b3d37fbe5b2befc51fba3badf925e459 + SSZipArchive: be986987cc955e02b89094337573689735cd1913 PODFILE CHECKSUM: 0dc500eb72745751ccba7677de4da5534fcef36d