Skip to content

Commit

Permalink
Merge pull request #5 from vapor-community/swift4
Browse files Browse the repository at this point in the history
Swift 4
  • Loading branch information
0xTim authored Sep 21, 2017
2 parents 46f5854 + 4e1b8d1 commit bd3820a
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 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
19 changes: 19 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// swift-tools-version:4.0

import PackageDescription

let package = Package(
name: "MarkdownProvider",
products: [
.library(name: "MarkdownProvider", targets: ["MarkdownProvider"]),
],
dependencies: [
.package(url: "https://github.com/vapor/vapor.git", .upToNextMajor(from: "2.1.0")),
.package(url: "https://github.com/vapor/leaf-provider.git", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/vapor-community/markdown.git", .upToNextMajor(from: "0.4.0")),
],
targets: [
.target(name: "MarkdownProvider", dependencies: ["Vapor", "LeafProvider", "SwiftMarkdown"]),
.testTarget(name: "MarkdownProviderTests", dependencies: ["MarkdownProvider"]),
]
)
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Markdown Provider

[![Language](https://img.shields.io/badge/Swift-3.1-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-provider.svg?branch=master)](https://travis-ci.org/vapor-community/markdown-provider)
[![codecov](https://codecov.io/gh/vapor-community/markdown-provider/branch/master/graph/badge.svg)](https://codecov.io/gh/vapor-community/mmarkdown-provider)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/vapor-community/markdown-provider/master/LICENSE)
Expand Down Expand Up @@ -32,7 +32,7 @@ Add Markdown Provider as a dependency in your `Package.swift` file:
```swift
dependencies: [
...,
.Package(url: "https://github.com/vapor-community/markdown-provider.git", majorVersion: 1)
.package(url: "https://github.com/vapor-community/markdown-provider.git", .upToNextMajor(from: "1.1.0"))
]
```

Expand All @@ -49,7 +49,7 @@ let drop = try Droplet(config)

### Register with Leaf

Alternatively, you can also directly add the Tag onto your `LeafRenderer` if desired. During your setup (for example, in `main.swift`), register your tag as so:
Alternatively, you can also directly add the Tag onto your `LeafRenderer` if desired. During your setup (for example, in `Droplet+Setup.swift`), register your tag as so:

```swift
if let leaf = drop.view as? LeafRenderer {
Expand Down

0 comments on commit bd3820a

Please sign in to comment.