Skip to content

Commit aea4876

Browse files
authored
Merge pull request #4 from vapor-community/swift4
Add Swift 4 support
2 parents 7c15194 + 31118bb commit aea4876

File tree

4 files changed

+21
-3
lines changed

4 files changed

+21
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/*.xcodeproj
55
Package.pins
66
DerivedData/
7+
Package.resolved

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ language: generic
55
sudo: required
66
dist: trusty
77

8-
osx_image: xcode8.3
8+
osx_image: xcode9
99
before_install:
1010
- if [ $TRAVIS_OS_NAME == "osx" ]; then
1111
brew tap vapor/tap;

[email protected]

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// swift-tools-version:4.0
2+
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "SwiftMarkdown",
7+
products: [
8+
.library(name: "SwiftMarkdown", targets: ["SwiftMarkdown"]),
9+
],
10+
dependencies: [
11+
.package(url: "https://github.com/brokenhandsio/cmark-gfm.git", .upToNextMajor(from: "1.0.0")),
12+
],
13+
targets: [
14+
.target(name: "SwiftMarkdown", dependencies: ["cmark"]),
15+
.testTarget(name: "SwiftMarkdownTests", dependencies: ["SwiftMarkdown"]),
16+
]
17+
)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Markdown
22

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

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

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

0 commit comments

Comments
 (0)