From 2300d94769d7441e3094a16bd8ca9c515bfa5773 Mon Sep 17 00:00:00 2001
From: Alsey Coleman Miller <alseycmiller@gmail.com>
Date: Thu, 4 Jun 2020 21:19:41 -0500
Subject: [PATCH] Updated Travis CI

---
 .travis.yml | 49 ++++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a6bd3fa..2c58656 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,29 @@
 language: generic
-osx_image: xcode8
-os:
-  - linux
-sudo: required
-dist: trusty
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install carthage ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then carthage bootstrap ; fi
-install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then SWIFT_DIR=tests ; fi
+matrix:
+   include:
+       # Test Ubuntu Linux 16.04 / Swift 5.2
+       - os: linux
+         dist: xenial
+         sudo: required
+         env:
+           - SWIFT_VERSION=swift-5.2.2-RELEASE
+           - SWIFT_URL=https://swift.org/builds/swift-5.2.2-release/ubuntu1604/swift-5.2.2-RELEASE/swift-5.2.2-RELEASE-ubuntu16.04.tar.gz
+         install:
+           - export PATH=$(pwd)/tests/$SWIFT_VERSION-ubuntu16.04/usr/bin:"${PATH}"
+      # Test Xcode 11.4 / Swift 5.2.2
+       - os: osx
+         osx_image: xcode11.4
+addons:
+  apt:
+    packages:
+    - clang
+    - pkg-config
+script:
+  # Setup Linux environment
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install clang uuid-dev libjson-c-dev ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install clang ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then SWIFT_DIR=tests ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir $SWIFT_DIR ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl https://swift.org/builds/development/ubuntu1404/$SWIFT_VERSION/$SWIFT_VERSION-ubuntu14.04.tar.gz -s | tar xz -C $SWIFT_DIR &> /dev/null ; fi
-env:
-  - SWIFT_VERSION=swift-DEVELOPMENT-SNAPSHOT-2016-08-04-a
-script:
-  - uname
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xctool test -project Xcode/SwiftFoundation.xcodeproj -scheme "SwiftFoundation OS X" -sdk macosx ONLY_ACTIVE_ARCH=NO ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xctool build -project Xcode/SwiftFoundation.xcodeproj -scheme "SwiftFoundation iOS" -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO ; fi
-  
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH=$(pwd)/tests/$SWIFT_VERSION-ubuntu14.04/usr/bin:"${PATH}" ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then swift build ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then .build/debug/UnitTests ; fi
-  
\ No newline at end of file
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl $SWIFT_URL -s | tar xz -C $SWIFT_DIR &> /dev/null ; fi
+  # Run Unit Tests
+  - swift test