Skip to content

Commit

Permalink
Merge pull request #4 from vapor-community/swift4
Browse files Browse the repository at this point in the history
Add Swift 4 support
  • Loading branch information
0xTim authored Sep 21, 2017
2 parents 7c15194 + 31118bb commit aea4876
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/*.xcodeproj
Package.pins
DerivedData/
Package.resolved
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ language: generic
sudo: required
dist: trusty

osx_image: xcode8.3
osx_image: xcode9
before_install:
- if [ $TRAVIS_OS_NAME == "osx" ]; then
brew tap vapor/tap;
Expand Down
17 changes: 17 additions & 0 deletions Package@swift-4.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// swift-tools-version:4.0

import PackageDescription

let package = Package(
name: "SwiftMarkdown",
products: [
.library(name: "SwiftMarkdown", targets: ["SwiftMarkdown"]),
],
dependencies: [
.package(url: "https://github.com/brokenhandsio/cmark-gfm.git", .upToNextMajor(from: "1.0.0")),
],
targets: [
.target(name: "SwiftMarkdown", dependencies: ["cmark"]),
.testTarget(name: "SwiftMarkdownTests", dependencies: ["SwiftMarkdown"]),
]
)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Markdown

[![Language](https://img.shields.io/badge/Swift-3-brightgreen.svg)](http://swift.org)
[![Language](https://img.shields.io/badge/Swift-4-brightgreen.svg)](http://swift.org)
[![Build Status](https://travis-ci.org/vapor-community/markdown.svg?branch=master)](https://travis-ci.org/vapor-community/markdown)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/vapor-community/markdown/master/LICENSE)

Expand Down Expand Up @@ -41,5 +41,5 @@ For more information on the available options, see [`cmark`](https://github.com/
## Swift Package Manager

```swift
.Package(url: "https://github.com/vapor-community/markdown.git", majorVersion: 0, minor: 3)
.package(url: "https://github.com/vapor-community/markdown.git", .upToNextMajor(from: "0.4.0"))
```

0 comments on commit aea4876

Please sign in to comment.