Skip to content

Commit

Permalink
Merge pull request #2 from Ponyboy47/master
Browse files Browse the repository at this point in the history
Lots of updates
  • Loading branch information
steve228uk committed Apr 20, 2017
2 parents bcfa3e3 + 2d48f6f commit 66fb0da
Show file tree
Hide file tree
Showing 11 changed files with 590 additions and 145 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,15 @@ xcuserdata
timeline.xctimeline
playground.xcworkspace

## Vim swap files
*.swp

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
Packages/
.build/
Package.pins

# CocoaPods
#
Expand Down
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1
3.1
3 changes: 3 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
disabled_rules:
- todo
- fixme
17 changes: 11 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
os:
- osx
language: generic
sudo: required
- linux
- osx
osx_image: xcode8.3
dist: trusty
osx_image: xcode8
sudo: required
language: generic
before_install:
- sudo apt-get update
- sudo apt-get install -y libimage-exiftool-perl
install:
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
script:
- swift test
- swift build -c release
- swift test
8 changes: 7 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import PackageDescription

var dependencies: [Package.Dependency] = [.Package(url: "https://github.com/Ponyboy47/PathKit.git", majorVersion: 0, minor: 8)]

#if os(Linux)
dependencies.append(.Package(url: "https://github.com/vdka/JSON.git", majorVersion: 0, minor: 16))
#endif

let package = Package(
name: "Downpour"
name: "Downpour",
dependencies: dependencies
)
Loading

0 comments on commit 66fb0da

Please sign in to comment.