Merge pull request #24 from brokenhandsio/swift4

Swift 4
brokenhandsio · Sep 27, 2017 · d203bf6 · d203bf6
2 parents 0a346a2 + 2d7767b
commit d203bf6
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 10 deletions.
diff --git 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;

diff --git a/Package@swift-4.swift b/Package@swift-4.swift
@@ -0,0 +1,24 @@
+// swift-tools-version:4.0
+
+import PackageDescription
+
+let package = Package(
+    name: "SteamPress",
+    products: [
+        .library(name: "SteamPress", targets: ["SteamPress"]),
+    ],
+    dependencies: [
+    	.package(url: "https://github.com/vapor/vapor.git", from: "2.2.0"),
+        .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "1.5.1"),
+        .package(url: "https://github.com/vapor-community/markdown-provider.git", from: "1.0.0"),
+        .package(url: "https://github.com/vapor/leaf-provider.git", from: "1.1.0"),
+        .package(url: "https://github.com/vapor/fluent-provider.git", from: "1.1.0"),
+        .package(url: "https://github.com/vapor/auth-provider.git", from: "1.2.0"),
+        .package(url: "https://github.com/vapor/validation.git", from: "1.0.1"),
+    ],
+    targets: [
+        .target(name: "SteamPress", dependencies: ["Vapor", "SwiftSoup", "MarkdownProvider", "LeafProvider",
+                                                   "FluentProvider", "AuthProvider", "Validation"]),
+        .testTarget(name: "SteamPressTests", dependencies: ["SteamPress"]),
+    ]
+)
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
     <br>
     <br>
     <a href="https://swift.org">
-        <img src="http://img.shields.io/badge/Swift-3.1-brightgreen.svg" alt="Language">
+        <img src="http://img.shields.io/badge/Swift-4-brightgreen.svg" alt="Language">
     </a>
     <a href="https://travis-ci.org/brokenhandsio/SteamPress">
         <img src="https://travis-ci.org/brokenhandsio/SteamPress.svg?branch=master" alt="Build Status">
@@ -67,7 +67,7 @@ SteamPress is easy to integrate with your application. First add SteamPress to y
 ```swift
 dependencies: [
     ...,
-    .Package(url: "https://github.com/brokenhandsio/SteamPress", majorVersion: 0)
+    .package(url: "https://github.com/brokenhandsio/SteamPress", from: "0.15.0")
 ]
 ```
 

diff --git a/Sources/SteamPress/Views/LeafViewFactory.swift b/Sources/SteamPress/Views/LeafViewFactory.swift
@@ -25,7 +25,11 @@ struct LeafViewFactory: ViewFactory {
             guard let editSubstringIndex = uri.descriptionWithoutPort.range(of: "admin/posts")?.lowerBound else {
                 throw Abort.serverError
             }
+            #if swift(>=4)
+            postPathPrefix = uri.descriptionWithoutPort[..<editSubstringIndex] + "posts/"
+            #else
             postPathPrefix = uri.descriptionWithoutPort.substring(to: editSubstringIndex) + "posts/"
+            #endif
         } else {
             postPathPrefix = uri.descriptionWithoutPort.replacingOccurrences(of: "admin/createPost", with: "posts")
         }

diff --git a/Tests/SteamPressTests/BlogAdminControllerTests.swift b/Tests/SteamPressTests/BlogAdminControllerTests.swift
@@ -120,7 +120,7 @@ class BlogAdminControllerTests: XCTestCase {
         #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
             let thisClass = type(of: self)
             let linuxCount = thisClass.allTests.count
-            let darwinCount = Int(thisClass.defaultTestSuite().testCaseCount)
+            let darwinCount = Int(thisClass.defaultTestSuite.testCaseCount)
             XCTAssertEqual(linuxCount, darwinCount, "\(darwinCount - linuxCount) tests are missing from allTests")
         #endif
     }

diff --git a/Tests/SteamPressTests/BlogControllerTests.swift b/Tests/SteamPressTests/BlogControllerTests.swift
@@ -105,7 +105,7 @@ class BlogControllerTests: XCTestCase {
             let thisClass = type(of: self)
             let linuxCount = thisClass.allTests.count
             let darwinCount = Int(thisClass
-                .defaultTestSuite().testCaseCount)
+                .defaultTestSuite.testCaseCount)
             XCTAssertEqual(linuxCount, darwinCount,
                            "\(darwinCount - linuxCount) tests are missing from allTests")
         #endif

diff --git a/Tests/SteamPressTests/BlogPostTests.swift b/Tests/SteamPressTests/BlogPostTests.swift
@@ -38,7 +38,7 @@ class BlogPostTests: XCTestCase {
             let thisClass = type(of: self)
             let linuxCount = thisClass.allTests.count
             let darwinCount = Int(thisClass
-                .defaultTestSuite().testCaseCount)
+                .defaultTestSuite.testCaseCount)
             XCTAssertEqual(linuxCount, darwinCount,
                            "\(darwinCount - linuxCount) tests are missing from allTests")
         #endif

diff --git a/Tests/SteamPressTests/BlogTagTests.swift b/Tests/SteamPressTests/BlogTagTests.swift
@@ -15,7 +15,7 @@ class BlogTagTests: XCTestCase {
             let thisClass = type(of: self)
             let linuxCount = thisClass.allTests.count
             let darwinCount = Int(thisClass
-                .defaultTestSuite().testCaseCount)
+                .defaultTestSuite.testCaseCount)
             XCTAssertEqual(linuxCount, darwinCount,
                            "\(darwinCount - linuxCount) tests are missing from allTests")
         #endif

diff --git a/Tests/SteamPressTests/Feed Tests/AtomFeedTests.swift b/Tests/SteamPressTests/Feed Tests/AtomFeedTests.swift
@@ -48,7 +48,7 @@ class AtomFeedTests: XCTestCase {
             let thisClass = type(of: self)
             let linuxCount = thisClass.allTests.count
             let darwinCount = Int(thisClass
-                .defaultTestSuite().testCaseCount)
+                .defaultTestSuite.testCaseCount)
             XCTAssertEqual(linuxCount, darwinCount,
                            "\(darwinCount - linuxCount) tests are missing from allTests")
         #endif

diff --git a/Tests/SteamPressTests/Feed Tests/RSSFeedTests.swift b/Tests/SteamPressTests/Feed Tests/RSSFeedTests.swift
@@ -49,7 +49,7 @@ class RSSFeedTests: XCTestCase {
             let thisClass = type(of: self)
             let linuxCount = thisClass.allTests.count
             let darwinCount = Int(thisClass
-                .defaultTestSuite().testCaseCount)
+                .defaultTestSuite.testCaseCount)
             XCTAssertEqual(linuxCount, darwinCount,
                            "\(darwinCount - linuxCount) tests are missing from allTests")
         #endif

diff --git a/Tests/SteamPressTests/LeafViewFactoryTests.swift b/Tests/SteamPressTests/LeafViewFactoryTests.swift
@@ -125,7 +125,7 @@ class LeafViewFactoryTests: XCTestCase {
             let thisClass = type(of: self)
             let linuxCount = thisClass.allTests.count
             let darwinCount = Int(thisClass
-                .defaultTestSuite().testCaseCount)
+                .defaultTestSuite.testCaseCount)
             XCTAssertEqual(linuxCount, darwinCount,
                            "\(darwinCount - linuxCount) tests are missing from allTests")
         #endif