Skip to content

Commit 41d2e75

Browse files
authored
Merge pull request stephencelis#913 from sburlewapg/swift5
Version 0.12 (Swift 5)
2 parents 1a908a7 + a93b495 commit 41d2e75

File tree

9 files changed

+29
-29
lines changed

9 files changed

+29
-29
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ rvm: 2.3
44
osx_image: xcode10.2
55
env:
66
global:
7-
- IOS_SIMULATOR="iPhone X"
8-
- IOS_VERSION="12.1"
7+
- IOS_SIMULATOR="iPhone XS"
8+
- IOS_VERSION="12.2"
99
matrix:
1010
include:
1111
- env: BUILD_SCHEME="SQLite iOS"

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Made it through everything above and still having trouble? Sorry!
7474
- Even better: link to a sample project exhibiting the issue.
7575
- Include the SQLite.swift commit or branch experiencing the issue.
7676
- Include devices and operating systems affected.
77-
- Include build information: the Xcode and OS X versions affected.
77+
- Include build information: the Xcode and macOS versions affected.
7878

7979
[installation instructions]: Documentation/Index.md#installation
8080
[See Documentation]: Documentation/Index.md#sqliteswift-documentation

Documentation/Index.md

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

6868
## Installation
6969

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

@@ -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.6
83+
github "stephencelis/SQLite.swift" ~> 0.12
8484
```
8585

8686
3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
@@ -96,7 +96,7 @@ install SQLite.swift with Carthage:
9696
[CocoaPods][] is a dependency manager for Cocoa projects. To install SQLite.swift with CocoaPods:
9797

9898
1. Make sure CocoaPods is [installed][CocoaPods Installation] (SQLite.swift
99-
requires version 1.0.0 or greater).
99+
requires version 1.6.1 or greater).
100100

101101
```sh
102102
# Using the default Ruby install will require you to use sudo when
@@ -110,7 +110,7 @@ install SQLite.swift with Carthage:
110110
use_frameworks!
111111
112112
target 'YourAppTargetName' do
113-
pod 'SQLite.swift', '~> 0.11.6'
113+
pod 'SQLite.swift', '~> 0.12'
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.6'
127+
pod 'SQLite.swift/standalone', '~> 0.12'
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.6'
137+
pod 'SQLite.swift/standalone', '~> 0.12'
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.6'
151+
pod 'SQLite.swift/SQLCipher', '~> 0.12'
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.6")
184+
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.12")
185185
]
186186
```
187187

@@ -258,7 +258,7 @@ let path = NSSearchPathForDirectoriesInDomains(
258258
let db = try Connection("\(path)/db.sqlite3")
259259
```
260260

261-
On OS X, you can use your app’s **Application Support** directory:
261+
On macOS, you can use your app’s **Application Support** directory:
262262

263263
```swift
264264
var path = NSSearchPathForDirectoriesInDomains(

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BUILD_TOOL = xcodebuild
22
BUILD_SCHEME = SQLite Mac
3-
IOS_SIMULATOR = iPhone X
4-
IOS_VERSION = 12.1
3+
IOS_SIMULATOR = iPhone XS
4+
IOS_VERSION = 12.2
55
ifeq ($(BUILD_SCHEME),SQLite iOS)
66
BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=$(IOS_SIMULATOR),OS=$(IOS_VERSION)"
77
else

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ let package = Package(
99
.target(name: "SQLiteObjc"),
1010
.testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests")
1111
],
12-
swiftLanguageVersions: [4]
12+
swiftLanguageVersions: [4, 5]
1313
)
1414

1515
#if os(Linux)

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SQLite.swift
22

3-
[![Build Status][TravisBadge]][TravisLink] [![CocoaPods Version][CocoaPodsVersionBadge]][CocoaPodsVersionLink] [![Swift4 compatible][Swift4Badge]][Swift4Link] [![Platform][PlatformBadge]][PlatformLink] [![Carthage compatible][CartagheBadge]][CarthageLink] [![Join the chat at https://gitter.im/stephencelis/SQLite.swift][GitterBadge]][GitterLink]
3+
[![Build Status][TravisBadge]][TravisLink] [![CocoaPods Version][CocoaPodsVersionBadge]][CocoaPodsVersionLink] [![Swift5 compatible][Swift5Badge]][Swift5Link] [![Platform][PlatformBadge]][PlatformLink] [![Carthage compatible][CartagheBadge]][CarthageLink] [![Join the chat at https://gitter.im/stephencelis/SQLite.swift][GitterBadge]][GitterLink]
44

55
A type-safe, [Swift][]-language layer over [SQLite3][].
66

@@ -112,7 +112,7 @@ and the [companion repository][SQLiteDataAccessLayer2].
112112

113113
## Installation
114114

115-
> _Note:_ SQLite.swift requires Swift 4.2 (and [Xcode][] 10.2).
115+
> _Note:_ Version 0.12 requires Swift 5 (and [Xcode](https://developer.apple.com/xcode/downloads/) 10.2) or greater. Version 0.11.6 requires Swift 4.2 (and [Xcode](https://developer.apple.com/xcode/downloads/) 10.1) or greater.
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.6
127+
github "stephencelis/SQLite.swift" ~> 0.12
128128
```
129129

130130
3. Run `carthage update` and
@@ -142,7 +142,7 @@ install SQLite.swift with Carthage:
142142
SQLite.swift with CocoaPods:
143143

144144
1. Make sure CocoaPods is [installed][CocoaPods Installation]. (SQLite.swift
145-
requires version 1.0.0 or greater.)
145+
requires version 1.6.1 or greater.)
146146

147147
```sh
148148
# Using the default Ruby install will require you to use sudo when
@@ -156,7 +156,7 @@ SQLite.swift with CocoaPods:
156156
use_frameworks!
157157
158158
target 'YourAppTargetName' do
159-
pod 'SQLite.swift', '~> 0.11.6'
159+
pod 'SQLite.swift', '~> 0.12'
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.6")
177+
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.12")
178178
]
179179
```
180180

@@ -285,8 +285,8 @@ 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.2-orange.svg?style=flat
289-
[Swift4Link]: https://developer.apple.com/swift/
288+
[Swift5Badge]: https://img.shields.io/badge/swift-5-orange.svg?style=flat
289+
[Swift5Link]: https://developer.apple.com/swift/
290290

291291
[SQLiteMigrationManager.swift]: https://github.com/garriguv/SQLiteMigrationManager.swift
292292
[FMDB]: https://github.com/ccgus/fmdb

SQLite.swift.podspec

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

66
s.description = <<-DESC
77
SQLite.swift provides compile-time confidence in SQL statement syntax and
@@ -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.2',
24+
'SWIFT_VERSION' => '5',
2525
}
2626

2727
s.subspec 'standard' do |ss|

SQLite.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@
11801180
PRODUCT_NAME = "";
11811181
SDKROOT = iphoneos;
11821182
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1183-
SWIFT_VERSION = 4.2;
1183+
SWIFT_VERSION = 5.0;
11841184
TARGETED_DEVICE_FAMILY = "1,2,3";
11851185
VERSIONING_SYSTEM = "apple-generic";
11861186
VERSION_INFO_PREFIX = "";
@@ -1235,7 +1235,7 @@
12351235
PRODUCT_NAME = "";
12361236
SDKROOT = iphoneos;
12371237
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1238-
SWIFT_VERSION = 4.2;
1238+
SWIFT_VERSION = 5.0;
12391239
TARGETED_DEVICE_FAMILY = "1,2,3";
12401240
VALIDATE_PRODUCT = YES;
12411241
VERSIONING_SYSTEM = "apple-generic";

Sources/SQLite/Info.plist

Lines changed: 1 addition & 1 deletion
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>0.11.6</string>
18+
<string>0.12</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)