Update to Swift 4.1 and dependencies (#250)

Kitura · Apr 16, 2018 · 755c39f · 755c39f
1 parent 6f70a9b
commit 755c39f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0.3
+4.1
diff --git a/.travis.yml b/.travis.yml
@@ -4,12 +4,12 @@ branches:
  - develop
  - /^issue.*$/
 
-notifications:
- slack:
- secure: "P0r4xHJ1C6siPNtB0HM8kcRDGrD7PX0iY3UrDwRN41isiw1IpjNjNOvtzEzATyIkkpMlMXEq3QBdEsxZCwIKYUZHCy99CSkoY/brUdIJgaC92XZzP7BucQAhbweilVX4YcB8CmfKJ9b5I/+7o7bbnOlcVDUkd29QuMb0nUy2rXl6xZVLJ/9BmFSsffAquPjfdQKq/xh/hIbaBtHLDVxxQ4Q/DeDJ+FLkG16tFAvEj9EMDgeFcKZF9pOpFrCdpwj1Bg8NLB5vZqizxgr9xK4lBBr7LBrwhwfzvxs8DAjwWSUZkZEhPfoRzSBZ0tYeqH2V3dL8B9eEPVyfDawq8DXQcjMVIn5wpVQqNzzjuAXNlqhjT7PzjDccnU821uNs9nYDY5aug8pqC+ZaB1GSnt4Y0jH4NjSnEQIGeYwn3D4CiTwAGjO/OFJT5VV/DcKpdtzcuEbhCJyaPPfk4obgiUOOBEH6Ut932fqYfd70h7gupofFcctzsei3egAv9bff/PTIzhYsf5Vacj4i/hx+AaBK63BctKu8okcPne40OKms15dO/BB5AfFZYsN+sSOhzOpTzZpxS2tEqVJsVna0DcFX5cWzIMr0MonQYLr/uVB7mgE/VT8wETbVaEkSq/yqScOQRLM/ja/o273e3bv1EoRxYJPQSHQR/Du1le1E2dQS+Qc="
-# Testing Darwin, Ubuntu 14.04, Ubuntu 16.04
 matrix:
  include:
+ - os: linux
+ dist: trusty
+ sudo: required
+ env: SWIFT_SNAPSHOT=4.0.3
  - os: linux
  dist: trusty
  sudo: required
@@ -22,14 +22,9 @@ matrix:
  osx_image: xcode9.2
  sudo: required
  env: SWIFT_SNAPSHOT=4.0.3
- - os: linux
- dist: trusty
- sudo: required
- env: SWIFT_SNAPSHOT=swift-4.1-DEVELOPMENT-SNAPSHOT-2018-02-06-a
  - os: osx
- osx_image: xcode9.2
+ osx_image: xcode9.3
  sudo: required
- env: SWIFT_SNAPSHOT=swift-4.1-DEVELOPMENT-SNAPSHOT-2018-02-06-a
 
 script:
  - ./build.sh
diff --git a/Package.swift b/Package.swift
@@ -20,10 +20,10 @@
 import PackageDescription
 
 var dependencies: [Package.Dependency] = [
- .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", .upToNextMinor(from: "1.7.0")),
- .package(url: "https://github.com/IBM-Swift/BlueSocket.git", .upToNextMinor(from: "0.12.0")),
+ .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "1.7.3"),
+ .package(url: "https://github.com/IBM-Swift/BlueSocket.git", from: "1.0.0"),
  .package(url: "https://github.com/IBM-Swift/CCurl.git", from: "1.0.0"),
- .package(url: "https://github.com/IBM-Swift/BlueSSLService.git", .upToNextMinor(from: "0.12.0"))
+ .package(url: "https://github.com/IBM-Swift/BlueSSLService.git", from: "1.0.0")
 ]
 
 var kituraNetDependencies: [Target.Dependency] = [
@@ -36,8 +36,8 @@ var kituraNetDependencies: [Target.Dependency] = [
 
 #if os(Linux)
 dependencies.append(contentsOf: [
- .package(url: "https://github.com/IBM-Swift/CEpoll.git", .upToNextMinor(from: "0.1.0")),
- .package(url: "https://github.com/IBM-Swift/BlueSignals.git", .upToNextMinor(from: "0.9.0"))
+ .package(url: "https://github.com/IBM-Swift/CEpoll.git", from: "1.0.0"),
+ .package(url: "https://github.com/IBM-Swift/BlueSignals.git", from: "1.0.0")
  ])
 
 kituraNetDependencies.append(contentsOf: [