Skip to content

Commit

Permalink
Merge pull request #51 from vapor/swift4
Browse files Browse the repository at this point in the history
Swift4
  • Loading branch information
loganwright authored Aug 7, 2017
2 parents a2a2c4c + 68edf34 commit 563a66e
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Packages
.DS_Store
*.xcodeproj
Package.pins
Package.resolved
1 change: 1 addition & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// swift-tools-version:3.0
import PackageDescription

let package = Package(
Expand Down
18 changes: 18 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// swift-tools-version:4.0
import PackageDescription

let package = Package(
name: "TLS",
products: [
.library(name: "TLS", targets: ["TLS"]),
],
dependencies: [
.package(url: "https://github.com/vapor/core.git", .upToNextMajor(from: "2.1.1")),
.package(url: "https://github.com/vapor/sockets.git", .upToNextMajor(from: "2.1.0")),
.package(url: "https://github.com/vapor/ctls.git", .upToNextMajor(from: "1.1.0")),
],
targets: [
.target(name: "TLS", dependencies: ["Core", "Sockets"]),
.testTarget(name: "TLSTests", dependencies: ["TLS"]),
]
)
11 changes: 6 additions & 5 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
machine:
services:
- redis
dependencies:
override:
- eval "$(curl -sL https://apt.vapor.sh)"
- sudo apt-get install vapor
- sudo apt-get install swift
- sudo chmod -R a+rx /usr/
test:
override:
- swift build
- swift build -c release
- swift test

- sudo apt-get remove swift
- sudo apt-get install swift-beta
- swift build
- swift build -c release
- swift test

0 comments on commit 563a66e

Please sign in to comment.