Merge pull request #39 from Zewo/swift-4

Move to Swift 4
Zewo · Nov 4, 2017 · 3e78449 · 3e78449
2 parents 53b185e + e7e7995
commit 3e78449
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 .DS_Store
+*.lock
+*.resolved
 /build
 /.build
 /Packages

diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.1
+4.0.2
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,8 @@
 os:
   - linux
-  - osx
 language: generic
 sudo: false
 dist: trusty
-osx_image: xcode8.3
 addons:
   apt:
     sources:

diff --git a/Package.swift b/Package.swift
@@ -1,10 +1,17 @@
-// swift-tools-version:3.1
+// swift-tools-version:4.0
 
 import PackageDescription
 
 let package = Package(
     name: "Venice",
+    products: [
+        .library(name: "Venice", targets: ["Venice"])
+    ],
     dependencies: [
-        .Package(url: "https://github.com/Zewo/CLibdill.git", majorVersion: 1)
+        .package(url: "https://github.com/Zewo/CLibdill.git", from: "2.0.0")
+    ],
+    targets: [
+        .target(name: "Venice"),
+        .testTarget(name: "VeniceTests", dependencies: ["Venice"]),
     ]
 )
diff --git a/Sources/Channel.swift → Sources/Venice/Channel.swift b/Sources/Channel.swift → Sources/Venice/Channel.swift
diff --git a/Sources/Coroutine.swift → Sources/Venice/Coroutine.swift b/Sources/Coroutine.swift → Sources/Venice/Coroutine.swift
diff --git a/Sources/Error.swift → Sources/Venice/Error.swift b/Sources/Error.swift → Sources/Venice/Error.swift
diff --git a/Sources/FileDescriptor.swift → Sources/Venice/FileDescriptor.swift b/Sources/FileDescriptor.swift → Sources/Venice/FileDescriptor.swift
diff --git a/Sources/Time.swift → Sources/Venice/Time.swift b/Sources/Time.swift → Sources/Venice/Time.swift
diff --git a/circle.yml b/circle.yml
@@ -1,3 +1,6 @@
+machine:
+  xcode:
+    version: 9.1
 dependencies:
   override:
     - eval "$(curl -sL http://sh.zewo.io/install-libdill.sh)"