From 6e161445134f7fb3da37b2d3b1cb6b608d9f2411 Mon Sep 17 00:00:00 2001
From: Mostafa Berg <mostafa.berg@nordicsemi.no>
Date: Wed, 27 Jul 2016 14:11:17 +0200
Subject: [PATCH] +Updated to Swift2.3 +Updated Xcode 8 recommended settings

---
 Zip.xcodeproj/project.pbxproj                        | 12 +++++++++++-
 .../xcshareddata/xcschemes/Zip OSX.xcscheme          |  2 +-
 .../xcshareddata/xcschemes/Zip tvOS.xcscheme         |  2 +-
 Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme    |  2 +-
 .../xcshareddata/xcschemes/ZipTests.xcscheme         |  2 +-
 Zip/QuickZip.swift                                   | 10 +++++-----
 Zip/Zip.swift                                        |  2 +-
 Zip/ZipUtilities.swift                               |  8 ++++----
 8 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Zip.xcodeproj/project.pbxproj b/Zip.xcodeproj/project.pbxproj
index 452beb6..917e94d 100644
--- a/Zip.xcodeproj/project.pbxproj
+++ b/Zip.xcodeproj/project.pbxproj
@@ -493,7 +493,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Roy Marmelstein";
 				TargetAttributes = {
 					343F50FE1C8DAEEC0028C434 = {
@@ -504,9 +504,11 @@
 					};
 					347E3A731C1DFFB500A11FD3 = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 					347E3A7D1C1DFFB500A11FD3 = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -714,6 +716,7 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -762,6 +765,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -901,6 +905,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -922,6 +927,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};
@@ -932,6 +939,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.ZipTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -942,6 +950,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.ZipTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};
diff --git a/Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme b/Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme
index f802b86..dbc1918 100644
--- a/Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme	
+++ b/Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme b/Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme
index 7af7dc3..56c103b 100644
--- a/Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme	
+++ b/Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme b/Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme
index 4ff2ce2..bb47f57 100644
--- a/Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme
+++ b/Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme b/Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme
index d638351..f9e4d6e 100644
--- a/Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme
+++ b/Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Zip/QuickZip.swift b/Zip/QuickZip.swift
index 3cb1548..31fc886 100644
--- a/Zip/QuickZip.swift
+++ b/Zip/QuickZip.swift
@@ -45,8 +45,8 @@ extension Zip {
         let directoryName = fileName.stringByReplacingOccurrencesOfString(".\(fileExtension)", withString: "")
         let documentsUrl = fileManager.URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL
         let destinationUrl = documentsUrl.URLByAppendingPathComponent(directoryName, isDirectory: true)
-        try self.unzipFile(path, destination: destinationUrl, overwrite: true, password: nil, progress: progress)
-        return destinationUrl
+        try self.unzipFile(path, destination: destinationUrl!, overwrite: true, password: nil, progress: progress)
+        return destinationUrl!
     }
     
     //MARK: Quick Zip
@@ -84,9 +84,9 @@ extension Zip {
         let fileManager = NSFileManager.defaultManager()
         let documentsUrl = fileManager.URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL
         let destinationUrl = documentsUrl.URLByAppendingPathComponent("\(fileName).zip")
-        try self.zipFiles(paths, zipFilePath: destinationUrl, password: nil, progress: progress)
-        return destinationUrl
+        try self.zipFiles(paths, zipFilePath: destinationUrl!, password: nil, progress: progress)
+        return destinationUrl!
     }
     
     
-}
\ No newline at end of file
+}
diff --git a/Zip/Zip.swift b/Zip/Zip.swift
index 4ae40fe..f612665 100644
--- a/Zip/Zip.swift
+++ b/Zip/Zip.swift
@@ -139,7 +139,7 @@ public class Zip {
             if pathString.rangeOfCharacterFromSet(NSCharacterSet(charactersInString: "/\\")) != nil {
                 pathString = pathString.stringByReplacingOccurrencesOfString("\\", withString: "/")
             }
-            guard let fullPath = destination.URLByAppendingPathComponent(pathString).path else {
+            guard let fullPath = destination.URLByAppendingPathComponent(pathString)!.path else {
                 throw ZipError.UnzipFail
             }
             let creationDate = NSDate()
diff --git a/Zip/ZipUtilities.swift b/Zip/ZipUtilities.swift
index dd9b0d9..a50bca8 100644
--- a/Zip/ZipUtilities.swift
+++ b/Zip/ZipUtilities.swift
@@ -72,18 +72,18 @@ internal class ZipUtilities {
         if let directoryPath = directory.path, let enumerator = fileManager.enumeratorAtPath(directoryPath) {
             while let filePathComponent = enumerator.nextObject() as? String {
                 let path = directory.URLByAppendingPathComponent(filePathComponent)
-                guard let filePath = path.path, let directoryName = directory.lastPathComponent else {
+                guard let filePath = path!.path, let directoryName = directory.lastPathComponent else {
                     continue
                 }
                 var isDirectory: ObjCBool = false
                 fileManager.fileExistsAtPath(filePath, isDirectory: &isDirectory)
                 if !isDirectory {
                     let fileName = (directoryName as NSString).stringByAppendingPathComponent(filePathComponent)
-                    let processedPath = ProcessedFilePath(filePathURL: path, fileName: fileName)
+                    let processedPath = ProcessedFilePath(filePathURL: path!, fileName: fileName)
                     processedFilePaths.append(processedPath)
                 }
                 else {
-                    let directoryContents = expandDirectoryFilePath(path)
+                    let directoryContents = expandDirectoryFilePath(path!)
                     processedFilePaths.appendContentsOf(directoryContents)
                 }
             }
@@ -91,4 +91,4 @@ internal class ZipUtilities {
         return processedFilePaths
     }
 
-}
\ No newline at end of file
+}
-- 
2.26.2