Update TravisCI removing Swift 4.x; update github org to Kitura (#134)

* Update TravisCI removing Swift 4.x; update github org to Kitura

* Update package dependencies

- Remove Swift 4.x package file

.jazzy.yaml

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

.travis.yml

@@ -16,58 +16,31 @@ matrix:
       dist: xenial
       sudo: required
       services: docker
-      env:  DOCKER_IMAGE=swift:4.0.3 SWIFT_SNAPSHOT=4.0.3
+      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu16.04:5.1.5
     - os: linux
-      dist: xenial
-      sudo: required
-      services: docker
-      env: DOCKER_IMAGE=swift:4.1.3 SWIFT_SNAPSHOT=4.1.3
-    - os: linux
-      dist: xenial
-      sudo: required
-      services: docker
-      env: DOCKER_IMAGE=swift:4.2.4 SWIFT_SNAPSHOT=4.2.4
-    - os: linux
-      dist: xenial
-      sudo: required
-      services: docker
-      env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3
-    - os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:5.1
+      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:5.4
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
-    - os: osx
-      osx_image: xcode9.2
-      sudo: required
-      env: SWIFT_SNAPSHOT=4.0.3
-    - os: osx
-      osx_image: xcode9.4
-      sudo: required
-      env: SWIFT_SNAPSHOT=4.1.2
+      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:latest USE_SWIFT_DEVELOPMENT_SNAPSHOT=1
     - os: osx
-      osx_image: xcode10.1
+      osx_image: xcode11
       sudo: required
-      env: SWIFT_SNAPSHOT=4.2.1
+      env: SWIFT_SNAPSHOT=5.1.5 JAZZY_ELIGIBLE=true
     - os: osx
-      osx_image: xcode10.2
+      osx_image: xcode12.2
       sudo: required
-      env: SWIFT_SNAPSHOT=5.0.1 JAZZY_ELIGIBLE=true
     - os: osx
-      osx_image: xcode11
-      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
 
 before_install:
-  - git clone https://github.com/IBM-Swift/Package-Builder.git
+  - git clone https://github.com/Kitura/Package-Builder.git
 
 script:
   - ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR

Package.swift

@@ -30,9 +30,9 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url:"https://github.com/Kitura/Swift-Kuery.git", from: "3.0.200"),
-        .package(url:"https://github.com/Kitura/KituraContracts.git", from: "1.2.200"),
-        .package(url:"https://github.com/Kitura/TypeDecoder.git", from: "1.3.200")
+        .package(url:"https://github.com/Kitura/Swift-Kuery.git", from: "4.0.0"),
+        .package(url:"https://github.com/Kitura/KituraContracts.git", from: "2.0.0"),
+        .package(url:"https://github.com/Kitura/TypeDecoder.git", from: "2.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,12 +1,12 @@
 <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-ORM/index.html">
+    <a href="https://kitura.github.io/Swift-Kuery-ORM/index.html">
     <img src="https://img.shields.io/badge/apidoc-SwiftKueryORM-1FBCE4.svg?style=flat" alt="APIDoc">
     </a>
     <a href="https://travis-ci.org/Kitura/Swift-Kuery-ORM">
@@ -424,7 +424,7 @@ struct Person: Model {
 * [MySQL](https://github.com/Kitura/SwiftKueryMySQL)
 
 ## API Documentation
-For more information visit our [API reference](https://ibm-swift.github.io/Swift-Kuery-ORM/index.html).
+For more information visit our [API reference](https://kitura.github.io/Swift-Kuery-ORM/index.html).
 
 ## Community
 

Sources/SwiftKueryORM/Database.swift

@@ -20,7 +20,7 @@ public typealias ConnectionPoolOptions = SwiftKuery.ConnectionPoolOptions
 
 /// Class defining the connection to the database.
 ///
-/// To setup the database, in this case using [PostgreSQL](https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL):
+/// To setup the database, in this case using [PostgreSQL](https://github.com/Kitura/Swift-Kuery-PostgreSQL):
 /// ```
 /// import SwiftKueryORM
 /// import SwiftKueryPostgreSQL

Sources/SwiftKueryORM/Model.swift

@@ -1141,7 +1141,7 @@ public extension Model {
 }
 
 /**
- Extension of the RequestError from [KituraContracts](https://github.com/IBM-Swift/KituraContracts.git)
+ Extension of the RequestError from [KituraContracts](https://github.com/Kitura/KituraContracts.git)
  */
 extension RequestError {
     init(_ base: RequestError, reason: String) {

Sources/SwiftKueryORM/TypeAliases.swift

@@ -22,10 +22,10 @@ import SwiftKuery
  The purpose is to expose these types at the top level without having to import a specific dependency.
  */
 
-/// Type Alias for RequestError from [KituraContracts](https://github.com/IBM-Swift/KituraContracts)
+/// Type Alias for RequestError from [KituraContracts](https://github.com/Kitura/KituraContracts)
 public typealias RequestError = KituraContracts.RequestError
 
-/// Type Alias for SQLDataType from [SwiftKuery](https://github.com/IBM-Swift/Swift-Kuery)
+/// Type Alias for SQLDataType from [SwiftKuery](https://github.com/Kitura/Swift-Kuery)
 public typealias SQLDataType = SwiftKuery.SQLDataType
 
 /// Public TypeAlias for QueryParams Type from KituraContracts

docs/Classes.html

@@ -14,6 +14,7 @@
   </head>
   <body>
 
+    <a name="//apple_ref/swift/Section/Classes" class="dashAnchor"></a>
 
     <a title="Classes  Reference"></a>
 
@@ -32,7 +33,7 @@
       </p>
 
         <p class="header-col header-col--secondary">
-          <a class="header-link" href="https://github.com/IBM-Swift/Swift-Kuery-ORM">
+          <a class="header-link" href="https://github.com/Kitura/Swift-Kuery-ORM">
             <img class="header-icon" src="img/gh.png"/>
             View on GitHub
           </a>
@@ -66,6 +67,14 @@
               </li>
             </ul>
           </li>
+          <li class="nav-group-name">
+            <a class="nav-group-name-link" href="Enums.html">Enumerations</a>
+            <ul class="nav-group-tasks">
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Enums/DateEncodingFormat.html">DateEncodingFormat</a>
+              </li>
+            </ul>
+          </li>
           <li class="nav-group-name">
             <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
             <ul class="nav-group-tasks">
@@ -128,7 +137,7 @@
       <article class="main-content">
 
         <section class="section">
-          <div class="section-content">
+          <div class="section-content top-matter">
             <h1>Classes</h1>
             <p>The following classes are available globally.</p>
 
@@ -154,7 +163,7 @@ <h1>Classes</h1>
                       <div class="abstract">
                         <p>Class defining the connection to the database.</p>
 
-<p>To setup the database, in this case using <a href="https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL">PostgreSQL</a>:</p>
+<p>To setup the database, in this case using <a href="https://github.com/Kitura/Swift-Kuery-PostgreSQL">PostgreSQL</a>:</p>
 <pre class="highlight swift"><code><span class="kd">import</span> <span class="kt">SwiftKueryORM</span>
 <span class="kd">import</span> <span class="kt">SwiftKueryPostgreSQL</span>
 <span class="k">let</span> <span class="nv">pool</span> <span class="o">=</span> <span class="kt">PostgreSQLConnection</span><span class="o">.</span><span class="nf">createPool</span><span class="p">(</span><span class="nv">host</span><span class="p">:</span> <span class="s">"localhost"</span><span class="p">,</span> <span class="nv">port</span><span class="p">:</span> <span class="mi">5432</span><span class="p">,</span>
@@ -179,10 +188,6 @@ <h4>Declaration</h4>
                     </section>
                   </div>
                 </li>
-              </ul>
-            </div>
-            <div class="task-group">
-              <ul class="item-container">
                 <li class="item">
                   <div>
                     <code>
@@ -211,10 +216,6 @@ <h4>Declaration</h4>
                     </section>
                   </div>
                 </li>
-              </ul>
-            </div>
-            <div class="task-group">
-              <ul class="item-container">
                 <li class="item">
                   <div>
                     <code>
@@ -243,10 +244,6 @@ <h4>Declaration</h4>
                     </section>
                   </div>
                 </li>
-              </ul>
-            </div>
-            <div class="task-group">
-              <ul class="item-container">
                 <li class="item">
                   <div>
                     <code>
@@ -282,8 +279,8 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2019 <a class="link" href="" target="_blank" rel="external">IBM</a>. All rights reserved. (Last updated: 2019-04-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2021 <a class="link" href="" target="_blank" rel="external">IBM &amp; Kitura Project Authors</a>. All rights reserved. (Last updated: 2021-08-19)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.7</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

docs/Classes/Database.html

@@ -33,7 +33,7 @@
       </p>
 
         <p class="header-col header-col--secondary">
-          <a class="header-link" href="https://github.com/IBM-Swift/Swift-Kuery-ORM">
+          <a class="header-link" href="https://github.com/Kitura/Swift-Kuery-ORM">
             <img class="header-icon" src="../img/gh.png"/>
             View on GitHub
           </a>
@@ -67,6 +67,14 @@
               </li>
             </ul>
           </li>
+          <li class="nav-group-name">
+            <a class="nav-group-name-link" href="../Enums.html">Enumerations</a>
+            <ul class="nav-group-tasks">
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Enums/DateEncodingFormat.html">DateEncodingFormat</a>
+              </li>
+            </ul>
+          </li>
           <li class="nav-group-name">
             <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
             <ul class="nav-group-tasks">
@@ -129,17 +137,18 @@
       <article class="main-content">
 
         <section class="section">
-          <div class="section-content">
+          <div class="section-content top-matter">
             <h1>Database</h1>
               <div class="declaration">
                 <div class="language">
+
                   <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">Database</span></code></pre>
 
                 </div>
               </div>
             <p>Class defining the connection to the database.</p>
 
-<p>To setup the database, in this case using <a href="https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL">PostgreSQL</a>:</p>
+<p>To setup the database, in this case using <a href="https://github.com/Kitura/Swift-Kuery-PostgreSQL">PostgreSQL</a>:</p>
 <pre class="highlight swift"><code><span class="kd">import</span> <span class="kt">SwiftKueryORM</span>
 <span class="kd">import</span> <span class="kt">SwiftKueryPostgreSQL</span>
 <span class="k">let</span> <span class="nv">pool</span> <span class="o">=</span> <span class="kt">PostgreSQLConnection</span><span class="o">.</span><span class="nf">createPool</span><span class="p">(</span><span class="nv">host</span><span class="p">:</span> <span class="s">"localhost"</span><span class="p">,</span> <span class="nv">port</span><span class="p">:</span> <span class="mi">5432</span><span class="p">,</span>
@@ -232,7 +241,7 @@ <h4>Declaration</h4>
                         <h4>Declaration</h4>
                         <div class="language">
                           <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">static</span> <span class="k">var</span> <span class="nv">tableInfo</span> <span class="o">=</span> <span class="kt"><a href="../Classes.html#/s:13SwiftKueryORM9TableInfoC">TableInfo</a></span><span class="p">()</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">static</span> <span class="k">var</span> <span class="nv">tableInfo</span><span class="p">:</span> <span class="kt"><a href="../Classes.html#/s:13SwiftKueryORM9TableInfoC">TableInfo</a></span></code></pre>
 
                         </div>
                       </div>
@@ -242,9 +251,9 @@ <h4>Declaration</h4>
                 <li class="item">
                   <div>
                     <code>
-                    <a name="/s:13SwiftKueryORM8DatabaseCAC0aB010Connection_p6single_tcfc"></a>
+                    <a name="/s:13SwiftKueryORM8DatabaseC6singleAC0aB010Connection_p_tcfc"></a>
                     <a name="//apple_ref/swift/Method/init(single:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:13SwiftKueryORM8DatabaseCAC0aB010Connection_p6single_tcfc">init(single:)</a>
+                    <a class="token" href="#/s:13SwiftKueryORM8DatabaseC6singleAC0aB010Connection_p_tcfc">init(single:<wbr>)</a>
                     </code>
                   </div>
                   <div class="height-container">
@@ -283,9 +292,9 @@ <h4>Declaration</h4>
                 <li class="item">
                   <div>
                     <code>
-                    <a name="/s:13SwiftKueryORM8DatabaseCAC0aB014ConnectionPoolCcfc"></a>
+                    <a name="/s:13SwiftKueryORM8DatabaseCyAC0aB014ConnectionPoolCcfc"></a>
                     <a name="//apple_ref/swift/Method/init(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:13SwiftKueryORM8DatabaseCAC0aB014ConnectionPoolCcfc">init(_:)</a>
+                    <a class="token" href="#/s:13SwiftKueryORM8DatabaseCyAC0aB014ConnectionPoolCcfc">init(_:<wbr>)</a>
                     </code>
                   </div>
                   <div class="height-container">
@@ -316,9 +325,9 @@ <h4>Declaration</h4>
                 <li class="item">
                   <div>
                     <code>
-                    <a name="/s:13SwiftKueryORM8DatabaseCACyy0aB010Connection_pSg_AD10QueryErrorOSgtcc9generator_tcfc"></a>
+                    <a name="/s:13SwiftKueryORM8DatabaseC9generatorACyy0aB010Connection_pSg_AE10QueryErrorOSgtcc_tcfc"></a>
                     <a name="//apple_ref/swift/Method/init(generator:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:13SwiftKueryORM8DatabaseCACyy0aB010Connection_pSg_AD10QueryErrorOSgtcc9generator_tcfc">init(generator:)</a>
+                    <a class="token" href="#/s:13SwiftKueryORM8DatabaseC9generatorACyy0aB010Connection_pSg_AE10QueryErrorOSgtcc_tcfc">init(generator:<wbr>)</a>
                     </code>
                   </div>
                   <div class="height-container">
@@ -366,8 +375,8 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2019 <a class="link" href="" target="_blank" rel="external">IBM</a>. All rights reserved. (Last updated: 2019-04-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2021 <a class="link" href="" target="_blank" rel="external">IBM &amp; Kitura Project Authors</a>. All rights reserved. (Last updated: 2021-08-19)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.7</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>