From 1209a40a57d12e77503ab2e2f2ae0e102df30f5d Mon Sep 17 00:00:00 2001 From: Andrea Scuderi Date: Sat, 4 Apr 2020 12:45:39 +0100 Subject: [PATCH] Update to Swift 5.2.1 --- Makefile | 2 +- Package.resolved | 12 ++--- README.md | 2 +- docker/5.2.1/Dockerfile | 4 ++ docker/5.2.1/swift-shared-libraries.txt | 63 +++++++++++++++++++++++++ export-coverage-test.sh | 4 +- 6 files changed, 77 insertions(+), 10 deletions(-) create mode 100644 docker/5.2.1/Dockerfile create mode 100644 docker/5.2.1/swift-shared-libraries.txt diff --git a/Makefile b/Makefile index 1a1b504..da4a205 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SWIFT_VERSION?=5.1.5 +SWIFT_VERSION?=5.2.1 DOCKER_TAG=nio-swift:$(SWIFT_VERSION) SWIFT_DOCKER_IMAGE=$(DOCKER_TAG) diff --git a/Package.resolved b/Package.resolved index aacc9d0..32ebbd4 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": "e2636a4c24e646d3e480fc666da0c090818beb09", - "version": "1.1.0" + "revision": "037b70291941fe43de668066eb6fb802c5e181d2", + "version": "1.1.1" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "a27a07719ca785bcaca019a5b9fe1814b981b4a2", - "version": "2.15.0" + "revision": "e876fb37410e0036b98b5361bb18e6854739572b", + "version": "2.16.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", "state": { "branch": null, - "revision": "af46d9b58fafbb76f9b01177568d435a1b024f99", - "version": "2.6.2" + "revision": "ae213938e151964aa691f0e902462fbe06baeeb6", + "version": "2.7.1" } } ] diff --git a/README.md b/README.md index 87bd178..2faeb7a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # aws-lambda-swift-sprinter-nio-plugin -[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1](https://img.shields.io/badge/Swift-5.1-blue.svg)](https://swift.org/download/) ![](https://img.shields.io/badge/version-1.0.0-green) [![Build Status](https://travis-ci.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin.svg?branch=master)](https://travis-ci.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin) [![codecov](https://codecov.io/gh/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin/branch/master/graph/badge.svg)](https://codecov.io/gh/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin) +[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1](https://img.shields.io/badge/Swift-5.1-blue.svg)](https://swift.org/download/) [![Swift 5.2](https://img.shields.io/badge/Swift-5.2-blue.svg)](https://swift.org/download/) ![](https://img.shields.io/badge/version-1.0.0-green) [![Build Status](https://travis-ci.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin.svg?branch=master)](https://travis-ci.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin) [![codecov](https://codecov.io/gh/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin/branch/master/graph/badge.svg)](https://codecov.io/gh/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin) The project implements an HTTPS client plugin for the [LambdaSwiftSprinter](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core) framework. diff --git a/docker/5.2.1/Dockerfile b/docker/5.2.1/Dockerfile new file mode 100644 index 0000000..a49ca97 --- /dev/null +++ b/docker/5.2.1/Dockerfile @@ -0,0 +1,4 @@ +FROM swift:5.2.1 as builder + +RUN apt-get -qq update && apt-get -q -y install \ + libssl-dev libicu-dev diff --git a/docker/5.2.1/swift-shared-libraries.txt b/docker/5.2.1/swift-shared-libraries.txt new file mode 100644 index 0000000..3e396e1 --- /dev/null +++ b/docker/5.2.1/swift-shared-libraries.txt @@ -0,0 +1,63 @@ +/lib/x86_64-linux-gnu/libbsd.so.0 +/lib/x86_64-linux-gnu/libc.so.6 +/lib/x86_64-linux-gnu/libcom_err.so.2 +/lib/x86_64-linux-gnu/libcrypt.so.1 +/lib/x86_64-linux-gnu/libdl.so.2 +/lib/x86_64-linux-gnu/libgcc_s.so.1 +/lib/x86_64-linux-gnu/libkeyutils.so.1 +/lib/x86_64-linux-gnu/liblzma.so.5 +/lib/x86_64-linux-gnu/libm.so.6 +/lib/x86_64-linux-gnu/libpthread.so.0 +/lib/x86_64-linux-gnu/libresolv.so.2 +/lib/x86_64-linux-gnu/librt.so.1 +/lib/x86_64-linux-gnu/libutil.so.1 +/lib/x86_64-linux-gnu/libz.so.1 +/usr/lib/swift/linux/libBlocksRuntime.so +/usr/lib/swift/linux/libFoundation.so +/usr/lib/swift/linux/libFoundationNetworking.so +/usr/lib/swift/linux/libFoundationXML.so +/usr/lib/swift/linux/libdispatch.so +/usr/lib/swift/linux/libicudataswift.so.65 +/usr/lib/swift/linux/libicui18nswift.so.65 +/usr/lib/swift/linux/libicuucswift.so.65 +/usr/lib/swift/linux/libswiftCore.so +/usr/lib/swift/linux/libswiftDispatch.so +/usr/lib/swift/linux/libswiftGlibc.so +/usr/lib/swift/linux/libswiftSwiftOnoneSupport.so +/usr/lib/x86_64-linux-gnu/libasn1.so.8 +/usr/lib/x86_64-linux-gnu/libatomic.so.1 +/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 +/usr/lib/x86_64-linux-gnu/libcurl.so.4 +/usr/lib/x86_64-linux-gnu/libffi.so.6 +/usr/lib/x86_64-linux-gnu/libgmp.so.10 +/usr/lib/x86_64-linux-gnu/libgnutls.so.30 +/usr/lib/x86_64-linux-gnu/libgssapi.so.3 +/usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2 +/usr/lib/x86_64-linux-gnu/libhcrypto.so.4 +/usr/lib/x86_64-linux-gnu/libheimbase.so.1 +/usr/lib/x86_64-linux-gnu/libheimntlm.so.0 +/usr/lib/x86_64-linux-gnu/libhogweed.so.4 +/usr/lib/x86_64-linux-gnu/libhx509.so.5 +/usr/lib/x86_64-linux-gnu/libicudata.so.60 +/usr/lib/x86_64-linux-gnu/libicuuc.so.60 +/usr/lib/x86_64-linux-gnu/libidn2.so.0 +/usr/lib/x86_64-linux-gnu/libk5crypto.so.3 +/usr/lib/x86_64-linux-gnu/libkrb5.so.26 +/usr/lib/x86_64-linux-gnu/libkrb5.so.3 +/usr/lib/x86_64-linux-gnu/libkrb5support.so.0 +/usr/lib/x86_64-linux-gnu/liblber-2.4.so.2 +/usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2 +/usr/lib/x86_64-linux-gnu/libnettle.so.6 +/usr/lib/x86_64-linux-gnu/libnghttp2.so.14 +/usr/lib/x86_64-linux-gnu/libp11-kit.so.0 +/usr/lib/x86_64-linux-gnu/libpsl.so.5 +/usr/lib/x86_64-linux-gnu/libroken.so.18 +/usr/lib/x86_64-linux-gnu/librtmp.so.1 +/usr/lib/x86_64-linux-gnu/libsasl2.so.2 +/usr/lib/x86_64-linux-gnu/libsqlite3.so.0 +/usr/lib/x86_64-linux-gnu/libssl.so.1.1 +/usr/lib/x86_64-linux-gnu/libstdc++.so.6 +/usr/lib/x86_64-linux-gnu/libtasn1.so.6 +/usr/lib/x86_64-linux-gnu/libunistring.so.2 +/usr/lib/x86_64-linux-gnu/libwind.so.0 +/usr/lib/x86_64-linux-gnu/libxml2.so.2 \ No newline at end of file diff --git a/export-coverage-test.sh b/export-coverage-test.sh index e0fcefc..8204dda 100755 --- a/export-coverage-test.sh +++ b/export-coverage-test.sh @@ -1,2 +1,2 @@ -llvm-cov export -instr-profile=.build/x86_64-unknown-linux/debug/codecov/default.profdata -format=lcov \ -.build/x86_64-unknown-linux/debug/LambdaSwiftSprinterNioPluginPackageTests.xctest > .build/x86_64-unknown-linux/debug/codecov/lcov.info \ No newline at end of file +llvm-cov export -instr-profile=.build/x86_64-unknown-linux-gnu/debug/codecov/default.profdata -format=lcov \ +.build/x86_64-unknown-linux-gnu/debug/LambdaSwiftSprinterNioPluginPackageTests.xctest > .build/x86_64-unknown-linux-gnu/debug/codecov/lcov.info \ No newline at end of file