Skip to content

Commit 7560052

Browse files
authored
Fixed targets overriding swift language version (#25)
* Hotfix support for Swift 4.2 * Fixed targets overriding swift language version
1 parent ba899f0 commit 7560052

File tree

5 files changed

+35
-19
lines changed

5 files changed

+35
-19
lines changed

CHANGELOG.md

+27-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55

66
#### 4.x Releases
77

8-
- `4.1.x` Releases - [4.1.0](#410)
8+
- `4.1.x` Releases - [4.1.0](#410) | [4.1.1](#411)
99
- `4.0.x` Releases - [4.0.0](#400)
1010

1111
#### 3.x Releases
@@ -38,6 +38,32 @@ All notable changes to this project will be documented in this file.
3838
- `0.1.x` Releases - [0.1.0](#010)
3939

4040
---
41+
42+
## Unreleased
43+
44+
#### Added
45+
46+
#### Updated
47+
48+
#### Deprecated
49+
50+
#### Removed
51+
52+
#### Fixed
53+
54+
---
55+
56+
## [4.1.1](https://github.com/Nike-Inc/SQift/releases/tag/4.1.1)
57+
58+
Release on 2019-05-02. All issues associated with this milestone can be found using this
59+
[filter](https://github.com/Nike-Inc/SQift/milestone/11?closed=1).
60+
61+
#### Fixed
62+
- Issue where Xcode project was incorrectly set to Swift 5.0 instead of 4.2 breaking Carthage and submodule support.
63+
- 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).
64+
65+
---
66+
4167
## [4.1.0](https://github.com/Nike-Inc/SQift/releases/tag/4.1.0)
4268

4369
Release on 2019-04-30. All issues associated with this milestone can be found using this

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@ You can install it with the following command:
5757
$ gem install cocoapods
5858
```
5959

60-
> CocoaPods 1.3+ is required to build SQift.
60+
> CocoaPods 1.7.0+ is required to build SQift.
6161
6262
To integrate SQift into your Xcode project using CocoaPods, specify it in your `Podfile`:
6363

6464
```ruby
65-
platform :ios, '11.0'
65+
platform :ios, '10.0'
6666
use_frameworks!
6767

6868
target '<Your Target Name>' do
69-
pod 'SQift', '~> 4.0'
69+
pod 'SQift', '~> 4.1'
7070
end
7171
```
7272

@@ -90,7 +90,7 @@ $ brew install carthage
9090
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):
9191

9292
```
93-
github "Nike-Inc/SQift" ~> 4.0
93+
github "Nike-Inc/SQift" ~> 4.1
9494
```
9595

9696
Run `carthage update` to build the framework and drag the built `SQift.framework` into your Xcode project.

SQift.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "SQift"
3-
s.version = "4.1.0"
3+
s.version = "4.1.1"
44
s.license = "MIT"
55
s.summary = "A lightweight Swift wrapper for SQLite."
66
s.homepage = "https://github.com/Nike-Inc/SQift"

SQift.xcodeproj/project.pbxproj

+2-12
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,6 @@
12881288
PRODUCT_NAME = SQift;
12891289
SDKROOT = appletvos;
12901290
SKIP_INSTALL = YES;
1291-
SWIFT_VERSION = 5.0;
12921291
TARGETED_DEVICE_FAMILY = 3;
12931292
TVOS_DEPLOYMENT_TARGET = 10.0;
12941293
};
@@ -1316,7 +1315,6 @@
13161315
PRODUCT_NAME = SQift;
13171316
SDKROOT = appletvos;
13181317
SKIP_INSTALL = YES;
1319-
SWIFT_VERSION = 5.0;
13201318
TARGETED_DEVICE_FAMILY = 3;
13211319
TVOS_DEPLOYMENT_TARGET = 10.0;
13221320
};
@@ -1338,7 +1336,6 @@
13381336
PRODUCT_NAME = "SQift Tests";
13391337
PROVISIONING_PROFILE_SPECIFIER = "";
13401338
SDKROOT = appletvos;
1341-
SWIFT_VERSION = 5.0;
13421339
TVOS_DEPLOYMENT_TARGET = 10.0;
13431340
};
13441341
name = Debug;
@@ -1359,7 +1356,6 @@
13591356
PRODUCT_NAME = "SQift Tests";
13601357
PROVISIONING_PROFILE_SPECIFIER = "";
13611358
SDKROOT = appletvos;
1362-
SWIFT_VERSION = 5.0;
13631359
TVOS_DEPLOYMENT_TARGET = 10.0;
13641360
};
13651361
name = Release;
@@ -1390,7 +1386,6 @@
13901386
PRODUCT_NAME = SQift;
13911387
SDKROOT = watchos;
13921388
SKIP_INSTALL = YES;
1393-
SWIFT_VERSION = 5.0;
13941389
TARGETED_DEVICE_FAMILY = 4;
13951390
WATCHOS_DEPLOYMENT_TARGET = 3.0;
13961391
};
@@ -1418,7 +1413,6 @@
14181413
PRODUCT_NAME = SQift;
14191414
SDKROOT = watchos;
14201415
SKIP_INSTALL = YES;
1421-
SWIFT_VERSION = 5.0;
14221416
TARGETED_DEVICE_FAMILY = 4;
14231417
WATCHOS_DEPLOYMENT_TARGET = 3.0;
14241418
};
@@ -1491,7 +1485,7 @@
14911485
ONLY_ACTIVE_ARCH = YES;
14921486
SDKROOT = iphoneos;
14931487
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1494-
SWIFT_VERSION = 5.0;
1488+
SWIFT_VERSION = 4.2;
14951489
TARGETED_DEVICE_FAMILY = "1,2,3";
14961490
TVOS_DEPLOYMENT_TARGET = 10.0;
14971491
VERSIONING_SYSTEM = "apple-generic";
@@ -1547,7 +1541,7 @@
15471541
SDKROOT = iphoneos;
15481542
SWIFT_COMPILATION_MODE = wholemodule;
15491543
SWIFT_OPTIMIZATION_LEVEL = "-O";
1550-
SWIFT_VERSION = 5.0;
1544+
SWIFT_VERSION = 4.2;
15511545
TARGETED_DEVICE_FAMILY = "1,2,3";
15521546
TVOS_DEPLOYMENT_TARGET = 10.0;
15531547
VALIDATE_PRODUCT = YES;
@@ -1583,7 +1577,6 @@
15831577
PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift;
15841578
PRODUCT_NAME = SQift;
15851579
SKIP_INSTALL = YES;
1586-
SWIFT_VERSION = 5.0;
15871580
};
15881581
name = Debug;
15891582
};
@@ -1609,7 +1602,6 @@
16091602
PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift;
16101603
PRODUCT_NAME = SQift;
16111604
SKIP_INSTALL = YES;
1612-
SWIFT_VERSION = 5.0;
16131605
};
16141606
name = Release;
16151607
};
@@ -1628,7 +1620,6 @@
16281620
PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests";
16291621
PRODUCT_NAME = "SQift Tests";
16301622
PROVISIONING_PROFILE_SPECIFIER = "";
1631-
SWIFT_VERSION = 5.0;
16321623
};
16331624
name = Debug;
16341625
};
@@ -1647,7 +1638,6 @@
16471638
PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests";
16481639
PRODUCT_NAME = "SQift Tests";
16491640
PROVISIONING_PROFILE_SPECIFIER = "";
1650-
SWIFT_VERSION = 5.0;
16511641
};
16521642
name = Release;
16531643
};

Source/Supporting Files/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>4.1.0</string>
18+
<string>4.1.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)