Make it build

Author: steffendsommer

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   MacOS:
     macos:
-      xcode: "9.0"
+      xcode: "9.3.0"
     steps:
       - checkout
       - restore_cache:
@@ -14,6 +14,7 @@ jobs:
             brew tap vapor/homebrew-tap
             brew install cmysql
             brew install ctls
+            brew install libressl
       - run:
           name: Build and Run Tests
           no_output_timeout: 1800
@@ -30,7 +31,7 @@ jobs:
             - .build
   Linux:
     docker:
-      - image: brettrtoomey/vapor-ci:0.0.1
+      - image: nodesvapor/vapor-ci:swift-4.1
     steps:
       - checkout
       - restore_cache:

.swiftlint.yml

@@ -2,10 +2,10 @@ included:
   - Sources
 function_body_length:
   warning: 60
-variable_name:
+identifier_name:
   min_length:
     warning: 2
-line_length: 80
+line_length: 100
 disabled_rules:
   - opening_brace
 colon:

README.md

@@ -1,6 +1,6 @@
 # Sugar 🍬
-[![Swift Version](https://img.shields.io/badge/Swift-3-brightgreen.svg)](http://swift.org)
-[![Vapor Version](https://img.shields.io/badge/Vapor-2-F6CBCA.svg)](http://vapor.codes)
+[![Swift Version](https://img.shields.io/badge/Swift-4.1-brightgreen.svg)](http://swift.org)
+[![Vapor Version](https://img.shields.io/badge/Vapor-3-30B6FC.svg)](http://vapor.codes)
 [![Circle CI](https://circleci.com/gh/nodes-vapor/sugar/tree/master.svg?style=shield)](https://circleci.com/gh/nodes-vapor/sugar)
 [![codebeat badge](https://codebeat.co/badges/54770476-a759-47f8-9372-1009267a56e0)](https://codebeat.co/projects/github-com-nodes-vapor-sugar-master)
 [![codecov](https://codecov.io/gh/nodes-vapor/sugar/branch/master/graph/badge.svg)](https://codecov.io/gh/nodes-vapor/sugar)
@@ -13,7 +13,7 @@
 Update your `Package.swift` file.
 
 ```swift
-.Package(url: "https://github.com/nodes-vapor/sugar.git", majorVersion: 1)
+TODO
 ```
 
 

Sources/Sugar/Helpers/Model.swift

@@ -1,3 +1,6 @@
+import Fluent
+import Vapor
+
 public extension Model where Database: QuerySupporting {
     public static func requireFind(
         _ id: ID,

Tests/LinuxMain.swift

@@ -1,7 +1,6 @@
 import XCTest
+@testable import SugarTests
 
-import SugarTests
-
-var tests = [XCTestCaseEntry]()
-tests += SugarTests.allTests()
-XCTMain(tests)
+XCTMain([
+     testCase(SugarTests.allTests),
+])

Tests/SugarTests/SugarTests.swift

@@ -1,16 +1,14 @@
 import XCTest
 @testable import Sugar
 
-final class SugarTests: XCTestCase {
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct
-        // results.
-        XCTAssertEqual(Sugar().text, "Hello, World!")
+class SugarTests: XCTestCase {
+    func testExample() throws {
+        XCTAssertTrue(true)
     }
 
-
-    static var allTests = [
-        ("testExample", testExample),
-    ]
-}
+    static var allTests : [(String, (SugarTests) -> () throws -> Void)] {
+        return [
+            ("testExample", testExample),
+        ]
+    }
+}