From 9ae1a0bfe1f950099042964b0b4e6cb696681075 Mon Sep 17 00:00:00 2001 From: Shawn Burlew Date: Fri, 19 Apr 2019 11:27:07 -0600 Subject: [PATCH 1/9] Updated to Swift 5 --- .travis.yml | 4 ++-- Documentation/Index.md | 14 +++++++------- Makefile | 2 +- README.md | 10 +++++----- SQLite.swift.podspec | 4 ++-- SQLite.xcodeproj/project.pbxproj | 4 ++-- Sources/SQLite/Info.plist | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index d54827b2..c8fc5feb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/Documentation/Index.md b/Documentation/Index.md index 651aa991..cbb5d49a 100644 --- a/Documentation/Index.md +++ b/Documentation/Index.md @@ -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. @@ -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]. @@ -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 ``` @@ -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 ``` @@ -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 ``` @@ -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 ``` @@ -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") ] ``` diff --git a/Makefile b/Makefile index 7792ecdb..5ea45d5d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BUILD_TOOL = xcodebuild BUILD_SCHEME = SQLite Mac IOS_SIMULATOR = iPhone X -IOS_VERSION = 12.1 +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 diff --git a/README.md b/README.md index a2f090e0..ce45ef4e 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ and the [companion repository][SQLiteDataAccessLayer2]. ## Installation -> _Note:_ SQLite.swift requires Swift 4.2 (and [Xcode][] 10.2). +> _Note:_ SQLite.swift requires Swift 5 (and [Xcode][] 10.2). ### Carthage @@ -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 @@ -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 ``` @@ -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") ] ``` @@ -285,7 +285,7 @@ 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 +[Swift4Badge]: https://img.shields.io/badge/swift-5-orange.svg?style=flat [Swift4Link]: https://developer.apple.com/swift/ [SQLiteMigrationManager.swift]: https://github.com/garriguv/SQLiteMigrationManager.swift diff --git a/SQLite.swift.podspec b/SQLite.swift.podspec index fcdf88c1..8b202745 100644 --- a/SQLite.swift.podspec +++ b/SQLite.swift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "SQLite.swift" - s.version = "0.11.6" + s.version = "0.12" s.summary = "A type-safe, Swift-language layer over SQLite3 for iOS and OS X." s.description = <<-DESC @@ -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| diff --git a/SQLite.xcodeproj/project.pbxproj b/SQLite.xcodeproj/project.pbxproj index 2eb11fd9..9d38dbc4 100644 --- a/SQLite.xcodeproj/project.pbxproj +++ b/SQLite.xcodeproj/project.pbxproj @@ -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 = ""; @@ -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"; diff --git a/Sources/SQLite/Info.plist b/Sources/SQLite/Info.plist index c3f9414b..3a5fc4f6 100644 --- a/Sources/SQLite/Info.plist +++ b/Sources/SQLite/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.11.6 + 0.12 CFBundleSignature ???? CFBundleVersion From c0b9eb0dfd9faa6176a1ddbec87d98c076a4f62c Mon Sep 17 00:00:00 2001 From: Shawn Burlew Date: Fri, 19 Apr 2019 11:29:40 -0600 Subject: [PATCH 2/9] Updated iOS simulator to iPhone XS --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5ea45d5d..50d07148 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ BUILD_TOOL = xcodebuild BUILD_SCHEME = SQLite Mac -IOS_SIMULATOR = iPhone X +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)" From aa9821896a17878c0bca089d2e61415a2a806282 Mon Sep 17 00:00:00 2001 From: Shawn Burlew Date: Sun, 21 Apr 2019 10:59:15 -0600 Subject: [PATCH 3/9] Documentation - Updated README to clarify Swift 5 vs Swift 4.2 supported versions - Updated minimum CocoaPods version - Updated SPM language versions --- Documentation/Index.md | 2 +- Package.swift | 2 +- README.md | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/Index.md b/Documentation/Index.md index cbb5d49a..94ad580b 100644 --- a/Documentation/Index.md +++ b/Documentation/Index.md @@ -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 diff --git a/Package.swift b/Package.swift index c008e482..2d4325f5 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let package = Package( .target(name: "SQLiteObjc"), .testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests") ], - swiftLanguageVersions: [4] + swiftLanguageVersions: [5] ) #if os(Linux) diff --git a/README.md b/README.md index ce45ef4e..6eaa69bb 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ and the [companion repository][SQLiteDataAccessLayer2]. ## Installation -> _Note:_ SQLite.swift requires Swift 5 (and [Xcode][] 10.2). +> _Note:_ Version 0.12 requires Swift 5 (and [Xcode][] 10.2). \nVersion 0.11.6 requires Swift 4.2 (and [Xcode][] 10.1). ### Carthage @@ -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 @@ -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-5-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 From 3afd756e04b90ca40f26c864f7168fd2335c591b Mon Sep 17 00:00:00 2001 From: Shawn Burlew Date: Sun, 21 Apr 2019 11:04:11 -0600 Subject: [PATCH 4/9] Fixed Swift badges and installation note formatting --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6eaa69bb..8efc53d8 100644 --- a/README.md +++ b/README.md @@ -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][]. @@ -112,7 +112,7 @@ and the [companion repository][SQLiteDataAccessLayer2]. ## Installation -> _Note:_ Version 0.12 requires Swift 5 (and [Xcode][] 10.2). \nVersion 0.11.6 requires Swift 4.2 (and [Xcode][] 10.1). +> _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 From 71dfa68f001c47046958001f4ec8b07ca3a7c7aa Mon Sep 17 00:00:00 2001 From: Shawn Burlew Date: Sun, 21 Apr 2019 11:05:38 -0600 Subject: [PATCH 5/9] Fixed typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8efc53d8..41c7ffdc 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ and the [companion repository][SQLiteDataAccessLayer2]. ## Installation -> _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). +> _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 From f9cb6bdab2aeae1dc119d0177c90ac93ae710fc1 Mon Sep 17 00:00:00 2001 From: Shawn Burlew Date: Mon, 22 Apr 2019 11:15:15 -0600 Subject: [PATCH 6/9] Documentation - Updated swift tools version in Package.swift - Updated "OS X" references to "macOS" --- CONTRIBUTING.md | 2 +- Documentation/Index.md | 2 +- Package.swift | 2 +- SQLite.swift.podspec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 60c18370..6c367b95 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/Documentation/Index.md b/Documentation/Index.md index 94ad580b..211c01a9 100644 --- a/Documentation/Index.md +++ b/Documentation/Index.md @@ -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( diff --git a/Package.swift b/Package.swift index 2d4325f5..6644cd73 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.0 +// swift-tools-version:5.0 import PackageDescription let package = Package( diff --git a/SQLite.swift.podspec b/SQLite.swift.podspec index 8b202745..9405c903 100644 --- a/SQLite.swift.podspec +++ b/SQLite.swift.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "SQLite.swift" s.version = "0.12" - s.summary = "A type-safe, Swift-language layer over SQLite3 for iOS and OS X." + 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 From e8ca9c0d138dca152df122053a8a2e181e6c3c7d Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Mon, 22 Apr 2019 12:29:15 -0600 Subject: [PATCH 7/9] Reverted swift tools version to 4.0 for backwards compatibility Co-Authored-By: sburlewapg <49003548+sburlewapg@users.noreply.github.com> --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 6644cd73..2d4325f5 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.0 +// swift-tools-version:4.0 import PackageDescription let package = Package( From 3e27caa3d898ce366fc29c8a8af9ccb105bd21d1 Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Mon, 22 Apr 2019 12:38:02 -0600 Subject: [PATCH 8/9] Added Swift 4 and 4.2 for CI compatibility Co-Authored-By: sburlewapg <49003548+sburlewapg@users.noreply.github.com> --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 2d4325f5..96266a2c 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let package = Package( .target(name: "SQLiteObjc"), .testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests") ], - swiftLanguageVersions: [5] + swiftLanguageVersions: [.version("5"), .v4_2, .v4] ) #if os(Linux) From a93b4956946f122a7f2202297f2f284da829e476 Mon Sep 17 00:00:00 2001 From: Shawn Burlew Date: Mon, 22 Apr 2019 13:34:16 -0600 Subject: [PATCH 9/9] Changed language versions array to contain Ints to try and get CI working --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 96266a2c..430ae6f2 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let package = Package( .target(name: "SQLiteObjc"), .testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests") ], - swiftLanguageVersions: [.version("5"), .v4_2, .v4] + swiftLanguageVersions: [4, 5] ) #if os(Linux)