Optimize the code

.gitattributes

@@ -1 +1 @@
-Zip/minizip/* linguist-vendored 
+Zip/minizip/* linguist-vendored 

.gitignore

@@ -33,3 +33,8 @@ DerivedData
 # Carthage/Checkouts
 
 Carthage/Build
+
+# Swift Package Manager
+.build/
+.swiftpm/
+Packages/

.swift-version

@@ -1 +1 @@
-3.0
+5.3

.travis.yml

@@ -1,5 +1,5 @@
-osx_image: xcode8
-language: objective-c
+osx_image: xcode12
+language: swift
 env:
   global:
   - LC_CTYPE=en_US.UTF-8
@@ -9,6 +9,7 @@ before_install:
 install: echo "<3"
 env:
   - MODE=framework
+  - MODE=spm
   - MODE=examples
 script: ./build.sh $MODE
 

LinuxMain.swift

@@ -0,0 +1,8 @@
+import XCTest
+
+import ZipTests
+
+var tests = [XCTestCaseEntry]()
+tests += ZipTests.__allTests()
+
+XCTMain(tests)

Package.swift

@@ -0,0 +1,29 @@
+// swift-tools-version:5.1
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+import PackageDescription
+
+let package = Package(
+    name: "Zip",
+    products: [
+        .library(name: "Zip", targets: ["Zip"])
+    ],
+    targets: [
+        .target(
+            name: "Minizip",
+            dependencies: [],
+            path: "Zip/minizip",
+            exclude: ["module"],
+            linkerSettings: [
+                .linkedLibrary("z")
+            ]),
+        .target(
+            name: "Zip",
+            dependencies: ["Minizip"],
+            path: "Zip",
+            exclude: ["minizip", "zlib"]),
+        .testTarget(
+            name: "ZipTests",
+            dependencies: ["Zip"],
+            path: "ZipTests"),
+    ]
+)

Package@swift-4.2.swift

@@ -0,0 +1,30 @@
+// swift-tools-version:4.2
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+import PackageDescription
+
+let package = Package(
+    name: "Zip",
+    products: [
+        .library(name: "Zip", targets: ["Zip"])
+    ],
+    targets: [
+        .systemLibrary(
+            name: "CZlib",
+            path: "Zip/zlib",
+            pkgConfig: "zlib"),
+        .target(
+            name: "Minizip",
+            dependencies: ["CZlib"],
+            path: "Zip/minizip",
+            exclude: ["module"]),
+        .target(
+            name: "Zip",
+            dependencies: ["Minizip"],
+            path: "Zip",
+            exclude: ["minizip", "zlib"]),
+        .testTarget(
+            name: "ZipTests",
+            dependencies: ["Zip"],
+            path: "ZipTests"),
+    ]
+)

Package@swift-5.0.swift

@@ -0,0 +1,29 @@
+// swift-tools-version:5.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+import PackageDescription
+
+let package = Package(
+    name: "Zip",
+    products: [
+        .library(name: "Zip", targets: ["Zip"])
+    ],
+    targets: [
+        .target(
+            name: "Minizip",
+            dependencies: [],
+            path: "Zip/minizip",
+            exclude: ["module"],
+            linkerSettings: [
+                .linkedLibrary("z")
+            ]),
+        .target(
+            name: "Zip",
+            dependencies: ["Minizip"],
+            path: "Zip",
+            exclude: ["minizip", "zlib"]),
+        .testTarget(
+            name: "ZipTests",
+            dependencies: ["Zip"],
+            path: "ZipTests"),
+    ]
+)

README.md

@@ -1,10 +1,10 @@
 ![Zip - Zip and unzip files in Swift](https://cloud.githubusercontent.com/assets/889949/12374908/252373d0-bcac-11e5-8ece-6933aeae8222.png)
 
-[![Build Status](https://travis-ci.org/marmelroy/Zip.svg?branch=master)](https://travis-ci.org/marmelroy/Zip) [![Version](http://img.shields.io/cocoapods/v/Zip.svg)](http://cocoapods.org/?q=Zip)
-[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+[![Build Status](https://travis-ci.org/marmelroy/Zip.svg?branch=master)](https://travis-ci.org/marmelroy/Zip) [![Version](http://img.shields.io/cocoapods/v/Zip.svg)](http://cocoapods.org/?q=Zip) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![SPM supported](https://img.shields.io/badge/SPM-supported-brightgreen.svg?style=flat)](https://swift.org/package-manager)
+
 
 # Zip
-A Swift 3.0 framework for zipping and unzipping files. Simple and quick to use. Built on top of [minizip](https://github.com/nmoinvaz/minizip).
+A Swift framework for zipping and unzipping files. Simple and quick to use. Built on top of [minizip](https://github.com/nmoinvaz/minizip).
 
 ## Usage
 
@@ -53,29 +53,26 @@ catch {
 ## Custom File Extensions
 
 Zip supports '.zip' and '.cbz' files out of the box. To support additional zip-derivative file extensions:
-```
+```swift
 Zip.addCustomFileExtension("file-extension-here")
 ```
 
+### [Preferred] Setting up with [Swift Package Manager](https://swift.org/package-manager)
+To use Zip with Swift Package Manager, add it to your package's dependencies:
+```swift
+.package(url: "https://github.com/marmelroy/Zip.git", .upToNextMinor(from: "2.1"))
+```
+
 ### Setting up with [CocoaPods](http://cocoapods.org/?q=Zip)
 ```ruby
 source 'https://github.com/CocoaPods/Specs.git'
-pod 'Zip', '~> 0.6'
-```
-
-### Setting up with Carthage
-
-[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that automates the process of adding frameworks to your Cocoa application.
-
-You can install Carthage with [Homebrew](http://brew.sh/) using the following command:
-
-```bash
-$ brew update
-$ brew install carthage
+pod 'Zip', '~> 2.1'
 ```
 
+### Setting up with [Carthage](https://github.com/Carthage/Carthage)
 To integrate Zip into your Xcode project using Carthage, specify it in your `Cartfile`:
 
 ```ogdl
-github "marmelroy/Zip"
+github "marmelroy/Zip" ~> 2.1
 ```
+

Zip.podspec

@@ -8,8 +8,10 @@
 
 Pod::Spec.new do |s|
   s.name             = "Zip"
-  s.version          = "0.6.0"
+  s.version          = "2.1.2"
   s.summary          = "Zip and unzip files in Swift."
+  s.swift_version    = "5.3"
+  s.swift_versions   = ["4.2", "5.0", "5.1", "5.3"]
 
 # This description is used to generate tags and improve search results.
 #   * Think: What does it do? Why did you write it? What is the focus?
@@ -21,24 +23,20 @@ Pod::Spec.new do |s|
                      DESC
 
   s.homepage         = "https://github.com/marmelroy/Zip"
-  # s.screenshots     = "www.example.com/screenshots_1", "www.example.com/screenshots_2"
   s.license          = 'MIT'
   s.author           = { "Roy Marmelstein" => "[email protected]" }
   s.source           = { :git => "https://github.com/marmelroy/Zip.git", :tag => s.version.to_s}
   s.social_media_url   = "http://twitter.com/marmelroy"
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
-  s.watchos.deployment_target = '2.0'
+  s.watchos.deployment_target = '3.0'
   s.osx.deployment_target = '10.9'
   s.requires_arc = true
 
-  s.source_files = 'Zip/*.{swift,h}', 'Zip/minizip/*.{c,h}', 'Zip/minizip/aes/*.{c,h}'
+  s.source_files = 'Zip/*.{swift,h}', 'Zip/minizip/*.{c,h}', 'Zip/minizip/include/*.{c,h}'
   s.public_header_files = 'Zip/*.h'
   s.pod_target_xcconfig = {'SWIFT_INCLUDE_PATHS' => '$(SRCROOT)/Zip/Zip/minizip/**','LIBRARY_SEARCH_PATHS' => '$(SRCROOT)/Zip/Zip/'}
-  # s.public_header_files = 'Pod/Classes/**/*.h'
   s.libraries = 'z'
-  s.preserve_paths  = 'Zip/minizip/module.modulemap'
-
-  # s.dependency 'AFNetworking', '~> 2.3'
+  s.preserve_paths  = 'Zip/minizip/module/module.modulemap'
 end