Skip to content

Commit

Permalink
Merge pull request #21 from vapor/swift-4
Browse files Browse the repository at this point in the history
swift 4
  • Loading branch information
tanner0101 authored Sep 13, 2017
2 parents b04c9ce + 1c25d0f commit c8a89d5
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
/*.xcodeproj
Package.pins
DerivedData
Package.resolved

20 changes: 20 additions & 0 deletions Package@swift-4.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// swift-tools-version:4.0
import PackageDescription

let package = Package(
name: "AuthProvider",
products: [
.library(name: "AuthProvider", targets: ["AuthProvider"]),
],
dependencies: [
// A web framework and server for Swift that works on macOS and Ubuntu.
.package(url: "https://github.com/vapor/auth.git", .upToNextMajor(from: "1.2.0")),

// A web framework and server for Swift that works on macOS and Ubuntu.
.package(url: "https://github.com/vapor/vapor.git", .upToNextMajor(from: "2.2.0")),
],
targets: [
.target(name: "AuthProvider", dependencies: ["Authentication", "Authorization", "Vapor"]),
.testTarget(name: "AuthProviderTests", dependencies: ["AuthProvider", "Testing"])
]
)
8 changes: 7 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
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 c8a89d5

Please sign in to comment.