Skip to content

Commit 1a908a7

Browse files
stephencelisstephencelis
authored
Merge pull request stephencelis#902 from sburlewapg/swift5
Version 0.11.6
2 parents 861ff28 + d89c0e8 commit 1a908a7

File tree

16 files changed

+56
-74
lines changed

16 files changed

+56
-74
lines changed

‎.travis.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
language: objective-c
22
rvm: 2.3
33
# https://docs.travis-ci.com/user/reference/osx
4-
osx_image: xcode10.1
4+
osx_image: xcode10.2
55
env:
66
global:
7-
- IOS_SIMULATOR="iPhone 6s"
7+
- IOS_SIMULATOR="iPhone X"
88
- IOS_VERSION="12.1"
99
matrix:
1010
include:
@@ -25,4 +25,7 @@ before_install:
2525
- brew update
2626
- brew outdated carthage || brew upgrade carthage
2727
script:
28+
# Workaround for Xcode 10.2/tvOS 9.1 bug
29+
# See https://stackoverflow.com/questions/55389080/xcode-10-2-failed-to-run-app-on-simulator-with-ios-10
30+
- sudo mkdir /Library/Developer/CoreSimulator/Profiles/Runtimes/tvOS\ 9.1.simruntime/Contents/Resources/RuntimeRoot/usr/lib/swift
2831
- ./run-tests.sh

‎Documentation/Index.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767

6868
## Installation
6969

70-
> _Note:_ SQLite.swift requires Swift 4.1 (and
71-
> [Xcode 9.3](https://developer.apple.com/xcode/downloads/)) or greater.
70+
> _Note:_ SQLite.swift requires Swift 4.2 (and
71+
> [Xcode 10.2](https://developer.apple.com/xcode/downloads/)) or greater.
7272
7373

7474
### Carthage
@@ -80,7 +80,7 @@ install SQLite.swift with Carthage:
8080
2. Update your Cartfile to include the following:
8181

8282
```ruby
83-
github "stephencelis/SQLite.swift" ~> 0.11.5
83+
github "stephencelis/SQLite.swift" ~> 0.11.6
8484
```
8585

8686
3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
@@ -110,7 +110,7 @@ install SQLite.swift with Carthage:
110110
use_frameworks!
111111
112112
target 'YourAppTargetName' do
113-
pod 'SQLite.swift', '~> 0.11.5'
113+
pod 'SQLite.swift', '~> 0.11.6'
114114
end
115115
```
116116

@@ -124,7 +124,7 @@ with the OS you can require the `standalone` subspec:
124124

125125
```ruby
126126
target 'YourAppTargetName' do
127-
pod 'SQLite.swift/standalone', '~> 0.11.5'
127+
pod 'SQLite.swift/standalone', '~> 0.11.6'
128128
end
129129
```
130130

@@ -134,7 +134,7 @@ dependency to sqlite3 or one of its subspecs:
134134

135135
```ruby
136136
target 'YourAppTargetName' do
137-
pod 'SQLite.swift/standalone', '~> 0.11.5'
137+
pod 'SQLite.swift/standalone', '~> 0.11.6'
138138
pod 'sqlite3/fts5', '= 3.15.0' # SQLite 3.15.0 with FTS5 enabled
139139
end
140140
```
@@ -148,7 +148,7 @@ If you want to use [SQLCipher][] with SQLite.swift you can require the
148148

149149
```ruby
150150
target 'YourAppTargetName' do
151-
pod 'SQLite.swift/SQLCipher', '~> 0.11.5'
151+
pod 'SQLite.swift/SQLCipher', '~> 0.11.6'
152152
end
153153
```
154154

@@ -181,7 +181,7 @@ applications.
181181

182182
```swift
183183
dependencies: [
184-
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.11.5")
184+
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.11.6")
185185
]
186186
```
187187

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BUILD_TOOL = xcodebuild
22
BUILD_SCHEME = SQLite Mac
3-
IOS_SIMULATOR = iPhone 6s
3+
IOS_SIMULATOR = iPhone X
44
IOS_VERSION = 12.1
55
ifeq ($(BUILD_SCHEME),SQLite iOS)
66
BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=$(IOS_SIMULATOR),OS=$(IOS_VERSION)"

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ and the [companion repository][SQLiteDataAccessLayer2].
112112

113113
## Installation
114114

115-
> _Note:_ SQLite.swift requires Swift 4.1 (and [Xcode][] 9.3).
115+
> _Note:_ SQLite.swift requires Swift 4.2 (and [Xcode][] 10.2).
116116
117117
### Carthage
118118

@@ -124,7 +124,7 @@ install SQLite.swift with Carthage:
124124
2. Update your Cartfile to include the following:
125125

126126
```ruby
127-
github "stephencelis/SQLite.swift" ~> 0.11.5
127+
github "stephencelis/SQLite.swift" ~> 0.11.6
128128
```
129129

130130
3. Run `carthage update` and
@@ -156,7 +156,7 @@ SQLite.swift with CocoaPods:
156156
use_frameworks!
157157
158158
target 'YourAppTargetName' do
159-
pod 'SQLite.swift', '~> 0.11.5'
159+
pod 'SQLite.swift', '~> 0.11.6'
160160
end
161161
```
162162

@@ -174,7 +174,7 @@ Swift code.
174174

175175
```swift
176176
dependencies: [
177-
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.11.5")
177+
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.11.6")
178178
]
179179
```
180180

@@ -285,7 +285,7 @@ Looking for something else? Try another Swift wrapper (or [FMDB][]):
285285
[GitterBadge]: https://badges.gitter.im/stephencelis/SQLite.swift.svg
286286
[GitterLink]: https://gitter.im/stephencelis/SQLite.swift
287287

288-
[Swift4Badge]: https://img.shields.io/badge/swift-4.1-orange.svg?style=flat
288+
[Swift4Badge]: https://img.shields.io/badge/swift-4.2-orange.svg?style=flat
289289
[Swift4Link]: https://developer.apple.com/swift/
290290

291291
[SQLiteMigrationManager.swift]: https://github.com/garriguv/SQLiteMigrationManager.swift

‎SQLite.swift.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "SQLite.swift"
3-
s.version = "0.11.5"
3+
s.version = "0.11.6"
44
s.summary = "A type-safe, Swift-language layer over SQLite3 for iOS and OS X."
55

66
s.description = <<-DESC

‎SQLite.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@
680680
isa = PBXProject;
681681
attributes = {
682682
LastSwiftUpdateCheck = 0720;
683-
LastUpgradeCheck = 0930;
683+
LastUpgradeCheck = 1020;
684684
TargetAttributes = {
685685
03A65E591C6BB0F50062603F = {
686686
CreatedOnToolsVersion = 7.2;
@@ -700,7 +700,7 @@
700700
};
701701
EE247ADC1C3F04ED00AE3E12 = {
702702
CreatedOnToolsVersion = 7.2;
703-
LastSwiftMigration = 0900;
703+
LastSwiftMigration = 1020;
704704
};
705705
EE247B3B1C3F3ED000AE3E12 = {
706706
CreatedOnToolsVersion = 7.2;
@@ -714,10 +714,11 @@
714714
};
715715
buildConfigurationList = EE247ACD1C3F04ED00AE3E12 /* Build configuration list for PBXProject "SQLite" */;
716716
compatibilityVersion = "Xcode 3.2";
717-
developmentRegion = English;
717+
developmentRegion = en;
718718
hasScannedForEncodings = 0;
719719
knownRegions = (
720720
en,
721+
Base,
721722
);
722723
mainGroup = EE247AC91C3F04ED00AE3E12;
723724
productRefGroup = EE247AD41C3F04ED00AE3E12 /* Products */;
@@ -1032,8 +1033,6 @@
10321033
PRODUCT_NAME = SQLite;
10331034
SDKROOT = appletvos;
10341035
SKIP_INSTALL = YES;
1035-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1036-
SWIFT_VERSION = 4.2;
10371036
TVOS_DEPLOYMENT_TARGET = 9.1;
10381037
};
10391038
name = Debug;
@@ -1054,8 +1053,6 @@
10541053
PRODUCT_NAME = SQLite;
10551054
SDKROOT = appletvos;
10561055
SKIP_INSTALL = YES;
1057-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1058-
SWIFT_VERSION = 4.2;
10591056
TVOS_DEPLOYMENT_TARGET = 9.1;
10601057
};
10611058
name = Release;
@@ -1068,8 +1065,6 @@
10681065
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
10691066
PRODUCT_NAME = "$(TARGET_NAME)";
10701067
SDKROOT = appletvos;
1071-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1072-
SWIFT_VERSION = 4.2;
10731068
TVOS_DEPLOYMENT_TARGET = 9.1;
10741069
};
10751070
name = Debug;
@@ -1082,8 +1077,6 @@
10821077
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
10831078
PRODUCT_NAME = "$(TARGET_NAME)";
10841079
SDKROOT = appletvos;
1085-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1086-
SWIFT_VERSION = 4.2;
10871080
TVOS_DEPLOYMENT_TARGET = 9.1;
10881081
};
10891082
name = Release;
@@ -1105,8 +1098,6 @@
11051098
PRODUCT_NAME = SQLite;
11061099
SDKROOT = watchos;
11071100
SKIP_INSTALL = YES;
1108-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1109-
SWIFT_VERSION = 4.2;
11101101
TARGETED_DEVICE_FAMILY = 4;
11111102
WATCHOS_DEPLOYMENT_TARGET = 2.2;
11121103
};
@@ -1129,8 +1120,6 @@
11291120
PRODUCT_NAME = SQLite;
11301121
SDKROOT = watchos;
11311122
SKIP_INSTALL = YES;
1132-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1133-
SWIFT_VERSION = 4.2;
11341123
TARGETED_DEVICE_FAMILY = 4;
11351124
WATCHOS_DEPLOYMENT_TARGET = 2.2;
11361125
};
@@ -1140,6 +1129,7 @@
11401129
isa = XCBuildConfiguration;
11411130
buildSettings = {
11421131
ALWAYS_SEARCH_USER_PATHS = NO;
1132+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
11431133
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
11441134
CLANG_CXX_LIBRARY = "libc++";
11451135
CLANG_ENABLE_MODULES = YES;
@@ -1190,6 +1180,7 @@
11901180
PRODUCT_NAME = "";
11911181
SDKROOT = iphoneos;
11921182
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1183+
SWIFT_VERSION = 4.2;
11931184
TARGETED_DEVICE_FAMILY = "1,2,3";
11941185
VERSIONING_SYSTEM = "apple-generic";
11951186
VERSION_INFO_PREFIX = "";
@@ -1200,6 +1191,7 @@
12001191
isa = XCBuildConfiguration;
12011192
buildSettings = {
12021193
ALWAYS_SEARCH_USER_PATHS = NO;
1194+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
12031195
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
12041196
CLANG_CXX_LIBRARY = "libc++";
12051197
CLANG_ENABLE_MODULES = YES;
@@ -1243,6 +1235,7 @@
12431235
PRODUCT_NAME = "";
12441236
SDKROOT = iphoneos;
12451237
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1238+
SWIFT_VERSION = 4.2;
12461239
TARGETED_DEVICE_FAMILY = "1,2,3";
12471240
VALIDATE_PRODUCT = YES;
12481241
VERSIONING_SYSTEM = "apple-generic";
@@ -1268,8 +1261,6 @@
12681261
PRODUCT_NAME = SQLite;
12691262
SKIP_INSTALL = YES;
12701263
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1271-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1272-
SWIFT_VERSION = 4.2;
12731264
};
12741265
name = Debug;
12751266
};
@@ -1290,8 +1281,6 @@
12901281
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
12911282
PRODUCT_NAME = SQLite;
12921283
SKIP_INSTALL = YES;
1293-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1294-
SWIFT_VERSION = 4.2;
12951284
};
12961285
name = Release;
12971286
};
@@ -1303,8 +1292,6 @@
13031292
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13041293
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
13051294
PRODUCT_NAME = "$(TARGET_NAME)";
1306-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1307-
SWIFT_VERSION = 4.2;
13081295
};
13091296
name = Debug;
13101297
};
@@ -1316,8 +1303,6 @@
13161303
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13171304
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
13181305
PRODUCT_NAME = "$(TARGET_NAME)";
1319-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1320-
SWIFT_VERSION = 4.2;
13211306
};
13221307
name = Release;
13231308
};
@@ -1341,8 +1326,6 @@
13411326
SDKROOT = macosx;
13421327
SKIP_INSTALL = YES;
13431328
SWIFT_INCLUDE_PATHS = "";
1344-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1345-
SWIFT_VERSION = 4.2;
13461329
};
13471330
name = Debug;
13481331
};
@@ -1366,8 +1349,6 @@
13661349
SDKROOT = macosx;
13671350
SKIP_INSTALL = YES;
13681351
SWIFT_INCLUDE_PATHS = "";
1369-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1370-
SWIFT_VERSION = 4.2;
13711352
};
13721353
name = Release;
13731354
};
@@ -1382,8 +1363,6 @@
13821363
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
13831364
PRODUCT_NAME = "$(TARGET_NAME)";
13841365
SDKROOT = macosx;
1385-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1386-
SWIFT_VERSION = 4.2;
13871366
};
13881367
name = Debug;
13891368
};
@@ -1398,8 +1377,6 @@
13981377
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
13991378
PRODUCT_NAME = "$(TARGET_NAME)";
14001379
SDKROOT = macosx;
1401-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1402-
SWIFT_VERSION = 4.2;
14031380
};
14041381
name = Release;
14051382
};

‎SQLite.xcodeproj/xcshareddata/xcschemes/SQLite Mac.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎SQLite.xcodeproj/xcshareddata/xcschemes/SQLite iOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎SQLite.xcodeproj/xcshareddata/xcschemes/SQLite tvOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎SQLite.xcodeproj/xcshareddata/xcschemes/SQLite watchOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)