Swift 5.2 is now the minimum supported version

.jazzy.yaml

@@ -1,6 +1,6 @@
 module: SwiftKueryPostgreSQL
-author: IBM
-github_url: https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL/
+author: IBM & Kitura project authors
+github_url: https://github.com/Kitura/Swift-Kuery-PostgreSQL/
 
 theme: fullwidth
 clean: true
@@ -10,5 +10,3 @@ readme: README.md
 
 skip_undocumented: false
 hide_documentation_coverage: false
-
-xcodebuild_arguments: [-project, SwiftKueryPostgreSQL.xcodeproj, -target, SwiftKueryPostgreSQL, LIBRARY_SEARCH_PATHS=.build/debug]

.travis.yml

@@ -13,64 +13,32 @@ branches:
 
 matrix:
   include:
-    # - os: linux
-    #   dist: xenial
-    #   sudo: required
-    #   services: docker
-    #   env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:4.0.3 SWIFT_SNAPSHOT=4.0.3 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
-    # - os: linux
-    #   dist: xenial
-    #   sudo: required
-    #   services: docker
-    #   env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:4.1.3 SWIFT_SNAPSHOT=4.1.3 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
-    # - os: linux
-    #   dist: xenial
-    #   sudo: required
-    #   services: docker
-    #   env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:4.2.4 SWIFT_SNAPSHOT=4.2.4 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.0.3 SWIFT_SNAPSHOT=5.0.3 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
+      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu16.04:5.1.5 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
     - os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.1 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
+      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:5.4 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.3.3 DOCKER_PRIVILEGED=true DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
-    - os: linux
-      dist: xenial
-      sudo: required
-      services: docker
-      env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
-    - os: osx
-      osx_image: xcode9.2
-      sudo: required
-      env: SWIFT_SNAPSHOT=4.0.3
+      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:latest USE_SWIFT_DEVELOPMENT_SNAPSHOT=1 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
     - os: osx
-      osx_image: xcode9.4
-      sudo: required
-      env: SWIFT_SNAPSHOT=4.1.2
-    - os: osx
-      osx_image: xcode10.1
-      sudo: required
-      env: SWIFT_SNAPSHOT=4.2.1
-    - os: osx
-      osx_image: xcode10.2
+      osx_image: xcode11
       sudo: required
-      env: SWIFT_SNAPSHOT=5.0.1 JAZZY_ELIGIBLE=true
+      env: SWIFT_SNAPSHOT=5.1.5 JAZZY_ELIGIBLE=true
     - os: osx
-      osx_image: xcode11
+      osx_image: xcode12.2
       sudo: required
     - os: osx
-      osx_image: xcode11
+      osx_image: xcode12.5
       sudo: required
-      env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
+      env: USE_SWIFT_DEVELOPMENT_SNAPSHOT=1
 
 services:
   - postgresql

Package.swift

@@ -28,7 +28,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/Kitura/Swift-Kuery.git", from: "3.0.200"),
+        .package(url: "https://github.com/Kitura/Swift-Kuery.git", from: "4.0.0"),
         ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

README.md

@@ -1,16 +1,16 @@
 <p align="center">
     <a href="http://kitura.io/">
-        <img src="https://raw.githubusercontent.com/IBM-Swift/Kitura/master/Sources/Kitura/resources/kitura-bird.svg?sanitize=true" height="100" alt="Kitura">
+        <img src="https://raw.githubusercontent.com/Kitura/Kitura/master/Sources/Kitura/resources/kitura-bird.svg?sanitize=true" height="100" alt="Kitura">
     </a>
 </p>
 
 
 <p align="center">
-    <a href="https://ibm-swift.github.io/Swift-Kuery-PostgreSQL/index.html">
+    <a href="https://kitura.github.io/Swift-Kuery-PostgreSQL/index.html">
     <img src="https://img.shields.io/badge/apidoc-SwiftKueryPostgreSQL-1FBCE4.svg?style=flat" alt="APIDoc">
     </a>
-    <a href="https://travis-ci.org/IBM-Swift/Swift-Kuery-PostgreSQL">
-    <img src="https://travis-ci.org/IBM-Swift/Swift-Kuery-PostgreSQL.svg?branch=master" alt="Build Status - Master">
+    <a href="https://travis-ci.org/Kitura/Swift-Kuery-PostgreSQL">
+    <img src="https://travis-ci.org/Kitura/Swift-Kuery-PostgreSQL.svg?branch=master" alt="Build Status - Master">
     </a>
     <img src="https://img.shields.io/badge/os-macOS-green.svg?style=flat" alt="macOS">
     <img src="https://img.shields.io/badge/os-linux-green.svg?style=flat" alt="Linux">
@@ -22,7 +22,7 @@
 
 # Swift-Kuery-PostgreSQL
 
-[PostgreSQL](https://www.postgresql.org/) plugin for the [Swift-Kuery](https://github.com/IBM-Swift/Swift-Kuery) framework. It enables you to use Swift-Kuery to manipulate data in a PostgreSQL database.
+[PostgreSQL](https://www.postgresql.org/) plugin for the [Swift-Kuery](https://github.com/Kitura/Swift-Kuery) framework. It enables you to use Swift-Kuery to manipulate data in a PostgreSQL database.
 
 ## PostgreSQL client installation
 To use Swift-Kuery-PostgreSQL you must have the appropriate PostgreSQL C-language client installed.
@@ -41,10 +41,10 @@ $ sudo apt-get install libpq-dev
 
 #### Add dependencies
 
-Add the `SwiftKueryPostgreSQL` package to the dependencies within your application’s `Package.swift` file. Substitute `"x.x.x"` with the latest `SwiftKueryPostgreSQL` [release](https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL/releases).
+Add the `SwiftKueryPostgreSQL` package to the dependencies within your application’s `Package.swift` file. Substitute `"x.x.x"` with the latest `SwiftKueryPostgreSQL` [release](https://github.com/Kitura/Swift-Kuery-PostgreSQL/releases).
 
 ```swift
-.package(url: "https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL.git", from: "x.x.x")
+.package(url: "https://github.com/Kitura/Swift-Kuery-PostgreSQL.git", from: "x.x.x")
 ```
 
 Add `SwiftKueryPostgreSQL` to application's dependencies:
@@ -198,8 +198,8 @@ import PackageDescription
 let package = Package(
     name: "swift-kuery-play",
     dependencies: [
-        .package(url: "https://github.com/IBM-Swift/Kitura.git", from: "x.x.x"),
-        .package(url: "https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL", from: "x.x.x")
+        .package(url: "https://github.com/Kitura/Kitura.git", from: "x.x.x"),
+        .package(url: "https://github.com/Kitura/Swift-Kuery-PostgreSQL", from: "x.x.x")
     ],
     targets: [
         .target(
@@ -381,11 +381,11 @@ grade: 99 course: How to build your first computer
 grade: 71 course: How to work at a rock quarry  
 ```
 ## API Documentation
-For more information visit our [API reference](https://ibm-swift.github.io/Swift-Kuery-PostgreSQL/index.html).
+For more information visit our [API reference](https://kitura.github.io/Swift-Kuery-PostgreSQL/index.html).
 
 ## Community
 
 We love to talk server-side Swift, and Kitura. Join our [Slack](http://swift-at-ibm-slack.mybluemix.net/) to meet the team!
 
 ## License
-This library is licensed under Apache 2.0. Full license text is available in [LICENSE](https://github.com/IBM-Swift/SwiftKueryPostgreSQL/blob/master/LICENSE.txt)
+This library is licensed under Apache 2.0. Full license text is available in [LICENSE](https://github.com/Kitura/SwiftKueryPostgreSQL/blob/master/LICENSE.txt)

build.sh

@@ -12,6 +12,6 @@ else
     psql --version || { apt-get update && apt-get install -y postgresql postgresql-contrib && service postgresql start && psql --version; }
 fi
 
-git clone https://github.com/IBM-Swift/Package-Builder.git
+git clone https://github.com/Kitura/Package-Builder.git
 ./Package-Builder/build-package.sh -projectDir $(pwd)