diff --git a/.travis.yml b/.travis.yml index 8de8ab0..91623ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,10 @@ env: - AWS_PROFILE=default addons: - snaps: + snaps: - name: aws-cli confinement: classic # or devmode - channel: latest/edge + channel: latest/stable before_install: - ./scripts/aws_travis_credentials.sh diff --git a/Examples/HTTPSRequest/.devcontainer/Dockerfile b/Examples/HTTPSRequest/.devcontainer/Dockerfile index 0edeece..0b97a4b 100644 --- a/Examples/HTTPSRequest/.devcontainer/Dockerfile +++ b/Examples/HTTPSRequest/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM nio-swift:5.2.1 +FROM nio-swift:5.2.3 # Or your actual UID, GID on Linux if not the default 1000 ARG USERNAME=vscode diff --git a/Examples/HTTPSRequest/README.md b/Examples/HTTPSRequest/README.md index 851055a..8e13fb2 100644 --- a/Examples/HTTPSRequest/README.md +++ b/Examples/HTTPSRequest/README.md @@ -1,6 +1,6 @@ # HTTPSRequest -[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.5](https://img.shields.io/badge/Swift-5.1.5-blue.svg)](https://swift.org/download/) [![Swift 5.2.1](https://img.shields.io/badge/Swift-5.2.1-blue.svg)](https://swift.org/download/) +[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.5](https://img.shields.io/badge/Swift-5.1.5-blue.svg)](https://swift.org/download/) [![Swift 5.2.3](https://img.shields.io/badge/Swift-5.2.3-blue.svg)](https://swift.org/download/) This example shows the usage of the [LambdaSwiftSprinter](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core) framework and the plugin [LambdaSwiftSprinterNioPlugin](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin) to build a lambda capable to perform an HTTPS request. diff --git a/Examples/HelloWorld/.devcontainer/Dockerfile b/Examples/HelloWorld/.devcontainer/Dockerfile index 0edeece..0b97a4b 100644 --- a/Examples/HelloWorld/.devcontainer/Dockerfile +++ b/Examples/HelloWorld/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM nio-swift:5.2.1 +FROM nio-swift:5.2.3 # Or your actual UID, GID on Linux if not the default 1000 ARG USERNAME=vscode diff --git a/Examples/HelloWorld/README.md b/Examples/HelloWorld/README.md index 28e6de1..52ff83e 100644 --- a/Examples/HelloWorld/README.md +++ b/Examples/HelloWorld/README.md @@ -1,6 +1,6 @@ # HelloWorld -[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.5](https://img.shields.io/badge/Swift-5.1.5-blue.svg)](https://swift.org/download/) [![Swift 5.2.1](https://img.shields.io/badge/Swift-5.2.1-blue.svg)](https://swift.org/download/) +[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.5](https://img.shields.io/badge/Swift-5.1.5-blue.svg)](https://swift.org/download/) [![Swift 5.2.3](https://img.shields.io/badge/Swift-5.2.3-blue.svg)](https://swift.org/download/) This example shows the usage of the [LambdaSwiftSprinter](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core) framework to build a simple lambda. diff --git a/Examples/PostgreSQLDemo/README.md b/Examples/PostgreSQLDemo/README.md index ae3c422..1a301c7 100644 --- a/Examples/PostgreSQLDemo/README.md +++ b/Examples/PostgreSQLDemo/README.md @@ -1,6 +1,6 @@ # PostgreSQLDemo -[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.5](https://img.shields.io/badge/Swift-5.1.5-blue.svg)](https://swift.org/download/) [![Swift 5.2.1](https://img.shields.io/badge/Swift-5.2.1-blue.svg)](https://swift.org/download/) +[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.5](https://img.shields.io/badge/Swift-5.1.5-blue.svg)](https://swift.org/download/) [![Swift 5.2.3](https://img.shields.io/badge/Swift-5.2.3-blue.svg)](https://swift.org/download/) This example shows the usage of the [LambdaSwiftSprinter](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core) framework and the plugin [LambdaSwiftSprinterNioPlugin](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin) to build a lambda capable to perform an Postgres query using [PostgresNIO](https://github.com/vapor/postgres-nio.git). diff --git a/Examples/RedisDemo/README.md b/Examples/RedisDemo/README.md index 97a95a5..1c82574 100644 --- a/Examples/RedisDemo/README.md +++ b/Examples/RedisDemo/README.md @@ -1,6 +1,6 @@ # RedisDemo -[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.5](https://img.shields.io/badge/Swift-5.1.5-blue.svg)](https://swift.org/download/) [![Swift 5.2.1](https://img.shields.io/badge/Swift-5.2.1-blue.svg)](https://swift.org/download/) +[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.5](https://img.shields.io/badge/Swift-5.1.5-blue.svg)](https://swift.org/download/) [![Swift 5.2.3](https://img.shields.io/badge/Swift-5.2.3-blue.svg)](https://swift.org/download/) This example shows the usage of the [LambdaSwiftSprinter](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core) framework and the plugin [LambdaSwiftSprinterNioPlugin](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin) to build a lambda capable to perform an Redis request using [RediStack](https://gitlab.com/mordil/swift-redi-stack.git). diff --git a/Makefile b/Makefile index 43ba228..078101b 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ # Use this tag to build a customized local image -SWIFT_VERSION?=5.2.1 -LAYER_VERSION?=5-2-1 +SWIFT_VERSION?=5.2.3 +LAYER_VERSION?=5-2-3 # SWIFT_VERSION=5.1.5 # LAYER_VERSION=5-1-5 DOCKER_TAG=nio-swift:$(SWIFT_VERSION) diff --git a/README.md b/README.md index 0ab2b5c..c97d264 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # aws-lambda-swift-sprinter -[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.5](https://img.shields.io/badge/Swift-5.1.5-blue.svg)](https://swift.org/download/) [![Swift 5.2.1](https://img.shields.io/badge/Swift-5.2.1-blue.svg)](https://swift.org/download/) ![](https://img.shields.io/badge/version-1.0.0-green) ![](https://travis-ci.com/swift-sprinter/aws-lambda-swift-sprinter.svg?branch=master) ![](https://img.shields.io/badge/@AWS-Open-orange.svg) +[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.5](https://img.shields.io/badge/Swift-5.1.5-blue.svg)](https://swift.org/download/) [![Swift 5.2.3](https://img.shields.io/badge/Swift-5.2.3-blue.svg)](https://swift.org/download/) ![](https://img.shields.io/badge/version-1.0.0-green) ![](https://travis-ci.com/swift-sprinter/aws-lambda-swift-sprinter.svg?branch=master) ![](https://img.shields.io/badge/@AWS-Open-orange.svg) ![](./images/aws-lambda-swift-sprinter.png) @@ -175,8 +175,8 @@ make invoke_lambda \ | AWS_PROFILE | An AWS AIM profile you create to authenticate to your account. | default | | IAM_ROLE_NAME | The execution role created that will be assumed by the Lambda. | lambda_sprinter_basic_execution | | AWS_BUCKET | The AWS S3 bucket where the layer and lambdas zip files get uploaded. | aws-lambda-swift-sprinter | -| SWIFT_VERSION | Version of Swift used / Matches Dockerfile location too from `docker/` folder. | 5.2.1 | -| LAYER_VERSION | Version of the Swift layer that will be created and uploaded for the Lambda to run on. | 5-2-1 | +| SWIFT_VERSION | Version of Swift used / Matches Dockerfile location too from `docker/` folder. | 5.2.3 | +| LAYER_VERSION | Version of the Swift layer that will be created and uploaded for the Lambda to run on. | 5-2-3 | | SWIFT_EXECUTABLE | Name of the binary file. | HelloWorld | | SWIFT_PROJECT_PATH | Path to your Swift project. | Examples/HelloWorld | | LAMBDA_FUNCTION_NAME | Display name of your Lambda in AWS. | HelloWorld | diff --git a/docker/5.2.1/Dockerfile b/docker/5.2.3/Dockerfile similarity index 73% rename from docker/5.2.1/Dockerfile rename to docker/5.2.3/Dockerfile index a49ca97..abca1df 100644 --- a/docker/5.2.1/Dockerfile +++ b/docker/5.2.3/Dockerfile @@ -1,4 +1,4 @@ -FROM swift:5.2.1 as builder +FROM swift:5.2.3 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.3/swift-shared-libraries.txt similarity index 100% rename from docker/5.2.1/swift-shared-libraries.txt rename to docker/5.2.3/swift-shared-libraries.txt