diff --git a/Zip.xcodeproj/project.pbxproj b/Zip.xcodeproj/project.pbxproj index 31a656f23e6e6511c354c83a27b29221ce27d20b..7e7b02333e8930dafaddc1026e6476e2d4a59d3e 100644 --- a/Zip.xcodeproj/project.pbxproj +++ b/Zip.xcodeproj/project.pbxproj @@ -594,6 +594,7 @@ 343F51121C8DAEEC0028C434 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = NO; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = "Zip OSXTests/Info.plist"; @@ -608,6 +609,7 @@ 343F51131C8DAEEC0028C434 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = NO; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = "Zip OSXTests/Info.plist"; @@ -623,6 +625,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + APPLICATION_EXTENSION_API_ONLY = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -672,6 +675,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + APPLICATION_EXTENSION_API_ONLY = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -757,6 +761,7 @@ 347E3A8C1C1DFFB500A11FD3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = NO; INFOPLIST_FILE = ZipTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.ZipTests; @@ -767,6 +772,7 @@ 347E3A8D1C1DFFB500A11FD3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = NO; INFOPLIST_FILE = ZipTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.ZipTests; diff --git a/Zip/QuickZip.swift b/Zip/QuickZip.swift index a9d703fd67eabcea6b6072b739e0a336043941ff..c8f0ee77852194f123234795ba57f06a46db00bd 100644 --- a/Zip/QuickZip.swift +++ b/Zip/QuickZip.swift @@ -89,7 +89,7 @@ extension Zip { let fileManager = FileManager.default let documentsUrl = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] as URL let destinationUrl = documentsUrl.appendingPathComponent("\(fileName).zip") - try self.zipFiles(paths, zipFilePath: destinationUrl, password: nil, progress: progress) + try self.zipFiles(paths: paths, zipFilePath: destinationUrl, password: nil, progress: progress) return destinationUrl } diff --git a/ZipTests/ZipTests.swift b/ZipTests/ZipTests.swift index ed4334dbdb3e886009de953068da07aa6d96122b..ac16f36a7e4957120fee7fdda676f087a5e8aaff 100644 --- a/ZipTests/ZipTests.swift +++ b/ZipTests/ZipTests.swift @@ -128,7 +128,7 @@ class ZipTests: XCTestCase { let zipFilePath = documentsFolder.appendingPathComponent("archive.zip") progress.becomeCurrent(withPendingUnitCount: 1) - try Zip.zipFiles([imageURL1, imageURL2], zipFilePath: zipFilePath!, password: nil, progress: nil) + try Zip.zipFiles(paths: [imageURL1, imageURL2], zipFilePath: zipFilePath!, password: nil, progress: nil) progress.resignCurrent() XCTAssertTrue(progress.totalUnitCount == progress.completedUnitCount) @@ -181,7 +181,7 @@ class ZipTests: XCTestCase { let imageURL2 = Bundle(for: ZipTests.self).url(forResource: "kYkLkPf", withExtension: "gif")! let documentsFolder = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0] as NSURL let zipFilePath = documentsFolder.appendingPathComponent("archive.zip") - try Zip.zipFiles([imageURL1, imageURL2], zipFilePath: zipFilePath!, password: nil, progress: { (progress) -> () in + try Zip.zipFiles(paths: [imageURL1, imageURL2], zipFilePath: zipFilePath!, password: nil, progress: { (progress) -> () in print(progress) }) let fileManager = FileManager.default @@ -198,7 +198,7 @@ class ZipTests: XCTestCase { let imageURL2 = Bundle(for: ZipTests.self).url(forResource: "kYkLkPf", withExtension: "gif")! let documentsFolder = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0] as NSURL let zipFilePath = documentsFolder.appendingPathComponent("archive.zip") - try Zip.zipFiles([imageURL1, imageURL2], zipFilePath: zipFilePath!, password: "password", progress: { (progress) -> () in + try Zip.zipFiles(paths: [imageURL1, imageURL2], zipFilePath: zipFilePath!, password: "password", progress: { (progress) -> () in print(progress) }) let fileManager = FileManager.default