diff --git a/.travis.yml b/.travis.yml
index 0c7d135..9b138dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,6 @@ branches:
 # by .swift-version, unless SWIFT_SNAPSHOT is specified.
 matrix:
   include:
-    - os: linux
-      dist: trusty
-      sudo: required
-      env: SWIFT_SNAPSHOT=3.1.1
     - os: linux
       dist: trusty
       sudo: required
@@ -35,11 +31,12 @@ matrix:
       dist: trusty
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=ubuntu:18.04
-    - os: osx
-      osx_image: xcode8.3
+      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.2
       sudo: required
@@ -51,6 +48,10 @@ matrix:
     - os: osx
       osx_image: xcode10
       sudo: required
+    - 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
diff --git a/Package.pins b/Package.pins
deleted file mode 100644
index e0570d6..0000000
--- a/Package.pins
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "autoPin": false,
-  "pins": [],
-  "version": 1
-}
diff --git a/Package.swift b/Package.swift
index c98b2ae..8d963ab 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,5 +1,8 @@
+// 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
+ * Copyright IBM Corporation 2016, 2018
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +21,24 @@ import PackageDescription
 
 let package = Package(
     name: "HeliumLogger",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "HeliumLogger",
+            targets: ["HeliumLogger"]
+        )
+    ],
     dependencies: [
-        .Package(url: "https://github.com/IBM-Swift/LoggerAPI.git", majorVersion: 1, minor: 7),
+        .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "1.7.0")
+    ],
+    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: "HeliumLogger",
+            dependencies: ["LoggerAPI"]),
+        .testTarget(
+            name: "HeliumLoggerTests",
+            dependencies: ["HeliumLogger"])
     ]
 )
diff --git a/Package@swift-4.swift b/Package@swift-4.swift
deleted file mode 100644
index 663ffae..0000000
--- a/Package@swift-4.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-// 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
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-import PackageDescription
-
-let package = Package(
-    name: "HeliumLogger",
-    products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "HeliumLogger",
-            targets: ["HeliumLogger"]
-        )
-    ],
-    dependencies: [
-        .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", .upToNextMinor(from: "1.7.0"))
-    ],
-    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: "HeliumLogger",
-            dependencies: ["LoggerAPI"]),
-        .testTarget(
-            name: "HeliumLoggerTests",
-            dependencies: ["HeliumLogger"])
-    ]
-)