Skip to content

Commit

Permalink
Update dependency versions and CI for consistency with other repos an…
Browse files Browse the repository at this point in the history 
…d 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
  • Loading branch information
@dannys42
dannys42 authored Sep 1, 2021
1 parent b1c10f7 commit 082a207
Show file tree
Hide file tree
Showing 91 changed files with 1,980 additions and 955 deletions.
2 changes: 0 additions & 2 deletions .jazzy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ readme: README.md

skip_undocumented: false
hide_documentation_coverage: false

xcodebuild_arguments: [-project, Kitura-NIO.xcodeproj, -target, KituraNet, LIBRARY_SEARCH_PATHS=.build/debug]
19 changes: 7 additions & 12 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,35 +20,30 @@ matrix:
dist: xenial
sudo: required
services: docker
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
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
- os: linux
dist: xenial
sudo: required
services: docker
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
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
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT DOCKER_PRIVILEGED=true SWIFT_TEST_ARGS="--parallel --sanitize=thread"
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"

# Removing support due to issue compiling swift-nio-ssl
# - os: osx
# osx_image: xcode10.3
# sudo: required
# env: SWIFT_SNAPSHOT=5.0.1 JAZZY_ELIGIBLE=true SWIFT_TEST_ARGS="--parallel"
- os: osx
osx_image: xcode11.3
sudo: required
env: SWIFT_SNAPSHOT=5.1.3 JAZZY_ELIGIBLE=true SWIFT_TEST_ARGS="--parallel --sanitize=thread"
env: JAZZY_ELIGIBLE=true SWIFT_TEST_ARGS="--parallel --sanitize=thread"
- os: osx
osx_image: xcode12.2
sudo: required
env: SWIFT_SNAPSHOT=5.3.1 SWIFT_TEST_ARGS="--parallel --sanitize=thread"
env: SWIFT_TEST_ARGS="--parallel --sanitize=thread"
- os: osx
osx_image: xcode11.6
osx_image: xcode12.5
sudo: required
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT SWIFT_TEST_ARGS="--parallel --sanitize=thread" CUSTOM_TEST_SCRIPT=.kitura-test.sh
env: USE_SWIFT_DEVELOPMENT_SNAPSHOT=1 SWIFT_TEST_ARGS="--parallel --sanitize=thread" CUSTOM_TEST_SCRIPT=.kitura-test.sh


before_install:
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ let package = Package(
.package(url: "https://github.com/apple/swift-nio.git", from: "2.8.0"),
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.0.0"),
.package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.0.0"),
.package(url: "https://github.com/Kitura/BlueSSLService.git", from: "1.0.200"),
.package(url: "https://github.com/Kitura/LoggerAPI.git", from: "1.9.200")
.package(url: "https://github.com/Kitura/BlueSSLService.git", from: "2.0.0"),
.package(url: "https://github.com/Kitura/LoggerAPI.git", from: "2.0.0")
],
targets: [
.target(
Expand Down
121 changes: 53 additions & 68 deletions docs/Classes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<a class="header-link" href="index.html">
KituraNet Docs
</a>
(95% documented)
(94% documented)
</p>

<p class="header-col--secondary">
Expand All @@ -33,7 +33,7 @@
</p>

<p class="header-col header-col--secondary">
<a class="header-link" href="https://github.com/IBM-Swift/Kitura-NIO/">
<a class="header-link" href="https://github.com/Kitura/Kitura-NIO/">
<img class="header-icon" src="img/gh.png"/>
View on GitHub
</a>
Expand Down Expand Up @@ -152,6 +152,9 @@
<li class="nav-group-task">
<a class="nav-group-task-link" href="Structs/ConnectionUpgrader.html">ConnectionUpgrader</a>
</li>
<li class="nav-group-task">
<a class="nav-group-task-link" href="Structs/HTTPServerError.html">HTTPServerError</a>
</li>
<li class="nav-group-task">
<a class="nav-group-task-link" href="Structs/Monitor.html">Monitor</a>
</li>
Expand All @@ -165,7 +168,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>

Expand All @@ -176,11 +179,13 @@ <h1>Classes</h1>
<div class="section-content">
<div class="task-group">
<div class="task-name-container">
<a name="/BufferList%20"></a>
<a name="//apple_ref/swift/Section/BufferList " class="dashAnchor"></a>
<a href="#/BufferList%20">
<h3 class="section-name">BufferList </h3>
</a>
<a name="/BufferList"></a>
<a name="//apple_ref/swift/Section/BufferList" class="dashAnchor"></a>
<div class="section-name-container">
<a class="section-name-link" href="#/BufferList"></a>
<h3 class="section-name"><p>BufferList</p>
</h3>
</div>
</div>
<ul class="item-container">
<li class="item">
Expand Down Expand Up @@ -250,9 +255,11 @@ <h4>Declaration</h4>
<div class="task-name-container">
<a name="/ClientRequest"></a>
<a name="//apple_ref/swift/Section/ClientRequest" class="dashAnchor"></a>
<a href="#/ClientRequest">
<h3 class="section-name">ClientRequest</h3>
</a>
<div class="section-name-container">
<a class="section-name-link" href="#/ClientRequest"></a>
<h3 class="section-name"><p>ClientRequest</p>
</h3>
</div>
</div>
<ul class="item-container">
<li class="item">
Expand Down Expand Up @@ -294,10 +301,6 @@ <h4>Declaration</h4>
</section>
</div>
</li>
</ul>
</div>
<div class="task-group">
<ul class="item-container">
<li class="item">
<div>
<code>
Expand Down Expand Up @@ -327,10 +330,6 @@ <h4>Declaration</h4>
</section>
</div>
</li>
</ul>
</div>
<div class="task-group">
<ul class="item-container">
<li class="item">
<div>
<code>
Expand All @@ -344,7 +343,7 @@ <h4>Declaration</h4>
<section class="section">
<div class="pointer"></div>
<div class="abstract">
<p>The <q>root</q> class for the FastCGI server implementation.</p>
<p>The &ldquo;root&rdquo; class for the FastCGI server implementation.</p>

<a href="Classes/FastCGI.html" class="slightly-smaller">See more</a>
</div>
Expand All @@ -359,10 +358,6 @@ <h4>Declaration</h4>
</section>
</div>
</li>
</ul>
</div>
<div class="task-group">
<ul class="item-container">
<li class="item">
<div>
<code>
Expand Down Expand Up @@ -392,10 +387,6 @@ <h4>Declaration</h4>
</section>
</div>
</li>
</ul>
</div>
<div class="task-group">
<ul class="item-container">
<li class="item">
<div>
<code>
Expand Down Expand Up @@ -425,10 +416,6 @@ <h4>Declaration</h4>
</section>
</div>
</li>
</ul>
</div>
<div class="task-group">
<ul class="item-container">
<li class="item">
<div>
<code>
Expand Down Expand Up @@ -464,9 +451,11 @@ <h4>Declaration</h4>
<div class="task-name-container">
<a name="/HTTP"></a>
<a name="//apple_ref/swift/Section/HTTP" class="dashAnchor"></a>
<a href="#/HTTP">
<h3 class="section-name">HTTP</h3>
</a>
<div class="section-name-container">
<a class="section-name-link" href="#/HTTP"></a>
<h3 class="section-name"><p>HTTP</p>
</h3>
</div>
</div>
<ul class="item-container">
<li class="item">
Expand Down Expand Up @@ -519,9 +508,11 @@ <h4>Declaration</h4>
<div class="task-name-container">
<a name="/HTTPServer"></a>
<a name="//apple_ref/swift/Section/HTTPServer" class="dashAnchor"></a>
<a href="#/HTTPServer">
<h3 class="section-name">HTTPServer</h3>
</a>
<div class="section-name-container">
<a class="section-name-link" href="#/HTTPServer"></a>
<h3 class="section-name"><p>HTTPServer</p>
</h3>
</div>
</div>
<ul class="item-container">
<li class="item">
Expand All @@ -537,14 +528,7 @@ <h3 class="section-name">HTTPServer</h3>
<section class="section">
<div class="pointer"></div>
<div class="abstract">
<p>An HTTP server that listens for connections on a socket.</p>
<h3 id='usage-example' class='heading'>Usage Example:</h3>
<pre class="highlight swift"><code> <span class="c1">//Create a server that listens for connections on a specified socket.</span>
<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>
<span class="o">...</span>
<span class="c1">//Stop the server.</span>
<span class="n">server</span><span class="o">.</span><span class="nf">stop</span><span class="p">()</span>
</code></pre>
<p>Undocumented</p>

<a href="Classes/HTTPServer.html" class="slightly-smaller">See more</a>
</div>
Expand All @@ -565,9 +549,11 @@ <h4>Declaration</h4>
<div class="task-name-container">
<a name="/HTTPServerRequest"></a>
<a name="//apple_ref/swift/Section/HTTPServerRequest" class="dashAnchor"></a>
<a href="#/HTTPServerRequest">
<h3 class="section-name">HTTPServerRequest</h3>
</a>
<div class="section-name-container">
<a class="section-name-link" href="#/HTTPServerRequest"></a>
<h3 class="section-name"><p>HTTPServerRequest</p>
</h3>
</div>
</div>
<ul class="item-container">
<li class="item">
Expand Down Expand Up @@ -620,9 +606,11 @@ <h4>Declaration</h4>
<div class="task-name-container">
<a name="/HTTPServerResponse"></a>
<a name="//apple_ref/swift/Section/HTTPServerResponse" class="dashAnchor"></a>
<a href="#/HTTPServerResponse">
<h3 class="section-name">HTTPServerResponse</h3>
</a>
<div class="section-name-container">
<a class="section-name-link" href="#/HTTPServerResponse"></a>
<h3 class="section-name"><p>HTTPServerResponse</p>
</h3>
</div>
</div>
<ul class="item-container">
<li class="item">
Expand Down Expand Up @@ -671,10 +659,6 @@ <h4>Declaration</h4>
</section>
</div>
</li>
</ul>
</div>
<div class="task-group">
<ul class="item-container">
<li class="item">
<div>
<code>
Expand All @@ -698,16 +682,13 @@ <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">class</span> <span class="kt">HeadersContainer</span></code></pre>
<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>

</div>
</div>
</section>
</div>
</li>
</ul>
</div>
<div class="task-group">
<ul class="item-container">
<li class="item">
<div>
<code>
Expand Down Expand Up @@ -749,9 +730,11 @@ <h4>Declaration</h4>
<div class="task-name-container">
<a name="/SPIUtils"></a>
<a name="//apple_ref/swift/Section/SPIUtils" class="dashAnchor"></a>
<a href="#/SPIUtils">
<h3 class="section-name">SPIUtils</h3>
</a>
<div class="section-name-container">
<a class="section-name-link" href="#/SPIUtils"></a>
<h3 class="section-name"><p>SPIUtils</p>
</h3>
</div>
</div>
<ul class="item-container">
<li class="item">
Expand Down Expand Up @@ -792,9 +775,11 @@ <h4>Declaration</h4>
<div class="task-name-container">
<a name="/URLParser"></a>
<a name="//apple_ref/swift/Section/URLParser" class="dashAnchor"></a>
<a href="#/URLParser">
<h3 class="section-name">URLParser</h3>
</a>
<div class="section-name-container">
<a class="section-name-link" href="#/URLParser"></a>
<h3 class="section-name"><p>URLParser</p>
</h3>
</div>
</div>
<ul class="item-container">
<li class="item">
Expand Down Expand Up @@ -840,8 +825,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-10-09)</p>
<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>
<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>
<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>
Expand Down
Loading

0 comments on commit 082a207

Please sign in to comment.