Skip to content

Commit d7ddad2

Browse files
dannys42dannys42
authored
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
1 parent 4094558 commit d7ddad2

49 files changed

Lines changed: 2201 additions & 657 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.jazzy.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module: SwiftKueryORM
2-
author: IBM
3-
github_url: https://github.com/IBM-Swift/Swift-Kuery-ORM
2+
author: IBM & Kitura Project Authors
3+
github_url: https://github.com/Kitura/Swift-Kuery-ORM
44

55
theme: fullwidth
66
clean: true
@@ -10,5 +10,3 @@ readme: README.md
1010

1111
skip_undocumented: false
1212
hide_documentation_coverage: false
13-
14-
xcodebuild_arguments: [-project, SwiftKueryORM.xcodeproj, -target, SwiftKueryORM, LIBRARY_SEARCH_PATHS=.build/debug]

‎.travis.yml‎

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -16,58 +16,31 @@ matrix:
1616
dist: xenial
1717
sudo: required
1818
services: docker
19-
env: DOCKER_IMAGE=swift:4.0.3 SWIFT_SNAPSHOT=4.0.3
19+
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu16.04:5.1.5
2020
- os: linux
21-
dist: xenial
22-
sudo: required
23-
services: docker
24-
env: DOCKER_IMAGE=swift:4.1.3 SWIFT_SNAPSHOT=4.1.3
25-
- os: linux
26-
dist: xenial
27-
sudo: required
28-
services: docker
29-
env: DOCKER_IMAGE=swift:4.2.4 SWIFT_SNAPSHOT=4.2.4
30-
- os: linux
31-
dist: xenial
32-
sudo: required
33-
services: docker
34-
env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3
35-
- os: linux
36-
dist: xenial
21+
dist: bionic
3722
sudo: required
3823
services: docker
39-
env: DOCKER_IMAGE=swift:5.1
24+
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:5.4
4025
- os: linux
4126
dist: xenial
4227
sudo: required
4328
services: docker
44-
env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
45-
- os: osx
46-
osx_image: xcode9.2
47-
sudo: required
48-
env: SWIFT_SNAPSHOT=4.0.3
49-
- os: osx
50-
osx_image: xcode9.4
51-
sudo: required
52-
env: SWIFT_SNAPSHOT=4.1.2
29+
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:latest USE_SWIFT_DEVELOPMENT_SNAPSHOT=1
5330
- os: osx
54-
osx_image: xcode10.1
31+
osx_image: xcode11
5532
sudo: required
56-
env: SWIFT_SNAPSHOT=4.2.1
33+
env: SWIFT_SNAPSHOT=5.1.5 JAZZY_ELIGIBLE=true
5734
- os: osx
58-
osx_image: xcode10.2
35+
osx_image: xcode12.2
5936
sudo: required
60-
env: SWIFT_SNAPSHOT=5.0.1 JAZZY_ELIGIBLE=true
6137
- os: osx
62-
osx_image: xcode11
63-
sudo: required
64-
- os: osx
65-
osx_image: xcode11
38+
osx_image: xcode12.5
6639
sudo: required
67-
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
40+
env: USE_SWIFT_DEVELOPMENT_SNAPSHOT=1
6841

6942
before_install:
70-
- git clone https://github.com/IBM-Swift/Package-Builder.git
43+
- git clone https://github.com/Kitura/Package-Builder.git
7144

7245
script:
7346
- ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR

‎Package.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ let package = Package(
3030
],
3131
dependencies: [
3232
// Dependencies declare other packages that this package depends on.
33-
.package(url:"https://github.com/Kitura/Swift-Kuery.git", from: "3.0.200"),
34-
.package(url:"https://github.com/Kitura/KituraContracts.git", from: "1.2.200"),
35-
.package(url:"https://github.com/Kitura/TypeDecoder.git", from: "1.3.200")
33+
.package(url:"https://github.com/Kitura/Swift-Kuery.git", from: "4.0.0"),
34+
.package(url:"https://github.com/Kitura/KituraContracts.git", from: "2.0.0"),
35+
.package(url:"https://github.com/Kitura/TypeDecoder.git", from: "2.0.0")
3636
],
3737
targets: [
3838
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

‎[email protected]‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<p align="center">
22
<a href="http://kitura.io/">
3-
<img src="https://raw.githubusercontent.com/IBM-Swift/Kitura/master/Sources/Kitura/resources/kitura-bird.svg?sanitize=true" height="100" alt="Kitura">
3+
<img src="https://raw.githubusercontent.com/Kitura/Kitura/master/Sources/Kitura/resources/kitura-bird.svg?sanitize=true" height="100" alt="Kitura">
44
</a>
55
</p>
66

77

88
<p align="center">
9-
<a href="https://ibm-swift.github.io/Swift-Kuery-ORM/index.html">
9+
<a href="https://kitura.github.io/Swift-Kuery-ORM/index.html">
1010
<img src="https://img.shields.io/badge/apidoc-SwiftKueryORM-1FBCE4.svg?style=flat" alt="APIDoc">
1111
</a>
1212
<a href="https://travis-ci.org/Kitura/Swift-Kuery-ORM">
@@ -424,7 +424,7 @@ struct Person: Model {
424424
* [MySQL](https://github.com/Kitura/SwiftKueryMySQL)
425425

426426
## API Documentation
427-
For more information visit our [API reference](https://ibm-swift.github.io/Swift-Kuery-ORM/index.html).
427+
For more information visit our [API reference](https://kitura.github.io/Swift-Kuery-ORM/index.html).
428428

429429
## Community
430430

‎Sources/SwiftKueryORM/Database.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public typealias ConnectionPoolOptions = SwiftKuery.ConnectionPoolOptions
2020

2121
/// Class defining the connection to the database.
2222
///
23-
/// To setup the database, in this case using [PostgreSQL](https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL):
23+
/// To setup the database, in this case using [PostgreSQL](https://github.com/Kitura/Swift-Kuery-PostgreSQL):
2424
/// ```
2525
/// import SwiftKueryORM
2626
/// import SwiftKueryPostgreSQL

‎Sources/SwiftKueryORM/Model.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,7 @@ public extension Model {
11411141
}
11421142

11431143
/**
1144-
Extension of the RequestError from [KituraContracts](https://github.com/IBM-Swift/KituraContracts.git)
1144+
Extension of the RequestError from [KituraContracts](https://github.com/Kitura/KituraContracts.git)
11451145
*/
11461146
extension RequestError {
11471147
init(_ base: RequestError, reason: String) {

‎Sources/SwiftKueryORM/TypeAliases.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import SwiftKuery
2222
The purpose is to expose these types at the top level without having to import a specific dependency.
2323
*/
2424

25-
/// Type Alias for RequestError from [KituraContracts](https://github.com/IBM-Swift/KituraContracts)
25+
/// Type Alias for RequestError from [KituraContracts](https://github.com/Kitura/KituraContracts)
2626
public typealias RequestError = KituraContracts.RequestError
2727

28-
/// Type Alias for SQLDataType from [SwiftKuery](https://github.com/IBM-Swift/Swift-Kuery)
28+
/// Type Alias for SQLDataType from [SwiftKuery](https://github.com/Kitura/Swift-Kuery)
2929
public typealias SQLDataType = SwiftKuery.SQLDataType
3030

3131
/// Public TypeAlias for QueryParams Type from KituraContracts

‎docs/Classes.html‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</head>
1515
<body>
1616

17+
<a name="//apple_ref/swift/Section/Classes" class="dashAnchor"></a>
1718

1819
<a title="Classes Reference"></a>
1920

@@ -32,7 +33,7 @@
3233
</p>
3334

3435
<p class="header-col header-col--secondary">
35-
<a class="header-link" href="https://github.com/IBM-Swift/Swift-Kuery-ORM">
36+
<a class="header-link" href="https://github.com/Kitura/Swift-Kuery-ORM">
3637
<img class="header-icon" src="img/gh.png"/>
3738
View on GitHub
3839
</a>
@@ -66,6 +67,14 @@
6667
</li>
6768
</ul>
6869
</li>
70+
<li class="nav-group-name">
71+
<a class="nav-group-name-link" href="Enums.html">Enumerations</a>
72+
<ul class="nav-group-tasks">
73+
<li class="nav-group-task">
74+
<a class="nav-group-task-link" href="Enums/DateEncodingFormat.html">DateEncodingFormat</a>
75+
</li>
76+
</ul>
77+
</li>
6978
<li class="nav-group-name">
7079
<a class="nav-group-name-link" href="Extensions.html">Extensions</a>
7180
<ul class="nav-group-tasks">
@@ -128,7 +137,7 @@
128137
<article class="main-content">
129138

130139
<section class="section">
131-
<div class="section-content">
140+
<div class="section-content top-matter">
132141
<h1>Classes</h1>
133142
<p>The following classes are available globally.</p>
134143

@@ -154,7 +163,7 @@ <h1>Classes</h1>
154163
<div class="abstract">
155164
<p>Class defining the connection to the database.</p>
156165

157-
<p>To setup the database, in this case using <a href="https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL">PostgreSQL</a>:</p>
166+
<p>To setup the database, in this case using <a href="https://github.com/Kitura/Swift-Kuery-PostgreSQL">PostgreSQL</a>:</p>
158167
<pre class="highlight swift"><code><span class="kd">import</span> <span class="kt">SwiftKueryORM</span>
159168
<span class="kd">import</span> <span class="kt">SwiftKueryPostgreSQL</span>
160169
<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>
179188
</section>
180189
</div>
181190
</li>
182-
</ul>
183-
</div>
184-
<div class="task-group">
185-
<ul class="item-container">
186191
<li class="item">
187192
<div>
188193
<code>
@@ -211,10 +216,6 @@ <h4>Declaration</h4>
211216
</section>
212217
</div>
213218
</li>
214-
</ul>
215-
</div>
216-
<div class="task-group">
217-
<ul class="item-container">
218219
<li class="item">
219220
<div>
220221
<code>
@@ -243,10 +244,6 @@ <h4>Declaration</h4>
243244
</section>
244245
</div>
245246
</li>
246-
</ul>
247-
</div>
248-
<div class="task-group">
249-
<ul class="item-container">
250247
<li class="item">
251248
<div>
252249
<code>
@@ -282,8 +279,8 @@ <h4>Declaration</h4>
282279
</article>
283280
</div>
284281
<section class="footer">
285-
<p>&copy; 2019 <a class="link" href="" target="_blank" rel="external">IBM</a>. All rights reserved. (Last updated: 2019-04-01)</p>
286-
<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>
282+
<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>
283+
<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>
287284
</section>
288285
</body>
289286
</div>

‎docs/Classes/Database.html‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</p>
3434

3535
<p class="header-col header-col--secondary">
36-
<a class="header-link" href="https://github.com/IBM-Swift/Swift-Kuery-ORM">
36+
<a class="header-link" href="https://github.com/Kitura/Swift-Kuery-ORM">
3737
<img class="header-icon" src="../img/gh.png"/>
3838
View on GitHub
3939
</a>
@@ -67,6 +67,14 @@
6767
</li>
6868
</ul>
6969
</li>
70+
<li class="nav-group-name">
71+
<a class="nav-group-name-link" href="../Enums.html">Enumerations</a>
72+
<ul class="nav-group-tasks">
73+
<li class="nav-group-task">
74+
<a class="nav-group-task-link" href="../Enums/DateEncodingFormat.html">DateEncodingFormat</a>
75+
</li>
76+
</ul>
77+
</li>
7078
<li class="nav-group-name">
7179
<a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
7280
<ul class="nav-group-tasks">
@@ -129,17 +137,18 @@
129137
<article class="main-content">
130138

131139
<section class="section">
132-
<div class="section-content">
140+
<div class="section-content top-matter">
133141
<h1>Database</h1>
134142
<div class="declaration">
135143
<div class="language">
144+
136145
<pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">Database</span></code></pre>
137146

138147
</div>
139148
</div>
140149
<p>Class defining the connection to the database.</p>
141150

142-
<p>To setup the database, in this case using <a href="https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL">PostgreSQL</a>:</p>
151+
<p>To setup the database, in this case using <a href="https://github.com/Kitura/Swift-Kuery-PostgreSQL">PostgreSQL</a>:</p>
143152
<pre class="highlight swift"><code><span class="kd">import</span> <span class="kt">SwiftKueryORM</span>
144153
<span class="kd">import</span> <span class="kt">SwiftKueryPostgreSQL</span>
145154
<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>
232241
<h4>Declaration</h4>
233242
<div class="language">
234243
<p class="aside-title">Swift</p>
235-
<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>
244+
<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>
236245

237246
</div>
238247
</div>
@@ -242,9 +251,9 @@ <h4>Declaration</h4>
242251
<li class="item">
243252
<div>
244253
<code>
245-
<a name="/s:13SwiftKueryORM8DatabaseCAC0aB010Connection_p6single_tcfc"></a>
254+
<a name="/s:13SwiftKueryORM8DatabaseC6singleAC0aB010Connection_p_tcfc"></a>
246255
<a name="//apple_ref/swift/Method/init(single:)" class="dashAnchor"></a>
247-
<a class="token" href="#/s:13SwiftKueryORM8DatabaseCAC0aB010Connection_p6single_tcfc">init(single:)</a>
256+
<a class="token" href="#/s:13SwiftKueryORM8DatabaseC6singleAC0aB010Connection_p_tcfc">init(single:<wbr>)</a>
248257
</code>
249258
</div>
250259
<div class="height-container">
@@ -283,9 +292,9 @@ <h4>Declaration</h4>
283292
<li class="item">
284293
<div>
285294
<code>
286-
<a name="/s:13SwiftKueryORM8DatabaseCAC0aB014ConnectionPoolCcfc"></a>
295+
<a name="/s:13SwiftKueryORM8DatabaseCyAC0aB014ConnectionPoolCcfc"></a>
287296
<a name="//apple_ref/swift/Method/init(_:)" class="dashAnchor"></a>
288-
<a class="token" href="#/s:13SwiftKueryORM8DatabaseCAC0aB014ConnectionPoolCcfc">init(_:)</a>
297+
<a class="token" href="#/s:13SwiftKueryORM8DatabaseCyAC0aB014ConnectionPoolCcfc">init(_:<wbr>)</a>
289298
</code>
290299
</div>
291300
<div class="height-container">
@@ -316,9 +325,9 @@ <h4>Declaration</h4>
316325
<li class="item">
317326
<div>
318327
<code>
319-
<a name="/s:13SwiftKueryORM8DatabaseCACyy0aB010Connection_pSg_AD10QueryErrorOSgtcc9generator_tcfc"></a>
328+
<a name="/s:13SwiftKueryORM8DatabaseC9generatorACyy0aB010Connection_pSg_AE10QueryErrorOSgtcc_tcfc"></a>
320329
<a name="//apple_ref/swift/Method/init(generator:)" class="dashAnchor"></a>
321-
<a class="token" href="#/s:13SwiftKueryORM8DatabaseCACyy0aB010Connection_pSg_AD10QueryErrorOSgtcc9generator_tcfc">init(generator:)</a>
330+
<a class="token" href="#/s:13SwiftKueryORM8DatabaseC9generatorACyy0aB010Connection_pSg_AE10QueryErrorOSgtcc_tcfc">init(generator:<wbr>)</a>
322331
</code>
323332
</div>
324333
<div class="height-container">
@@ -366,8 +375,8 @@ <h4>Declaration</h4>
366375
</article>
367376
</div>
368377
<section class="footer">
369-
<p>&copy; 2019 <a class="link" href="" target="_blank" rel="external">IBM</a>. All rights reserved. (Last updated: 2019-04-01)</p>
370-
<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>
378+
<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>
379+
<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>
371380
</section>
372381
</body>
373382
</div>

0 commit comments

Comments
 (0)