From 0852184086208f67cab8c720ffc795364c13696c Mon Sep 17 00:00:00 2001
From: Andrew Lees <32634907+Andrew-Lees11@users.noreply.github.com>
Date: Wed, 10 Apr 2019 13:15:01 +0100
Subject: [PATCH] Support Swift 5 (#39)

---
 .swift-version        |  2 +-
 .travis.yml           | 12 ++++++++----
 Package.swift         |  4 ++--
 Package@swift-4.swift | 42 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 Package@swift-4.swift

diff --git a/.swift-version b/.swift-version
index f2c6cb6..6e63660 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-4.2.3
+5.0
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 1fd5fb0..b54d50d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,17 +25,17 @@ matrix:
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:4.2.3
+      env: DOCKER_IMAGE=swift:4.2.4 SWIFT_SNAPSHOT=4.2.4
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:4.2.3 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
+      env: DOCKER_IMAGE=swift:5.0-xenial
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=ubuntu:18.04
+      env: DOCKER_IMAGE=swift:5.0 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
     - os: osx
       osx_image: xcode9.2
       sudo: required
@@ -47,8 +47,12 @@ matrix:
     - os: osx
       osx_image: xcode10.1
       sudo: required
+      env: SWIFT_SNAPSHOT=4.2.1
     - os: osx
-      osx_image: xcode10.1
+      osx_image: xcode10.2
+      sudo: required
+    - os: osx
+      osx_image: xcode10.2
       sudo: required
       env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
 
diff --git a/Package.swift b/Package.swift
index 853a63c..1d97013 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,8 +1,8 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 /**
- * Copyright IBM Corporation 2017
+ * Copyright IBM Corporation 2017-2019
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Package@swift-4.swift b/Package@swift-4.swift
new file mode 100644
index 0000000..e761dcd
--- /dev/null
+++ b/Package@swift-4.swift
@@ -0,0 +1,42 @@
+// swift-tools-version:4.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+/**
+ * Copyright IBM Corporation 2017-2019
+ *
+ * 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: "Kitura-CredentialsGitHub",
+    products: [
+            // Products define the executables and libraries produced by a package, and make them visible to other packages.
+            .library(
+                name: "CredentialsGitHub",
+                targets: ["CredentialsGitHub"]
+            )
+        ],
+    dependencies: [
+        .package(url: "https://github.com/IBM-Swift/Kitura-Credentials.git", from: "2.1.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: "CredentialsGitHub",
+                dependencies: ["Credentials"]
+            )
+    ]
+)