Skip to content

Commit 082a207

Browse files
dannys42dannys42
authored
Update dependency versions and CI for consistency with other repos and Swift 4.x removal (#252)
* Update dependency versions and CI for consistency with other repos and Swift 4.x removal * Travis: Remove SWIFT_SNAPSHOT from macOS build
1 parent b1c10f7 commit 082a207

91 files changed

Lines changed: 1980 additions & 955 deletions

File tree

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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ readme: README.md
1010

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

‎.travis.yml‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,30 @@ matrix:
2020
dist: xenial
2121
sudo: required
2222
services: docker
23-
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.1 DOCKER_PRIVILEGED=true SWIFT_TEST_ARGS="--parallel --sanitize=thread" CUSTOM_TEST_SCRIPT=.kitura-test.sh
23+
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu16.04:5.1.5 DOCKER_PRIVILEGED=true SWIFT_TEST_ARGS="--parallel --sanitize=thread" CUSTOM_TEST_SCRIPT=.kitura-test.sh
2424
- os: linux
2525
dist: xenial
2626
sudo: required
2727
services: docker
28-
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.3.3 DOCKER_PRIVILEGED=true SWIFT_TEST_ARGS="--parallel --sanitize=thread" CUSTOM_TEST_SCRIPT=.kitura-test.sh
28+
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:5.4 DOCKER_PRIVILEGED=true SWIFT_TEST_ARGS="--parallel --sanitize=thread" CUSTOM_TEST_SCRIPT=.kitura-test.sh
2929
- os: linux
3030
dist: xenial
3131
sudo: required
3232
services: docker
33-
env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT DOCKER_PRIVILEGED=true SWIFT_TEST_ARGS="--parallel --sanitize=thread"
33+
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:latest USE_SWIFT_DEVELOPMENT_SNAPSHOT=1 DOCKER_PRIVILEGED=true SWIFT_TEST_ARGS="--parallel --sanitize=thread"
3434

35-
# Removing support due to issue compiling swift-nio-ssl
36-
# - os: osx
37-
# osx_image: xcode10.3
38-
# sudo: required
39-
# env: SWIFT_SNAPSHOT=5.0.1 JAZZY_ELIGIBLE=true SWIFT_TEST_ARGS="--parallel"
4035
- os: osx
4136
osx_image: xcode11.3
4237
sudo: required
43-
env: SWIFT_SNAPSHOT=5.1.3 JAZZY_ELIGIBLE=true SWIFT_TEST_ARGS="--parallel --sanitize=thread"
38+
env: JAZZY_ELIGIBLE=true SWIFT_TEST_ARGS="--parallel --sanitize=thread"
4439
- os: osx
4540
osx_image: xcode12.2
4641
sudo: required
47-
env: SWIFT_SNAPSHOT=5.3.1 SWIFT_TEST_ARGS="--parallel --sanitize=thread"
42+
env: SWIFT_TEST_ARGS="--parallel --sanitize=thread"
4843
- os: osx
49-
osx_image: xcode11.6
44+
osx_image: xcode12.5
5045
sudo: required
51-
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT SWIFT_TEST_ARGS="--parallel --sanitize=thread" CUSTOM_TEST_SCRIPT=.kitura-test.sh
46+
env: USE_SWIFT_DEVELOPMENT_SNAPSHOT=1 SWIFT_TEST_ARGS="--parallel --sanitize=thread" CUSTOM_TEST_SCRIPT=.kitura-test.sh
5247

5348

5449
before_install:

‎Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ let package = Package(
3030
.package(url: "https://github.com/apple/swift-nio.git", from: "2.8.0"),
3131
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.0.0"),
3232
.package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.0.0"),
33-
.package(url: "https://github.com/Kitura/BlueSSLService.git", from: "1.0.200"),
34-
.package(url: "https://github.com/Kitura/LoggerAPI.git", from: "1.9.200")
33+
.package(url: "https://github.com/Kitura/BlueSSLService.git", from: "2.0.0"),
34+
.package(url: "https://github.com/Kitura/LoggerAPI.git", from: "2.0.0")
3535
],
3636
targets: [
3737
.target(

‎docs/Classes.html‎

Lines changed: 53 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<a class="header-link" href="index.html">
2424
KituraNet Docs
2525
</a>
26-
(95% documented)
26+
(94% documented)
2727
</p>
2828

2929
<p class="header-col--secondary">
@@ -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/Kitura-NIO/">
36+
<a class="header-link" href="https://github.com/Kitura/Kitura-NIO/">
3737
<img class="header-icon" src="img/gh.png"/>
3838
View on GitHub
3939
</a>
@@ -152,6 +152,9 @@
152152
<li class="nav-group-task">
153153
<a class="nav-group-task-link" href="Structs/ConnectionUpgrader.html">ConnectionUpgrader</a>
154154
</li>
155+
<li class="nav-group-task">
156+
<a class="nav-group-task-link" href="Structs/HTTPServerError.html">HTTPServerError</a>
157+
</li>
155158
<li class="nav-group-task">
156159
<a class="nav-group-task-link" href="Structs/Monitor.html">Monitor</a>
157160
</li>
@@ -165,7 +168,7 @@
165168
<article class="main-content">
166169

167170
<section class="section">
168-
<div class="section-content">
171+
<div class="section-content top-matter">
169172
<h1>Classes</h1>
170173
<p>The following classes are available globally.</p>
171174

@@ -176,11 +179,13 @@ <h1>Classes</h1>
176179
<div class="section-content">
177180
<div class="task-group">
178181
<div class="task-name-container">
179-
<a name="/BufferList%20"></a>
180-
<a name="//apple_ref/swift/Section/BufferList " class="dashAnchor"></a>
181-
<a href="#/BufferList%20">
182-
<h3 class="section-name">BufferList </h3>
183-
</a>
182+
<a name="/BufferList"></a>
183+
<a name="//apple_ref/swift/Section/BufferList" class="dashAnchor"></a>
184+
<div class="section-name-container">
185+
<a class="section-name-link" href="#/BufferList"></a>
186+
<h3 class="section-name"><p>BufferList</p>
187+
</h3>
188+
</div>
184189
</div>
185190
<ul class="item-container">
186191
<li class="item">
@@ -250,9 +255,11 @@ <h4>Declaration</h4>
250255
<div class="task-name-container">
251256
<a name="/ClientRequest"></a>
252257
<a name="//apple_ref/swift/Section/ClientRequest" class="dashAnchor"></a>
253-
<a href="#/ClientRequest">
254-
<h3 class="section-name">ClientRequest</h3>
255-
</a>
258+
<div class="section-name-container">
259+
<a class="section-name-link" href="#/ClientRequest"></a>
260+
<h3 class="section-name"><p>ClientRequest</p>
261+
</h3>
262+
</div>
256263
</div>
257264
<ul class="item-container">
258265
<li class="item">
@@ -294,10 +301,6 @@ <h4>Declaration</h4>
294301
</section>
295302
</div>
296303
</li>
297-
</ul>
298-
</div>
299-
<div class="task-group">
300-
<ul class="item-container">
301304
<li class="item">
302305
<div>
303306
<code>
@@ -327,10 +330,6 @@ <h4>Declaration</h4>
327330
</section>
328331
</div>
329332
</li>
330-
</ul>
331-
</div>
332-
<div class="task-group">
333-
<ul class="item-container">
334333
<li class="item">
335334
<div>
336335
<code>
@@ -344,7 +343,7 @@ <h4>Declaration</h4>
344343
<section class="section">
345344
<div class="pointer"></div>
346345
<div class="abstract">
347-
<p>The <q>root</q> class for the FastCGI server implementation.</p>
346+
<p>The &ldquo;root&rdquo; class for the FastCGI server implementation.</p>
348347

349348
<a href="Classes/FastCGI.html" class="slightly-smaller">See more</a>
350349
</div>
@@ -359,10 +358,6 @@ <h4>Declaration</h4>
359358
</section>
360359
</div>
361360
</li>
362-
</ul>
363-
</div>
364-
<div class="task-group">
365-
<ul class="item-container">
366361
<li class="item">
367362
<div>
368363
<code>
@@ -392,10 +387,6 @@ <h4>Declaration</h4>
392387
</section>
393388
</div>
394389
</li>
395-
</ul>
396-
</div>
397-
<div class="task-group">
398-
<ul class="item-container">
399390
<li class="item">
400391
<div>
401392
<code>
@@ -425,10 +416,6 @@ <h4>Declaration</h4>
425416
</section>
426417
</div>
427418
</li>
428-
</ul>
429-
</div>
430-
<div class="task-group">
431-
<ul class="item-container">
432419
<li class="item">
433420
<div>
434421
<code>
@@ -464,9 +451,11 @@ <h4>Declaration</h4>
464451
<div class="task-name-container">
465452
<a name="/HTTP"></a>
466453
<a name="//apple_ref/swift/Section/HTTP" class="dashAnchor"></a>
467-
<a href="#/HTTP">
468-
<h3 class="section-name">HTTP</h3>
469-
</a>
454+
<div class="section-name-container">
455+
<a class="section-name-link" href="#/HTTP"></a>
456+
<h3 class="section-name"><p>HTTP</p>
457+
</h3>
458+
</div>
470459
</div>
471460
<ul class="item-container">
472461
<li class="item">
@@ -519,9 +508,11 @@ <h4>Declaration</h4>
519508
<div class="task-name-container">
520509
<a name="/HTTPServer"></a>
521510
<a name="//apple_ref/swift/Section/HTTPServer" class="dashAnchor"></a>
522-
<a href="#/HTTPServer">
523-
<h3 class="section-name">HTTPServer</h3>
524-
</a>
511+
<div class="section-name-container">
512+
<a class="section-name-link" href="#/HTTPServer"></a>
513+
<h3 class="section-name"><p>HTTPServer</p>
514+
</h3>
515+
</div>
525516
</div>
526517
<ul class="item-container">
527518
<li class="item">
@@ -537,14 +528,7 @@ <h3 class="section-name">HTTPServer</h3>
537528
<section class="section">
538529
<div class="pointer"></div>
539530
<div class="abstract">
540-
<p>An HTTP server that listens for connections on a socket.</p>
541-
<h3 id='usage-example' class='heading'>Usage Example:</h3>
542-
<pre class="highlight swift"><code> <span class="c1">//Create a server that listens for connections on a specified socket.</span>
543-
<span class="k">let</span> <span class="nv">server</span> <span class="o">=</span> <span class="k">try</span> <span class="kt">HTTPServer</span><span class="o">.</span><span class="nf">listen</span><span class="p">(</span><span class="nv">on</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span> <span class="nv">delegate</span><span class="p">:</span> <span class="n">delegate</span><span class="p">)</span>
544-
<span class="o">...</span>
545-
<span class="c1">//Stop the server.</span>
546-
<span class="n">server</span><span class="o">.</span><span class="nf">stop</span><span class="p">()</span>
547-
</code></pre>
531+
<p>Undocumented</p>
548532

549533
<a href="Classes/HTTPServer.html" class="slightly-smaller">See more</a>
550534
</div>
@@ -565,9 +549,11 @@ <h4>Declaration</h4>
565549
<div class="task-name-container">
566550
<a name="/HTTPServerRequest"></a>
567551
<a name="//apple_ref/swift/Section/HTTPServerRequest" class="dashAnchor"></a>
568-
<a href="#/HTTPServerRequest">
569-
<h3 class="section-name">HTTPServerRequest</h3>
570-
</a>
552+
<div class="section-name-container">
553+
<a class="section-name-link" href="#/HTTPServerRequest"></a>
554+
<h3 class="section-name"><p>HTTPServerRequest</p>
555+
</h3>
556+
</div>
571557
</div>
572558
<ul class="item-container">
573559
<li class="item">
@@ -620,9 +606,11 @@ <h4>Declaration</h4>
620606
<div class="task-name-container">
621607
<a name="/HTTPServerResponse"></a>
622608
<a name="//apple_ref/swift/Section/HTTPServerResponse" class="dashAnchor"></a>
623-
<a href="#/HTTPServerResponse">
624-
<h3 class="section-name">HTTPServerResponse</h3>
625-
</a>
609+
<div class="section-name-container">
610+
<a class="section-name-link" href="#/HTTPServerResponse"></a>
611+
<h3 class="section-name"><p>HTTPServerResponse</p>
612+
</h3>
613+
</div>
626614
</div>
627615
<ul class="item-container">
628616
<li class="item">
@@ -671,10 +659,6 @@ <h4>Declaration</h4>
671659
</section>
672660
</div>
673661
</li>
674-
</ul>
675-
</div>
676-
<div class="task-group">
677-
<ul class="item-container">
678662
<li class="item">
679663
<div>
680664
<code>
@@ -698,16 +682,13 @@ <h4>Declaration</h4>
698682
<div class="language">
699683
<p class="aside-title">Swift</p>
700684
<pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">HeadersContainer</span></code></pre>
685+
<pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">HeadersContainer</span><span class="p">:</span> <span class="kt">Collection</span></code></pre>
701686

702687
</div>
703688
</div>
704689
</section>
705690
</div>
706691
</li>
707-
</ul>
708-
</div>
709-
<div class="task-group">
710-
<ul class="item-container">
711692
<li class="item">
712693
<div>
713694
<code>
@@ -749,9 +730,11 @@ <h4>Declaration</h4>
749730
<div class="task-name-container">
750731
<a name="/SPIUtils"></a>
751732
<a name="//apple_ref/swift/Section/SPIUtils" class="dashAnchor"></a>
752-
<a href="#/SPIUtils">
753-
<h3 class="section-name">SPIUtils</h3>
754-
</a>
733+
<div class="section-name-container">
734+
<a class="section-name-link" href="#/SPIUtils"></a>
735+
<h3 class="section-name"><p>SPIUtils</p>
736+
</h3>
737+
</div>
755738
</div>
756739
<ul class="item-container">
757740
<li class="item">
@@ -792,9 +775,11 @@ <h4>Declaration</h4>
792775
<div class="task-name-container">
793776
<a name="/URLParser"></a>
794777
<a name="//apple_ref/swift/Section/URLParser" class="dashAnchor"></a>
795-
<a href="#/URLParser">
796-
<h3 class="section-name">URLParser</h3>
797-
</a>
778+
<div class="section-name-container">
779+
<a class="section-name-link" href="#/URLParser"></a>
780+
<h3 class="section-name"><p>URLParser</p>
781+
</h3>
782+
</div>
798783
</div>
799784
<ul class="item-container">
800785
<li class="item">
@@ -840,8 +825,8 @@ <h4>Declaration</h4>
840825
</article>
841826
</div>
842827
<section class="footer">
843-
<p>&copy; 2019 <a class="link" href="" target="_blank" rel="external">IBM</a>. All rights reserved. (Last updated: 2019-10-09)</p>
844-
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
828+
<p>&copy; 2021 <a class="link" href="" target="_blank" rel="external">IBM &amp; Kitura Project Authors</a>. All rights reserved. (Last updated: 2021-08-30)</p>
829+
<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>
845830
</section>
846831
</body>
847832
</div>

0 commit comments

Comments
 (0)