Skip to content

Commit

Permalink
Merge pull request #13 from vapor/swift-4
Browse files Browse the repository at this point in the history
swift 4
  • Loading branch information
tanner0101 authored Aug 10, 2017
2 parents a91bd20 + a90712d commit f32d095
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Packages
.DS_Store
*.xcodeproj
Package.pins

Package.resolved
20 changes: 20 additions & 0 deletions [email protected]
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: "Multipart",
products: [
.library(name: "Multipart", targets: ["Multipart"]),
.library(name: "FormData", targets: ["FormData"]),
],
dependencies: [
.package(url: "https://github.com/vapor/core.git", .upToNextMajor(from: "2.1.2")),
.package(url: "https://github.com/vapor/engine.git", .upToNextMajor(from: "2.2.0")),
],
targets: [
.target(name: "Multipart", dependencies: ["Core", "HTTP"]),
.testTarget(name: "MultipartTests", dependencies: ["Multipart"]),
.target(name: "FormData", dependencies: ["Multipart", "Core"]),
.testTarget(name: "FormDataTests", dependencies: ["FormData"]),
]
)
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 f32d095

Please sign in to comment.