Update to 4.2.1, support Swift 5, update Travis (#46)

.swift-version

@@ -1 +1 @@
-4.1.2
+4.2.1

.travis.yml

@@ -1,51 +1,60 @@
-# See the following URLs for further details on Travis CI
-# https://docs.travis-ci.com/user/customizing-the-build/
-# https://docs.travis-ci.com/user/docker/
-# https://docs.travis-ci.com/user/multi-os/
+# Travis CI build file.
 
 # whitelist (branches that should be built)
 branches:
   only:
     - master
-    - develop
     - /^issue.*$/
 
+# the matrix of builds should cover each combination of Swift version
+# and platform that is supported. The version of Swift used is specified
+# by .swift-version, unless SWIFT_SNAPSHOT is specified.
 matrix:
   include:
     - os: linux
       dist: trusty
       sudo: required
-      env: SWIFT_SNAPSHOT=3.1.1
+      env: SWIFT_SNAPSHOT=4.0.3
     - os: linux
       dist: trusty
       sudo: required
-      env: SWIFT_SNAPSHOT=4.0
+      env: SWIFT_SNAPSHOT=4.1.3
     - os: linux
       dist: trusty
       sudo: required
     - os: linux
       dist: trusty
       sudo: required
-      env: SWIFT_SNAPSHOT=swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-01-a
-    - os: osx
-      osx_image: xcode8.3
+      services: docker
+      env: DOCKER_IMAGE=ubuntu:16.04
+    - os: linux
+      dist: trusty
+      sudo: required
+      services: docker
+      env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
+    - os: linux
+      dist: trusty
       sudo: required
-      env: SWIFT_SNAPSHOT=3.1.1
+      services: docker
+      env: DOCKER_IMAGE=ubuntu:18.04
     - os: osx
-      osx_image: xcode9
+      osx_image: xcode9.2
       sudo: required
-      env: SWIFT_SNAPSHOT=4.0
+      env: SWIFT_SNAPSHOT=4.0.3
     - os: osx
       osx_image: xcode9.4
       sudo: required
+      env: SWIFT_SNAPSHOT=4.1.2 JAZZY_ELIGIBLE=true
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode10.1
       sudo: required
-      env: SWIFT_SNAPSHOT=swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-04-a  
+    - os: osx
+      osx_image: xcode10.1
+      sudo: required
+      env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
 
 before_install:
-    - git clone https://github.com/IBM-Swift/Package-Builder.git
+  - git clone https://github.com/IBM-Swift/Package-Builder.git
 
 script:
   - ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR
-

Package.swift

@@ -1,3 +1,6 @@
+// swift-tools-version:4.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
 /**
  * Copyright IBM Corporation 2016, 2017
  *
@@ -17,5 +20,23 @@
 import PackageDescription
 
 let package = Package(
-    name: "HTMLEntities"
+    name: "HTMLEntities",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "HTMLEntities",
+            targets: ["HTMLEntities"]
+        )
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "HTMLEntities"
+        ),
+        .testTarget(
+            name: "HTMLEntitiesTests",
+            dependencies: ["HTMLEntities"]
+        )
+    ]
 )