From 75600521380123e0937884bfe0de528980f8758c Mon Sep 17 00:00:00 2001 From: gtrop1 <50150156+gtrop1@users.noreply.github.com> Date: Thu, 2 May 2019 14:48:11 -0700 Subject: [PATCH] Fixed targets overriding swift language version (#25) * Hotfix support for Swift 4.2 * Fixed targets overriding swift language version --- CHANGELOG.md | 28 +++++++++++++++++++++++++++- README.md | 8 ++++---- SQift.podspec | 2 +- SQift.xcodeproj/project.pbxproj | 14 ++------------ Source/Supporting Files/Info.plist | 2 +- 5 files changed, 35 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f754fd8..3373684 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. #### 4.x Releases -- `4.1.x` Releases - [4.1.0](#410) +- `4.1.x` Releases - [4.1.0](#410) | [4.1.1](#411) - `4.0.x` Releases - [4.0.0](#400) #### 3.x Releases @@ -38,6 +38,32 @@ All notable changes to this project will be documented in this file. - `0.1.x` Releases - [0.1.0](#010) --- + +## Unreleased + +#### Added + +#### Updated + +#### Deprecated + +#### Removed + +#### Fixed + +--- + +## [4.1.1](https://github.com/Nike-Inc/SQift/releases/tag/4.1.1) + +Release on 2019-05-02. All issues associated with this milestone can be found using this +[filter](https://github.com/Nike-Inc/SQift/milestone/11?closed=1). + +#### Fixed +- Issue where Xcode project was incorrectly set to Swift 5.0 instead of 4.2 breaking Carthage and submodule support. + - Fixed by [William Thompson](https://github.com/eSpecialized) & [Greg Tropino](https://github.com/gtrop1) in Pull Request [#25](https://github.com/Nike-Inc/SQift/pull/25). + +--- + ## [4.1.0](https://github.com/Nike-Inc/SQift/releases/tag/4.1.0) Release on 2019-04-30. All issues associated with this milestone can be found using this diff --git a/README.md b/README.md index 8598fec..61a5aff 100644 --- a/README.md +++ b/README.md @@ -57,16 +57,16 @@ You can install it with the following command: $ gem install cocoapods ``` -> CocoaPods 1.3+ is required to build SQift. +> CocoaPods 1.7.0+ is required to build SQift. To integrate SQift into your Xcode project using CocoaPods, specify it in your `Podfile`: ```ruby -platform :ios, '11.0' +platform :ios, '10.0' use_frameworks! target '' do - pod 'SQift', '~> 4.0' + pod 'SQift', '~> 4.1' end ``` @@ -90,7 +90,7 @@ $ brew install carthage To integrate SQift into your Xcode project using Carthage, specify it in your [Cartfile](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#cartfile): ``` -github "Nike-Inc/SQift" ~> 4.0 +github "Nike-Inc/SQift" ~> 4.1 ``` Run `carthage update` to build the framework and drag the built `SQift.framework` into your Xcode project. diff --git a/SQift.podspec b/SQift.podspec index d6cfee5..3a9d6a0 100644 --- a/SQift.podspec +++ b/SQift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "SQift" - s.version = "4.1.0" + s.version = "4.1.1" s.license = "MIT" s.summary = "A lightweight Swift wrapper for SQLite." s.homepage = "https://github.com/Nike-Inc/SQift" diff --git a/SQift.xcodeproj/project.pbxproj b/SQift.xcodeproj/project.pbxproj index aa2f57d..8094b80 100644 --- a/SQift.xcodeproj/project.pbxproj +++ b/SQift.xcodeproj/project.pbxproj @@ -1288,7 +1288,6 @@ PRODUCT_NAME = SQift; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.0; }; @@ -1316,7 +1315,6 @@ PRODUCT_NAME = SQift; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.0; }; @@ -1338,7 +1336,6 @@ PRODUCT_NAME = "SQift Tests"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 10.0; }; name = Debug; @@ -1359,7 +1356,6 @@ PRODUCT_NAME = "SQift Tests"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 10.0; }; name = Release; @@ -1390,7 +1386,6 @@ PRODUCT_NAME = SQift; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 3.0; }; @@ -1418,7 +1413,6 @@ PRODUCT_NAME = SQift; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 3.0; }; @@ -1491,7 +1485,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2,3"; TVOS_DEPLOYMENT_TARGET = 10.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1547,7 +1541,7 @@ SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2,3"; TVOS_DEPLOYMENT_TARGET = 10.0; VALIDATE_PRODUCT = YES; @@ -1583,7 +1577,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift; PRODUCT_NAME = SQift; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1609,7 +1602,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift; PRODUCT_NAME = SQift; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; }; name = Release; }; @@ -1628,7 +1620,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1647,7 +1638,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Source/Supporting Files/Info.plist b/Source/Supporting Files/Info.plist index 5284837..76d0c69 100644 --- a/Source/Supporting Files/Info.plist +++ b/Source/Supporting Files/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.1.0 + 4.1.1 CFBundleSignature ???? CFBundleVersion