Merge pull request #10 from vapor-community/swift-5-github-actions

Maintenance Update

.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: CI
+on:
+- push
+jobs:
+  xenial:
+    container: 
+      image: vapor/swift:5.1-xenial
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - run: swift test --enable-test-discovery --enable-code-coverage
+  bionic:
+    container: 
+      image: vapor/swift:5.1-bionic
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Run Bionic Tests
+      run: swift test --enable-test-discovery --enable-code-coverage
+    - name: Setup container for codecov upload
+      run: apt-get update && apt-get install curl
+    - name: Process coverage file
+      run: llvm-cov show .build/x86_64-unknown-linux/debug/LeafMarkdownPackageTests.xctest -instr-profile=.build/x86_64-unknown-linux/debug/codecov/default.profdata > coverage.txt
+    - name: Upload code coverage
+      uses: codecov/codecov-action@v1
+      with:
+        token: ${{ secrets.CODECOV_UPLOAD_KEY }}
+        file: coverage.txt

.gitignore

@@ -5,3 +5,4 @@
 Package.pins
 DerivedData/
 Package.resolved
+.swiftpm

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.1
 
 import PackageDescription
 
@@ -8,12 +8,12 @@ let package = Package(
         .library(name: "LeafMarkdown", targets: ["LeafMarkdown"]),
     ],
     dependencies: [
-    	.package(url: "https://github.com/vapor/vapor.git", from: "3.0.0"),
+    	.package(url: "https://github.com/vapor/template-kit.git", from: "1.4.0"),
+        .package(url: "https://github.com/vapor-community/markdown.git", from: "0.5.0"),
         .package(url: "https://github.com/vapor/leaf.git", from: "3.0.0"),
-        .package(url: "https://github.com/vapor-community/markdown.git", .upToNextMajor(from: "0.4.0")),
     ],
     targets: [
-        .target(name: "LeafMarkdown", dependencies: ["Vapor", "Leaf", "SwiftMarkdown"]),
-        .testTarget(name: "LeafMarkdownTests", dependencies: ["LeafMarkdown"]),
+        .target(name: "LeafMarkdown", dependencies: ["TemplateKit", "SwiftMarkdown"]),
+        .testTarget(name: "LeafMarkdownTests", dependencies: ["LeafMarkdown", "Leaf"]),
     ]
 )

Package@swift-4.swift

@@ -0,0 +1,19 @@
+// swift-tools-version:4.0
+
+import PackageDescription
+
+let package = Package(
+    name: "LeafMarkdown",
+    products: [
+        .library(name: "LeafMarkdown", targets: ["LeafMarkdown"]),
+    ],
+    dependencies: [
+    	.package(url: "https://github.com/vapor/vapor.git", from: "3.0.0"),
+        .package(url: "https://github.com/vapor/leaf.git", from: "3.0.0"),
+        .package(url: "https://github.com/vapor-community/markdown.git", .upToNextMajor(from: "0.4.0")),
+    ],
+    targets: [
+        .target(name: "LeafMarkdown", dependencies: ["Vapor", "Leaf", "SwiftMarkdown"]),
+        .testTarget(name: "LeafMarkdownTests", dependencies: ["LeafMarkdown"]),
+    ]
+)

README.md

@@ -1,7 +1,7 @@
 # Leaf Markdown
 
-[![Language](https://img.shields.io/badge/Swift-4-brightgreen.svg)](http://swift.org)
-[![Build Status](https://travis-ci.org/vapor-community/leaf-markdown.svg?branch=master)](https://travis-ci.org/vapor-community/leaf-markdown)
+[![Language](https://img.shields.io/badge/Swift-5.1-brightgreen.svg)](http://swift.org)
+[![Build Status](https://github.com/vapor-community/leaf-markdown/workflows/CI/badge.svg?branch=master)](https://github.com/vapor-community/leaf-markdown/actions)
 [![codecov](https://codecov.io/gh/vapor-community/leaf-markdown/branch/master/graph/badge.svg)](https://codecov.io/gh/vapor-community/leaf-markdown)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/vapor-community/leaf-markdown/master/LICENSE)
 

Sources/LeafMarkdown/Tag.swift

@@ -1,6 +1,5 @@
-import Leaf
+import TemplateKit
 import SwiftMarkdown
-import Async
 
 public final class Markdown: TagRenderer {
 
@@ -11,7 +10,7 @@ public final class Markdown: TagRenderer {
     public let name = "markdown"
 
     private let options: MarkdownOptions?
-
+ 
     public init(options: MarkdownOptions? = nil) {
         self.options = options
     }

Tests/LeafMarkdownTests/LeafTests.swift

@@ -1,29 +1,26 @@
 import XCTest
-import Vapor
-
 @testable import Leaf
 import LeafMarkdown
 
 class LeafTests: XCTestCase {
-    static var allTests = [
-        ("testRunTag", testRunTag),
-        ("testNilParameterDoesNotCrashLeaf", testNilParameterDoesNotCrashLeaf),
-        ("testStripHtml", testStripHtml),
-        ("testDoNotStripHtml", testDoNotStripHtml)
-    ]
 
+    // MARK: - Properties
+
     var renderer: LeafRenderer!
     let template = "#markdown(data)"
 
+    // MARK: - Overrides
+
     override func setUp() {
         let queue = EmbeddedEventLoop()
         let container = BasicContainer(config: .init(), environment: .testing, services: .init(), on: queue)
         let tag = Markdown()
         var leafTagConfig = LeafTagConfig.default()
         leafTagConfig.use(tag, as: tag.name)
-        self.renderer = LeafRenderer(config: LeafConfig(tags: leafTagConfig, viewsDir: "", shouldCache: false),
-                                     using: container)
+        self.renderer = LeafRenderer(config: LeafConfig(tags: leafTagConfig, viewsDir: "", shouldCache: false), using: container)
     }
+
+    // MARK: - Tests
 
     func testRunTag() throws {
         let inputMarkdown = "# This is a test\n\nWe have some text in a tag"
@@ -72,6 +69,5 @@ class LeafTests: XCTestCase {
         let result = try renderer.render(template: template.data(using: .utf8)!, data).wait()
         let resultString = String(data: result.data, encoding: .utf8)!
         XCTAssertEqual(resultString, expectedHtml)
-
     }
 }