Skip to content

Commit 0d81e34

Browse files
MrMageMrMage
committed
Merge remote-tracking branch 'stephencelis/master'
2 parents 377bd86 + d13baed commit 0d81e34

20 files changed

+107
-68
lines changed

‎.gitmodules

Whitespace-only changes.

‎.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.1

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
language: objective-c
22
rvm: 2.3
3-
osx_image: xcode9
3+
osx_image: xcode9.3
44
env:
55
global:
66
- IOS_SIMULATOR="iPhone 6s"
7-
- IOS_VERSION="11.0"
7+
- IOS_VERSION="11.3"
88
matrix:
99
include:
1010
- env: BUILD_SCHEME="SQLite iOS"

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0.11.5 (04-14-2018), [diff][diff-0.11.5]
2+
========================================
3+
4+
* Swift 4.1 ([#797][])
5+
16
0.11.4 (30-09-2017), [diff][diff-0.11.4]
27
========================================
38

@@ -51,6 +56,7 @@
5156
[diff-0.11.2]: https://github.com/stephencelis/SQLite.swift/compare/0.11.1...0.11.2
5257
[diff-0.11.3]: https://github.com/stephencelis/SQLite.swift/compare/0.11.2...0.11.3
5358
[diff-0.11.4]: https://github.com/stephencelis/SQLite.swift/compare/0.11.3...0.11.4
59+
[diff-0.11.5]: https://github.com/stephencelis/SQLite.swift/compare/0.11.4...0.11.5
5460

5561
[#142]: https://github.com/stephencelis/SQLite.swift/issues/142
5662
[#315]: https://github.com/stephencelis/SQLite.swift/issues/315
@@ -81,3 +87,4 @@
8187
[#723]: https://github.com/stephencelis/SQLite.swift/pull/723
8288
[#733]: https://github.com/stephencelis/SQLite.swift/pull/733
8389
[#726]: https://github.com/stephencelis/SQLite.swift/pull/726
90+
[#797]: https://github.com/stephencelis/SQLite.swift/pull/797

‎Documentation/Index.md

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

6868
## Installation
6969

70-
> _Note:_ SQLite.swift requires Swift 4 (and
71-
> [Xcode 9](https://developer.apple.com/xcode/downloads/)) or greater.
70+
> _Note:_ SQLite.swift requires Swift 4.1 (and
71+
> [Xcode 9.3](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.4
83+
github "stephencelis/SQLite.swift" ~> 0.11.5
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.4'
113+
pod 'SQLite.swift', '~> 0.11.5'
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.4'
127+
pod 'SQLite.swift/standalone', '~> 0.11.5'
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.4'
137+
pod 'SQLite.swift/standalone', '~> 0.11.5'
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.4'
151+
pod 'SQLite.swift/SQLCipher', '~> 0.11.5'
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.4")
184+
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.11.5")
185185
]
186186
```
187187

@@ -718,7 +718,7 @@ try db.transaction {
718718
| `<<=` | `Int -> Int` |
719719
| `>>=` | `Int -> Int` |
720720
| `&=` | `Int -> Int` |
721-
| `||=` | `Int -> Int` |
721+
| `\|\|=` | `Int -> Int` |
722722
| `^=` | `Int -> Int` |
723723
| `+=` | `String -> String` |
724724

@@ -954,7 +954,7 @@ equate or compare different types will prevent compilation.
954954
| `<=` | `Comparable -> Bool` | `<=` |
955955
| `~=` | `(Interval, Comparable) -> Bool` | `BETWEEN` |
956956
| `&&` | `Bool -> Bool` | `AND` |
957-
| `||` | `Bool -> Bool` | `OR` |
957+
| `\|\|`| `Bool -> Bool` | `OR` |
958958

959959
> *When comparing against `nil`, SQLite.swift will use `IS` and `IS NOT`
960960
> accordingly.
@@ -1586,8 +1586,8 @@ arithmetic, bitwise operations, and concatenation.
15861586
| `<<` | `Int -> Int` | `<<` |
15871587
| `>>` | `Int -> Int` | `>>` |
15881588
| `&` | `Int -> Int` | `&` |
1589-
| `|` | `Int -> Int` | `|` |
1590-
| `+` | `String -> String` | `||` |
1589+
| `\|` | `Int -> Int` | `\|` |
1590+
| `+` | `String -> String` | `\|\|` |
15911591

15921592
> _Note:_ SQLite.swift also defines a bitwise XOR operator, `^`, which
15931593
> expands the expression `lhs ^ rhs` to `~(lhs & rhs) & (lhs | rhs)`.
@@ -1854,8 +1854,8 @@ using the following functions.
18541854
```swift
18551855
let stmt = try db.prepare("SELECT id, email FROM users")
18561856
for row in stmt {
1857-
for (index, name) in stmt.columnNames.enumerate() {
1858-
print ("\(name)=\(row[index]!)")
1857+
for (index, name) in stmt.columnNames.enumerated() {
1858+
print ("\(name):\(row[index]!)")
18591859
// id: Optional(1), email: Optional("[email protected]")
18601860
}
18611861
}

‎Makefile

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

‎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 (and [Xcode][] 9).
115+
> _Note:_ SQLite.swift requires Swift 4.1 (and [Xcode][] 9.3).
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.4
127+
github "stephencelis/SQLite.swift" ~> 0.11.5
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.4'
159+
pod 'SQLite.swift', '~> 0.11.5'
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.4")
177+
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.11.5")
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-orange.svg?style=flat
288+
[Swift4Badge]: https://img.shields.io/badge/swift-4.1-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: 2 additions & 2 deletions
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.4"
3+
s.version = "0.11.5"
44
s.summary = "A type-safe, Swift-language layer over SQLite3 for iOS and OS X."
55

66
s.description = <<-DESC
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
2121
s.watchos.deployment_target = "2.2"
2222
s.default_subspec = 'standard'
2323
s.pod_target_xcconfig = {
24-
'SWIFT_VERSION' => '4.0',
24+
'SWIFT_VERSION' => '4.1',
2525
}
2626

2727
s.subspec 'standard' do |ss|

‎SQLite.xcodeproj/project.pbxproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@
680680
isa = PBXProject;
681681
attributes = {
682682
LastSwiftUpdateCheck = 0720;
683-
LastUpgradeCheck = 0900;
683+
LastUpgradeCheck = 0930;
684684
TargetAttributes = {
685685
03A65E591C6BB0F50062603F = {
686686
CreatedOnToolsVersion = 7.2;
@@ -1063,7 +1063,7 @@
10631063
03A65E6D1C6BB0F60062603F /* Debug */ = {
10641064
isa = XCBuildConfiguration;
10651065
buildSettings = {
1066-
INFOPLIST_FILE = Tests/SQLite/Info.plist;
1066+
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
10671067
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10681068
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
10691069
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1077,7 +1077,7 @@
10771077
03A65E6E1C6BB0F60062603F /* Release */ = {
10781078
isa = XCBuildConfiguration;
10791079
buildSettings = {
1080-
INFOPLIST_FILE = Tests/SQLite/Info.plist;
1080+
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
10811081
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10821082
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
10831083
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1148,12 +1148,14 @@
11481148
CLANG_WARN_BOOL_CONVERSION = YES;
11491149
CLANG_WARN_COMMA = YES;
11501150
CLANG_WARN_CONSTANT_CONVERSION = YES;
1151+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
11511152
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
11521153
CLANG_WARN_EMPTY_BODY = YES;
11531154
CLANG_WARN_ENUM_CONVERSION = YES;
11541155
CLANG_WARN_INFINITE_RECURSION = YES;
11551156
CLANG_WARN_INT_CONVERSION = YES;
11561157
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1158+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
11571159
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
11581160
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
11591161
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1206,12 +1208,14 @@
12061208
CLANG_WARN_BOOL_CONVERSION = YES;
12071209
CLANG_WARN_COMMA = YES;
12081210
CLANG_WARN_CONSTANT_CONVERSION = YES;
1211+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
12091212
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
12101213
CLANG_WARN_EMPTY_BODY = YES;
12111214
CLANG_WARN_ENUM_CONVERSION = YES;
12121215
CLANG_WARN_INFINITE_RECURSION = YES;
12131216
CLANG_WARN_INT_CONVERSION = YES;
12141217
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1218+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
12151219
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
12161220
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
12171221
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

‎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 = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Sources/SQLite/Typed/Coding.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ fileprivate class SQLiteEncoder: Encoder {
184184
}
185185
}
186186

187-
fileprivate var setters: [SQLite.Setter] = []
187+
fileprivate var setters: [Setter] = []
188188
let codingPath: [CodingKey] = []
189189
let userInfo: [CodingUserInfoKey: Any]
190190

‎Tests/CocoaPods/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source 'https://rubygems.org'
22

3-
gem 'cocoapods', '~> 1.3.1'
3+
gem 'cocoapods', '~> 1.5.0'
44
gem 'minitest'

0 commit comments

Comments
 (0)