diff --git a/.gitattributes b/.gitattributes index 6a0e590c10b5e80a2a2a038fac17f247253879a8..206ef7e6642252ac3a632ff25fe19943fd99a050 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -Zip/minizip/* linguist-vendored \ No newline at end of file +Zip/minizip/* linguist-vendored diff --git a/.swift-version b/.swift-version index 9f55b2ccb5f234fc6b87ada62389a3d73815d0d1..5186d07068cfed4c3f4705df79c73e115dd35c43 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.0 +4.0 diff --git a/.travis.yml b/.travis.yml index 273f79b4c9144c886a0770d1cee69afd7ff6b08e..0ba04466108cc9deb313bc6d9d0f5d92315f6530 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode8 +osx_image: xcode9 language: objective-c env: global: diff --git a/README.md b/README.md index 7420e5c930689d5d6e38b76640afea37b6173d06..e983f346349ada264f134ac901099024c5f28990 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) # 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 4.0 framework for zipping and unzipping files. Simple and quick to use. Built on top of [minizip](https://github.com/nmoinvaz/minizip). ## Usage @@ -60,7 +60,7 @@ Zip.addCustomFileExtension("file-extension-here") ### Setting up with [CocoaPods](http://cocoapods.org/?q=Zip) ```ruby source 'https://github.com/CocoaPods/Specs.git' -pod 'Zip', '~> 0.8' +pod 'Zip', '~> 1.0' ``` ### Setting up with Carthage diff --git a/Zip.podspec b/Zip.podspec index c964bcd48e5326c492dc6f6487f148be3ade35f2..95d4e9db5963f43d4391765edc0b638b4af142f5 100644 --- a/Zip.podspec +++ b/Zip.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "Zip" - s.version = "0.8.0" + s.version = "1.0.0" s.summary = "Zip and unzip files in Swift." # This description is used to generate tags and improve search results. @@ -33,6 +33,8 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.9' s.requires_arc = true + s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' } + s.source_files = 'Zip/*.{swift,h}', 'Zip/minizip/*.{c,h}', 'Zip/minizip/aes/*.{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/'} diff --git a/Zip.xcodeproj/project.pbxproj b/Zip.xcodeproj/project.pbxproj index 18b44a5ce9cebbc20946223610800ec19a42dbaa..a9e7663ec5fb4431df01fbfd6d55aa375c075c5c 100644 --- a/Zip.xcodeproj/project.pbxproj +++ b/Zip.xcodeproj/project.pbxproj @@ -510,7 +510,7 @@ "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 10; + DYLIB_CURRENT_VERSION = 11; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "Zip/Info-tvOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -536,7 +536,7 @@ "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 10; + DYLIB_CURRENT_VERSION = 11; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "Zip/Info-tvOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -559,10 +559,10 @@ buildSettings = { CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 10; + DYLIB_CURRENT_VERSION = 11; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = Zip/Info.plist; @@ -582,10 +582,10 @@ buildSettings = { CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 10; + DYLIB_CURRENT_VERSION = 11; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = Zip/Info.plist; @@ -659,7 +659,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -717,7 +717,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -749,7 +749,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 10; + DYLIB_CURRENT_VERSION = 11; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Zip/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -772,7 +772,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 10; + DYLIB_CURRENT_VERSION = 11; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Zip/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; diff --git a/Zip/Info-tvOS.plist b/Zip/Info-tvOS.plist index 978398e7bbf8437a64bae86ae46d891ed0cc2bc3..e258392291968f5985b4d098a23efcb441d9d7a7 100644 --- a/Zip/Info-tvOS.plist +++ b/Zip/Info-tvOS.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.8.0 + 1.0.0 CFBundleSignature ???? CFBundleVersion - 10 + 11 NSPrincipalClass diff --git a/Zip/Info.plist b/Zip/Info.plist index 978398e7bbf8437a64bae86ae46d891ed0cc2bc3..e258392291968f5985b4d098a23efcb441d9d7a7 100644 --- a/Zip/Info.plist +++ b/Zip/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.8.0 + 1.0.0 CFBundleSignature ???? CFBundleVersion - 10 + 11 NSPrincipalClass diff --git a/ZipTests/Info.plist b/ZipTests/Info.plist index 46af58a1ab8cf91bff40e139a665ad2f81e6dc05..79f71ded3b63f6bbbcc2393765a5879ad5fb5716 100644 --- a/ZipTests/Info.plist +++ b/ZipTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.8.0 + 1.0.0 CFBundleSignature ???? CFBundleVersion - 10 + 11 diff --git a/build.sh b/build.sh index e1a3cae100f7cfeb79829bf4dfc3c1276ba86783..a2cb51675d9d6fa1010fcae99e9b6805a0b32eb7 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/bin/bash # **** Update me when new Xcode versions are released! **** -PLATFORM="platform=iOS Simulator,OS=10.0,name=iPhone 7" +PLATFORM="platform=iOS Simulator,OS=11.0,name=iPhone 8" SDK="iphonesimulator10.0"