pod version bump

Revert "Extended to allow passing in directory or file to unzip to"

ObjectiveCExample/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - SSZipArchive (1.6)
+  - SSZipArchive (1.6.2)
 
 DEPENDENCIES:
   - SSZipArchive (from `..`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: ".."
 
 SPEC CHECKSUMS:
-  SSZipArchive: e3560652173f5fe708a835632e63e38b9000bdb7
+  SSZipArchive: 428eb1ac8d37dd133404d30f422b23958c1f9acc
 
 PODFILE CHECKSUM: ae5fb993e5dc339b15e10067d1e60549fa585f32
 
-COCOAPODS: 1.1.0.rc.1
+COCOAPODS: 1.1.0.rc.2

README.md

@@ -14,6 +14,8 @@ ZipArchive is a simple utility class for zipping and unzipping files on iOS and
 
 ## Installation and Setup
 
+*The main release branch is configured to support Objective C and Swift 3. There is a 'swift23' branch which is the latest branch but marked to compile for Swift 2.3.* 
+
 ### CocoaPods
 
 `pod install SSZipArchive`
@@ -40,9 +42,7 @@ SSZipArchive requires ARC.
 [SSZipArchive unzipFileAtPath:zipPath toDestination: unzipPath];
 ```
 
-### Swift (Swift 3 Only)
-
-(For Swift 2.3 and below support please use continue to use version 1.4 or 1.5)
+### Swift
 
 ```swift
 // Create

SSZipArchive.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'SSZipArchive'
-  s.version      = '1.6'
+  s.version      = '1.6.2'
   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'

SSZipArchive/SSZipArchive.m

@@ -272,16 +272,7 @@
                 strPath = [strPath stringByReplacingOccurrencesOfString:@"\\" withString:@"/"];
             }
             
-            NSString *fullPath;
-            BOOL isDir = NO;
-            if([[NSFileManager defaultManager]
-                fileExistsAtPath:destination isDirectory:&isDir] && isDir){
-                fullPath = [destination stringByAppendingPathComponent:strPath];
-            }
-            else {
-                fullPath = destination;
-            }
-            
+            NSString *fullPath = [destination stringByAppendingPathComponent:strPath];
             NSError *err = nil;
             NSDictionary *directoryAttr;
             if (preserveAttributes) {
@@ -720,7 +711,7 @@
     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;
     
-    while (!feof(input))
+    while(!feof(input) && !ferror(input))
     {
         len = (unsigned int) fread(buffer, 1, CHUNK, input);
         zipWriteInFileInZip(_zip, buffer, len);

SwiftExample/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - SSZipArchive (1.6)
+  - SSZipArchive (1.6.2)
 
 DEPENDENCIES:
   - SSZipArchive (from `..`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: ".."
 
 SPEC CHECKSUMS:
-  SSZipArchive: e3560652173f5fe708a835632e63e38b9000bdb7
+  SSZipArchive: 428eb1ac8d37dd133404d30f422b23958c1f9acc
 
 PODFILE CHECKSUM: 8d38f966bef0580b1feb382672c12ef6a674ea58
 
-COCOAPODS: 1.1.0.rc.1
+COCOAPODS: 1.1.0.rc.2