From 96f69e53f503830e55280c5c4fbaffc0b50eadd5 Mon Sep 17 00:00:00 2001
From: Tanner <tannernelson@gmail.com>
Date: Fri, 28 Feb 2020 15:31:34 -0500
Subject: [PATCH] Release Candidate 1 (#15)

* rc.1

* update tests

* readme updates

* updates
---
 .github/workflows/test.yml | 48 ++++++++++++++++++++++++++++----------
 Package.swift              | 12 ++++++----
 README.md                  | 18 ++++++++------
 3 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2f8db00..64d785a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,29 +2,53 @@ name: test
 on:
 - pull_request
 jobs:
-  bionic:
+  sqlite-nio_bionic:
     container: 
-      image: vapor/swift:5.1-bionic
+      image: vapor/swift:5.2-bionic
     runs-on: ubuntu-latest
     steps:
     - run: apt update -y; apt install -y libsqlite3-dev
     - uses: actions/checkout@v1
     - run: swift test --enable-test-discovery --sanitize=thread
-  xenial:
+  sqlite-nio_xenial:
     container: 
-      image: vapor/swift:5.1-xenial
+      image: vapor/swift:5.2-xenial
     runs-on: ubuntu-latest
     steps:
     - run: apt update -y; apt install -y libsqlite3-dev
     - uses: actions/checkout@v1
     - run: swift test --enable-test-discovery --sanitize=thread
-  mojave:
-    runs-on: macOS-10.14
+  # sqlite-nio_catalina:
+  #   runs-on: macOS-10.15
+  #   steps:
+  #   - uses: actions/checkout@v1
+  #   - run: swift test --sanitize=thread
+  # sqlite-nio_ios13:
+  #   runs-on: macOS-10.15
+  #   steps:
+  #   - uses: actions/checkout@v1
+  #   - run: xcodebuild test -destination 'name=iPhone 11' -scheme 'sqlite-nio'
+  sqlite-kit:
+    container: 
+      image: vapor/swift:5.2
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - run: swift test --sanitize=thread
-  ios:
-    runs-on: macOS-10.14
+    - run: apt update -y; apt install -y libsqlite3-dev
+    - run: git clone -b master https://github.com/vapor/sqlite-kit.git
+      working-directory: ./
+    - run: swift package edit sqlite-nio --revision ${{ github.sha }}
+      working-directory: ./sqlite-kit
+    - run: swift test --enable-test-discovery --sanitize=thread
+      working-directory: ./sqlite-kit
+  fluent-sqlite-driver:
+    container: 
+      image: vapor/swift:5.2
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - run: xcodebuild test -destination 'name=iPhone 11' -scheme 'sqlite-nio'
+    - run: apt update -y; apt install -y libsqlite3-dev
+    - run: git clone -b master https://github.com/vapor/fluent-sqlite-driver.git
+      working-directory: ./
+    - run: swift package edit sqlite-nio --revision ${{ github.sha }}
+      working-directory: ./fluent-sqlite-driver
+    - run: swift test --enable-test-discovery --sanitize=thread
+      working-directory: ./fluent-sqlite-driver
diff --git a/Package.swift b/Package.swift
index 31de183..7b0c10b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,11 +1,11 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.2
 import PackageDescription
 
 let package = Package(
     name: "sqlite-nio",
     platforms: [
-       .macOS(.v10_14),
-       .iOS(.v11)
+       .macOS(.v10_15),
+       .iOS(.v13)
     ],
     products: [
         .library(name: "SQLiteNIO", targets: ["SQLiteNIO"]),
@@ -22,7 +22,11 @@ let package = Package(
                 .brew(["sqlite3"])
             ]
         ),
-        .target(name: "SQLiteNIO", dependencies: ["CSQLite", "Logging", "NIO"]),
+        .target(name: "SQLiteNIO", dependencies: [
+            .target(name: "CSQLite"),
+            .product(name: "Logging", package: "swift-log"),
+            .product(name: "NIO", package: "swift-nio"),
+        ]),
         .testTarget(name: "SQLiteNIOTests", dependencies: ["SQLiteNIO"]),
     ]
 )
diff --git a/README.md b/README.md
index 21d955f..17a2af0 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,13 @@
 <p align="center">
-    <img src="https://user-images.githubusercontent.com/1342803/58997662-a5209e80-87cb-11e9-859d-e04ec148fd05.png" alt="SQLiteNIO">
+    <img 
+        src="https://user-images.githubusercontent.com/1342803/58997662-a5209e80-87cb-11e9-859d-e04ec148fd05.png" 
+        height="64" 
+        alt="SQLiteNIO"
+    >
     <br>
     <br>
-    <a href="https://api.vapor.codes/sqlite-nio/master/SQLiteNIO/index.html">
-        <img src="http://img.shields.io/badge/api-docs-2196f3.svg" alt="Documentation">
+    <a href="https://docs.vapor.codes/4.0/">
+        <img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
     </a>
     <a href="https://discord.gg/vapor">
         <img src="https://img.shields.io/discord/431917998102675485.svg" alt="Team Chat">
@@ -11,10 +15,10 @@
     <a href="LICENSE">
         <img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT License">
     </a>
-    <a href="https://circleci.com/gh/vapor/sqlite-nio">
-        <img src="https://circleci.com/gh/vapor/sqlite-nio.svg?style=shield" alt="Continuous Integration">
+    <a href="https://github.com/vapor/sqlite-nio/actions">
+        <img src="https://github.com/vapor/sqlite-nio/workflows/test/badge.svg" alt="Continuous Integration">
     </a>
     <a href="https://swift.org">
-        <img src="http://img.shields.io/badge/swift-5-brightgreen.svg" alt="Swift 5">
+        <img src="http://img.shields.io/badge/swift-5.2-brightgreen.svg" alt="Swift 5.2">
     </a>
-</p>
\ No newline at end of file
+</p>