From bcb5d05dc8485c88c57e8980b577d4b5435796be Mon Sep 17 00:00:00 2001 From: Roy Marmelstein Date: Sun, 18 Sep 2016 12:12:42 +0200 Subject: [PATCH] Additional Swift 3 fixes --- .swift-version | 1 + .travis.yml | 2 -- README.md | 21 +------------------- Zip copy-Info.plist | 26 ------------------------- Zip.podspec | 2 +- Zip.xcodeproj/project.pbxproj | 36 ++++++++++++++--------------------- Zip/Info-tvOS.plist | 4 ++-- Zip/Info.plist | 4 ++-- ZipTests/Info.plist | 4 ++-- 9 files changed, 23 insertions(+), 77 deletions(-) create mode 100644 .swift-version delete mode 100644 Zip copy-Info.plist diff --git a/.swift-version b/.swift-version new file mode 100644 index 0000000..9f55b2c --- /dev/null +++ b/.swift-version @@ -0,0 +1 @@ +3.0 diff --git a/.travis.yml b/.travis.yml index 9f5fcbb..273f79b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ env: - LC_CTYPE=en_US.UTF-8 - LANG=en_US.UTF-8 before_install: - - brew update || brew update - gem install cocoapods --pre install: echo "<3" env: @@ -17,4 +16,3 @@ script: ./build.sh $MODE branches: only: - master - - swift3.0 diff --git a/README.md b/README.md index 6471903..bf65a98 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ ![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) # Zip A Swift framework for zipping and unzipping files. Simple and quick to use. Built on top of [minizip](https://github.com/nmoinvaz/minizip). @@ -58,26 +57,8 @@ Zip supports '.zip' and '.cbz' files out of the box. To support additional zip-d Zip.addCustomFileExtension("file-extension-here") ``` - -### 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 -``` - -To integrate Format into your Xcode project using Carthage, specify it in your `Cartfile`: - -```ogdl -github "marmelroy/Zip" -``` - ### Setting up with [CocoaPods](http://cocoapods.org/?q=Zip) ```ruby source 'https://github.com/CocoaPods/Specs.git' -pod 'Zip', '~> 0.4' +pod 'Zip', '~> 0.5', :submodules => true ``` diff --git a/Zip copy-Info.plist b/Zip copy-Info.plist deleted file mode 100644 index 1624b1c..0000000 --- a/Zip copy-Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 0.4.3 - CFBundleSignature - ???? - CFBundleVersion - 7 - NSPrincipalClass - - - diff --git a/Zip.podspec b/Zip.podspec index 8e2827d..028e335 100644 --- a/Zip.podspec +++ b/Zip.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "Zip" - s.version = "0.4.3" + s.version = "0.5" s.summary = "Zip and unzip files in Swift." # This description is used to generate tags and improve search results. diff --git a/Zip.xcodeproj/project.pbxproj b/Zip.xcodeproj/project.pbxproj index b4d1727..60e1f24 100644 --- a/Zip.xcodeproj/project.pbxproj +++ b/Zip.xcodeproj/project.pbxproj @@ -133,7 +133,6 @@ /* Begin PBXFileReference section */ 342545B51CE525B200336074 /* Zip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Zip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 342545B61CE525B300336074 /* Zip copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Zip copy-Info.plist"; path = "/Users/marmelroy/Documents/Projects/OpenSource/Zip/Zip copy-Info.plist"; sourceTree = ""; }; 342FC0D21C5044DC0023A3C3 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = ""; }; 342FC0D31C5044DC0023A3C3 /* aes_via_ace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes_via_ace.h; sourceTree = ""; }; 342FC0D41C5044DC0023A3C3 /* aescrypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aescrypt.c; sourceTree = ""; }; @@ -275,7 +274,6 @@ 347E3A761C1DFFB500A11FD3 /* Zip */, 347E3A821C1DFFB500A11FD3 /* ZipTests */, 347E3A751C1DFFB500A11FD3 /* Products */, - 342545B61CE525B300336074 /* Zip copy-Info.plist */, ); sourceTree = ""; }; @@ -679,9 +677,9 @@ CLANG_ENABLE_MODULES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 7; + DYLIB_CURRENT_VERSION = 8; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Zip copy-Info.plist"; + INFOPLIST_FILE = "Zip/Info-tvOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; @@ -692,7 +690,6 @@ SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -705,9 +702,9 @@ CLANG_ENABLE_MODULES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 7; + DYLIB_CURRENT_VERSION = 8; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Zip copy-Info.plist"; + INFOPLIST_FILE = "Zip/Info-tvOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; @@ -718,7 +715,6 @@ SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -729,10 +725,10 @@ buildSettings = { CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 8; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 7; + DYLIB_CURRENT_VERSION = 8; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = Zip/Info.plist; @@ -744,7 +740,6 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**"; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -753,10 +748,10 @@ buildSettings = { CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 8; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 7; + DYLIB_CURRENT_VERSION = 8; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = Zip/Info.plist; @@ -769,7 +764,6 @@ SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; }; name = Release; }; @@ -820,7 +814,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 8; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -843,6 +837,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -868,7 +863,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 8; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -883,6 +878,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.2; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -897,7 +893,7 @@ CLANG_ENABLE_MODULES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 7; + DYLIB_CURRENT_VERSION = 8; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Zip/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -909,7 +905,6 @@ SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -920,7 +915,7 @@ CLANG_ENABLE_MODULES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 7; + DYLIB_CURRENT_VERSION = 8; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Zip/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -932,7 +927,6 @@ SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; }; name = Release; }; @@ -943,7 +937,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.ZipTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -955,7 +948,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.ZipTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; }; name = Release; }; diff --git a/Zip/Info-tvOS.plist b/Zip/Info-tvOS.plist index 410955c..43de941 100644 --- a/Zip/Info-tvOS.plist +++ b/Zip/Info-tvOS.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.4.1 + 0.5.0 CFBundleSignature ???? CFBundleVersion - 6 + 8 NSPrincipalClass diff --git a/Zip/Info.plist b/Zip/Info.plist index 1624b1c..43de941 100644 --- a/Zip/Info.plist +++ b/Zip/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.4.3 + 0.5.0 CFBundleSignature ???? CFBundleVersion - 7 + 8 NSPrincipalClass diff --git a/ZipTests/Info.plist b/ZipTests/Info.plist index 5dac350..900e133 100644 --- a/ZipTests/Info.plist +++ b/ZipTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.4.3 + 0.5.0 CFBundleSignature ???? CFBundleVersion - 7 + 8 -- 2.26.2