Merge pull request #87 from amzn/remove_5_1_16_04_support

Remove Swift 5.1 and Ubuntu 16.04 support and CI.
amzn · May 14, 2021 · 0034fa4 · 0034fa4
2 parents 131f9ad + b5415c5
commit 0034fa4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 285 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,59 +2,48 @@
 matrix:
   include:
     - os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       services: docker
       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.4.0-xenial ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes
-    - os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       services: docker
       env: DOCKER_IMAGE_TAG=swift:5.4.0-focal ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes
     - os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       services: docker
       env: DOCKER_IMAGE_TAG=swift:5.4.0-amazonlinux2 ONLY_RUN_SWIFT_LINT=no USE_APT_GET=no
     - os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       services: docker
       env: DOCKER_IMAGE_TAG=swift:5.4.0-centos8 ONLY_RUN_SWIFT_LINT=no USE_APT_GET=no
 
     - os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       services: docker
       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.2.5-bionic ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes
-
-    - os: linux
-      dist: xenial
+      dist: bionic
       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.4-bionic ONLY_RUN_SWIFT_LINT=no USE_APT_GET=yes
 
     # Verify against nightly of Swift mainline
     - os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       services: docker
       env: DOCKER_IMAGE_TAG=swiftlang/swift:nightly-amazonlinux2 ONLY_RUN_SWIFT_LINT=no USE_APT_GET=no
 
     # Use a docker image that contains the SwiftLint executable the verify the code against the linter.
 #    - os: linux
-#      dist: xenial
+#      dist: bionic
 #      sudo: required
 #      services: docker
 #      env: DOCKER_IMAGE_TAG=bytesguy/swiftlint:0.39.2 ONLY_RUN_SWIFT_LINT=yes USE_APT_GET=no

diff --git a/[email protected] b/[email protected]
diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@
 <img src="https://travis-ci.com/amzn/smoke-aws.svg?branch=master" alt="Build - Master Branch">
 </a>
 <a href="http://swift.org">
-<img src="https://img.shields.io/badge/swift-5.1|5.2|5.3|5.4-orange.svg?style=flat" alt="Swift 5.1, 5.2 and 5.3 Tested">
+<img src="https://img.shields.io/badge/swift-5.2|5.3|5.4-orange.svg?style=flat" alt="Swift 5.2, 5.3 and 5.4 Tested">
 </a>
-<img src="https://img.shields.io/badge/ubuntu-16.04|18.04|20.04-yellow.svg?style=flat" alt="Ubuntu 16.04, 18.04 and 20.04 Tested">
+<img src="https://img.shields.io/badge/ubuntu-18.04|20.04-yellow.svg?style=flat" alt="Ubuntu 18.04 and 20.04 Tested">
 <img src="https://img.shields.io/badge/CentOS-8-yellow.svg?style=flat" alt="CentOS 8 Tested">
 <img src="https://img.shields.io/badge/AmazonLinux-2-yellow.svg?style=flat" alt="Amazon Linux 2 Tested">
 <a href="https://gitter.im/SmokeServerSide">

diff --git a/Sources/_SmokeAWSHttpConcurrency/AWSClientProtocol.swift b/Sources/_SmokeAWSHttpConcurrency/AWSClientProtocol.swift
@@ -85,23 +85,4 @@ public extension AWSClientProtocol {
     }
 }
 
-public struct AWSClientHelper {
-    public static func getEventLoop(eventLoopGroupProvider: HTTPClient.EventLoopGroupProvider) -> EventLoopGroup {
-        switch eventLoopGroupProvider {
-        case .shared(let group):
-            return group
-        case .createNew:
-            #if canImport(Network)
-                if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *) {
-                    return NIOTSEventLoopGroup()
-                } else {
-                    return MultiThreadedEventLoopGroup(numberOfThreads: 1)
-                }
-            #else
-                return MultiThreadedEventLoopGroup(numberOfThreads: 1)
-            #endif
-        }
-    }
-}
-
 #endif