From 55cf803b6af4d8a9a09965eb7624819b199f242b Mon Sep 17 00:00:00 2001
From: David Jones <djones6@uk.ibm.com>
Date: Mon, 18 Mar 2019 14:33:44 +0000
Subject: [PATCH] Update to Swift 4.2.3, use official Docker images

---
 .swift-version |  2 +-
 .travis.yml    | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.swift-version b/.swift-version
index fae6e3d..f2c6cb6 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-4.2.1
+4.2.3
diff --git a/.travis.yml b/.travis.yml
index 406cd50..7cbd23a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,28 +12,27 @@ branches:
 matrix:
   include:
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
-      env: SWIFT_SNAPSHOT=4.0.3
-    - os: linux
-      dist: trusty
-      sudo: required
-      env: SWIFT_SNAPSHOT=4.1.3
+      services: docker
+      env:  DOCKER_IMAGE=swift:4.0.3 SWIFT_SNAPSHOT=4.0.3
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
+      services: docker
+      env: DOCKER_IMAGE=swift:4.1.3 SWIFT_SNAPSHOT=4.1.3
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04
+      env: DOCKER_IMAGE=swift:4.2.3
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
+      env: DOCKER_IMAGE=swift:4.2.3 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       services: docker
       env: DOCKER_IMAGE=ubuntu:18.04