From 84d0f5bd3ff73a53d29ccc24e5016886599293d3 Mon Sep 17 00:00:00 2001 From: Tim <0xtimc@gmail.com> Date: Thu, 21 Sep 2017 19:29:38 +0100 Subject: [PATCH 1/3] Add Swift 4 manifest --- .gitignore | 1 + Package@swift-4.swift | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 Package@swift-4.swift diff --git a/.gitignore b/.gitignore index 5732055..1483084 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /*.xcodeproj Package.pins DerivedData/ +Package.resolved diff --git a/Package@swift-4.swift b/Package@swift-4.swift new file mode 100644 index 0000000..383d279 --- /dev/null +++ b/Package@swift-4.swift @@ -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"]), + ] +) From 33c9836d990f777ca142287677683e1d064103a9 Mon Sep 17 00:00:00 2001 From: Tim <0xtimc@gmail.com> Date: Thu, 21 Sep 2017 19:29:55 +0100 Subject: [PATCH 2/3] Update CI scripts --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d019630..f49aa18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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; From 4e1b8d111d7f9b6f2d788011154a92a15a74218f Mon Sep 17 00:00:00 2001 From: Tim <0xtimc@gmail.com> Date: Thu, 21 Sep 2017 19:31:36 +0100 Subject: [PATCH 3/3] Update README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 94eb9bd..cb6916e 100644 --- a/README.md +++ b/README.md @@ -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) @@ -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")) ] ``` @@ -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 {