From cb54112d69664f2041b6ca685b787b30963472bc Mon Sep 17 00:00:00 2001 From: Andrea Scuderi Date: Sun, 22 Mar 2020 21:07:09 +0000 Subject: [PATCH 1/2] Update to Swift 5.1.5 --- .devcontainer/Dockerfile | 2 +- Makefile | 2 +- docker/{5.1.4 => 5.1.5}/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename docker/{5.1.4 => 5.1.5}/Dockerfile (73%) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 906ada5..b620b0d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM swift:5.1.4 +FROM swift:5.1.5 # Or your actual UID, GID on Linux if not the default 1000 ARG USERNAME=vscode diff --git a/Makefile b/Makefile index a2f137f..1a1b504 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SWIFT_VERSION?=5.1.4 +SWIFT_VERSION?=5.1.5 DOCKER_TAG=nio-swift:$(SWIFT_VERSION) SWIFT_DOCKER_IMAGE=$(DOCKER_TAG) diff --git a/docker/5.1.4/Dockerfile b/docker/5.1.5/Dockerfile similarity index 73% rename from docker/5.1.4/Dockerfile rename to docker/5.1.5/Dockerfile index 8aef938..ff7286f 100644 --- a/docker/5.1.4/Dockerfile +++ b/docker/5.1.5/Dockerfile @@ -1,4 +1,4 @@ -FROM swift:5.1.4 as builder +FROM swift:5.1.5 as builder RUN apt-get -qq update && apt-get -q -y install \ libssl-dev libicu-dev From a51046301c79d9e01fa8c715e458df8bc80b7315 Mon Sep 17 00:00:00 2001 From: Andrea Scuderi Date: Sun, 22 Mar 2020 21:23:14 +0000 Subject: [PATCH 2/2] Update dependencies --- Package.resolved | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Package.resolved b/Package.resolved index ba6b066..aacc9d0 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/swift-server/async-http-client.git", "state": { "branch": null, - "revision": "48e284d1ea6d0e8baac1af1c4ad8bd298670caf6", - "version": "1.0.1" + "revision": "e2636a4c24e646d3e480fc666da0c090818beb09", + "version": "1.1.0" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "df9390006bce7da1b6273f804d3acbbfdfcc6154", - "version": "2.13.1" + "revision": "a27a07719ca785bcaca019a5b9fe1814b981b4a2", + "version": "2.15.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", "state": { "branch": null, - "revision": "cf54f5c1db1c3740a6c7d662dc8569c150c3846c", - "version": "2.6.0" + "revision": "af46d9b58fafbb76f9b01177568d435a1b024f99", + "version": "2.6.2" } } ]