Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ rvm: 2.3
osx_image: xcode10.2
env:
global:
- IOS_SIMULATOR="iPhone X"
- IOS_VERSION="12.1"
- IOS_SIMULATOR="iPhone XS"
- IOS_VERSION="12.2"
matrix:
include:
- env: BUILD_SCHEME="SQLite iOS"
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Made it through everything above and still having trouble? Sorry!
- Even better: link to a sample project exhibiting the issue.
- Include the SQLite.swift commit or branch experiencing the issue.
- Include devices and operating systems affected.
- Include build information: the Xcode and OS X versions affected.
- Include build information: the Xcode and macOS versions affected.

[installation instructions]: Documentation/Index.md#installation
[See Documentation]: Documentation/Index.md#sqliteswift-documentation
Expand Down
18 changes: 9 additions & 9 deletions Documentation/Index.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

## Installation

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


Expand All @@ -80,7 +80,7 @@ install SQLite.swift with Carthage:
2. Update your Cartfile to include the following:

```ruby
github "stephencelis/SQLite.swift" ~> 0.11.6
github "stephencelis/SQLite.swift" ~> 0.12
```

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

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

```sh
# Using the default Ruby install will require you to use sudo when
Expand All @@ -110,7 +110,7 @@ install SQLite.swift with Carthage:
use_frameworks!

target 'YourAppTargetName' do
pod 'SQLite.swift', '~> 0.11.6'
pod 'SQLite.swift', '~> 0.12'
end
```

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

```ruby
target 'YourAppTargetName' do
pod 'SQLite.swift/standalone', '~> 0.11.6'
pod 'SQLite.swift/standalone', '~> 0.12'
end
```

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

```ruby
target 'YourAppTargetName' do
pod 'SQLite.swift/standalone', '~> 0.11.6'
pod 'SQLite.swift/standalone', '~> 0.12'
pod 'sqlite3/fts5', '= 3.15.0' # SQLite 3.15.0 with FTS5 enabled
end
```
Expand All @@ -148,7 +148,7 @@ If you want to use [SQLCipher][] with SQLite.swift you can require the

```ruby
target 'YourAppTargetName' do
pod 'SQLite.swift/SQLCipher', '~> 0.11.6'
pod 'SQLite.swift/SQLCipher', '~> 0.12'
end
```

Expand Down Expand Up @@ -181,7 +181,7 @@ applications.

```swift
dependencies: [
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.11.6")
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.12")
]
```

Expand Down Expand Up @@ -258,7 +258,7 @@ let path = NSSearchPathForDirectoriesInDomains(
let db = try Connection("\(path)/db.sqlite3")
```

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

```swift
var path = NSSearchPathForDirectoriesInDomains(
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BUILD_TOOL = xcodebuild
BUILD_SCHEME = SQLite Mac
IOS_SIMULATOR = iPhone X
IOS_VERSION = 12.1
IOS_SIMULATOR = iPhone XS
IOS_VERSION = 12.2
ifeq ($(BUILD_SCHEME),SQLite iOS)
BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=$(IOS_SIMULATOR),OS=$(IOS_VERSION)"
else
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let package = Package(
.target(name: "SQLiteObjc"),
.testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests")
],
swiftLanguageVersions: [4]
swiftLanguageVersions: [4, 5]
)

#if os(Linux)
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SQLite.swift

[![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]
[![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]

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

Expand Down Expand Up @@ -112,7 +112,7 @@ and the [companion repository][SQLiteDataAccessLayer2].

## Installation

> _Note:_ SQLite.swift requires Swift 4.2 (and [Xcode][] 10.2).
> _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.

### Carthage

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

```ruby
github "stephencelis/SQLite.swift" ~> 0.11.6
github "stephencelis/SQLite.swift" ~> 0.12
```

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

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

```sh
# Using the default Ruby install will require you to use sudo when
Expand All @@ -156,7 +156,7 @@ SQLite.swift with CocoaPods:
use_frameworks!

target 'YourAppTargetName' do
pod 'SQLite.swift', '~> 0.11.6'
pod 'SQLite.swift', '~> 0.12'
end
```

Expand All @@ -174,7 +174,7 @@ Swift code.

```swift
dependencies: [
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.11.6")
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.12")
]
```

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

[Swift4Badge]: https://img.shields.io/badge/swift-4.2-orange.svg?style=flat
[Swift4Link]: https://developer.apple.com/swift/
[Swift5Badge]: https://img.shields.io/badge/swift-5-orange.svg?style=flat
[Swift5Link]: https://developer.apple.com/swift/

[SQLiteMigrationManager.swift]: https://github.com/garriguv/SQLiteMigrationManager.swift
[FMDB]: https://github.com/ccgus/fmdb
Expand Down
6 changes: 3 additions & 3 deletions SQLite.swift.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "SQLite.swift"
s.version = "0.11.6"
s.summary = "A type-safe, Swift-language layer over SQLite3 for iOS and OS X."
s.version = "0.12"
s.summary = "A type-safe, Swift-language layer over SQLite3 for iOS and macOS."

s.description = <<-DESC
SQLite.swift provides compile-time confidence in SQL statement syntax and
Expand All @@ -21,7 +21,7 @@ Pod::Spec.new do |s|
s.watchos.deployment_target = "2.2"
s.default_subspec = 'standard'
s.pod_target_xcconfig = {
'SWIFT_VERSION' => '4.2',
'SWIFT_VERSION' => '5',
}

s.subspec 'standard' do |ss|
Expand Down
4 changes: 2 additions & 2 deletions SQLite.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@
PRODUCT_NAME = "";
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -1235,7 +1235,7 @@
PRODUCT_NAME = "";
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand Down
2 changes: 1 addition & 1 deletion Sources/SQLite/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>0.11.6</string>
<string>0.12</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down