Skip to content

Commit

Permalink
Fixed targets overriding swift language version (#25)
Browse files Browse the repository at this point in the history
* Hotfix support for Swift 4.2

* Fixed targets overriding swift language version
  • Loading branch information
gtrop1 authored May 2, 2019
1 parent ba899f0 commit 7560052
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 19 deletions.
28 changes: 27 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<Your Target Name>' do
pod 'SQift', '~> 4.0'
pod 'SQift', '~> 4.1'
end
```

Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion SQift.podspec
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
14 changes: 2 additions & 12 deletions SQift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand All @@ -1338,7 +1336,6 @@
PRODUCT_NAME = "SQift Tests";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = appletvos;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
};
name = Debug;
Expand All @@ -1359,7 +1356,6 @@
PRODUCT_NAME = "SQift Tests";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = appletvos;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
};
name = Release;
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1583,7 +1577,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift;
PRODUCT_NAME = SQift;
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -1609,7 +1602,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift;
PRODUCT_NAME = SQift;
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -1628,7 +1620,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests";
PRODUCT_NAME = "SQift Tests";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -1647,7 +1638,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests";
PRODUCT_NAME = "SQift Tests";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion Source/Supporting Files/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.1.0</string>
<string>4.1.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit 7560052

Please sign in to comment.