From f3489e088fff2f3637c5ea9013bee3b271bbaa99 Mon Sep 17 00:00:00 2001 From: Simon Pilkington Date: Wed, 28 Apr 2021 16:36:31 -0700 Subject: [PATCH 1/2] Add CI for Swift 5.4. --- .travis.yml | 19 +++++++++---------- README.md | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index ece2489..ac5d134 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,46 +5,45 @@ matrix: dist: xenial sudo: required services: docker - env: DOCKER_IMAGE_TAG=swift:5.3.3-bionic ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes + env: DOCKER_IMAGE_TAG=swift:5.4.0-bionic ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes - os: linux dist: xenial sudo: required services: docker - env: DOCKER_IMAGE_TAG=swift:5.3.3-xenial ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes + env: DOCKER_IMAGE_TAG=swift:5.4.0-xenial ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes - os: linux dist: xenial sudo: required services: docker - env: DOCKER_IMAGE_TAG=swift:5.3.3-focal ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes + env: DOCKER_IMAGE_TAG=swift:5.4.0-focal ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes - os: linux dist: xenial sudo: required services: docker - env: DOCKER_IMAGE_TAG=swift:5.3.3-amazonlinux2 ONLY_RUN_SWIFT_LINT=no USE_APT_GET=no + env: DOCKER_IMAGE_TAG=swift:5.4.0-amazonlinux2 ONLY_RUN_SWIFT_LINT=no USE_APT_GET=no - os: linux dist: xenial sudo: required services: docker - env: DOCKER_IMAGE_TAG=swift:5.3.3-centos8 ONLY_RUN_SWIFT_LINT=no USE_APT_GET=no - + env: DOCKER_IMAGE_TAG=swift:5.4.0-centos8 ONLY_RUN_SWIFT_LINT=no USE_APT_GET=no + - os: linux dist: xenial sudo: required services: docker - env: DOCKER_IMAGE_TAG=swift:5.2.5-bionic ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes + env: DOCKER_IMAGE_TAG=swift:5.3.3-bionic ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes - os: linux dist: xenial sudo: required services: docker - env: DOCKER_IMAGE_TAG=swift:5.1-bionic ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes + env: DOCKER_IMAGE_TAG=swift:5.2.5-bionic ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes - # Verify against nightly of upcoming Swift 5.4 - os: linux dist: xenial sudo: required services: docker - env: DOCKER_IMAGE_TAG=swiftlang/swift:nightly-5.4-amazonlinux2 ONLY_RUN_SWIFT_LINT=no USE_APT_GET=no + env: DOCKER_IMAGE_TAG=swift:5.1-bionic ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes # Verify against nightly of Swift mainline - os: linux diff --git a/README.md b/README.md index 089be9e..55e7c64 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Build - Master Branch -Swift 5.1, 5.2 and 5.3 Tested +Swift 5.1, 5.2, 5.3 and 5.4 Tested Ubuntu 16.04, 18.04 and 20.04 Tested CentOS 8 Tested From 1f62fed594e94d35499a38031c4ec0f57d9ac4a1 Mon Sep 17 00:00:00 2001 From: Simon Pilkington Date: Wed, 28 Apr 2021 17:04:18 -0700 Subject: [PATCH 2/2] Update compiler version gating for async/await APIs. --- .../HTTPOperationsClient+executeRetriableWithOutput.swift | 2 +- .../HTTPOperationsClient+executeRetriableWithoutOutput.swift | 2 +- .../HTTPOperationsClient+executeWithOutput.swift | 2 +- .../HTTPOperationsClient+executeWithoutOutput.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeRetriableWithOutput.swift b/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeRetriableWithOutput.swift index a05b1ae..6220e2d 100644 --- a/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeRetriableWithOutput.swift +++ b/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeRetriableWithOutput.swift @@ -15,7 +15,7 @@ // _SmokeHTTPClientConcurrency // -#if compiler(>=5.4) && $AsyncAwait +#if compiler(>=5.5) && $AsyncAwait import Foundation import NIO diff --git a/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeRetriableWithoutOutput.swift b/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeRetriableWithoutOutput.swift index 8a95368..dc51c66 100644 --- a/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeRetriableWithoutOutput.swift +++ b/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeRetriableWithoutOutput.swift @@ -15,7 +15,7 @@ // _SmokeHTTPClientConcurrency // -#if compiler(>=5.4) && $AsyncAwait +#if compiler(>=5.5) && $AsyncAwait import Foundation import NIO diff --git a/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeWithOutput.swift b/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeWithOutput.swift index fcda1fa..a3cbe18 100644 --- a/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeWithOutput.swift +++ b/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeWithOutput.swift @@ -15,7 +15,7 @@ // _SmokeHTTPClientConcurrency // -#if compiler(>=5.4) && $AsyncAwait +#if compiler(>=5.5) && $AsyncAwait import Foundation import NIO diff --git a/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeWithoutOutput.swift b/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeWithoutOutput.swift index 985ebb7..4f9e630 100644 --- a/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeWithoutOutput.swift +++ b/Sources/_SmokeHTTPClientConcurrency/HTTPOperationsClient+executeWithoutOutput.swift @@ -15,7 +15,7 @@ // _SmokeHTTPClientConcurrency // -#if compiler(>=5.4) && $AsyncAwait +#if compiler(>=5.5) && $AsyncAwait import Foundation import NIO