Merge pull request #692 from vapor/4-release

4.0.0 Release

Author: tanner0101

.github/CONTRIBUTING.md

@@ -0,0 +1,40 @@
+# Contributing to Fluent
+
+👋 Welcome to the Vapor team! 
+
+## Packages
+
+The `fluent` package integrates [`fluent-kit`](https://github.com/vapor/fluent-kit) with [`vapor`](https://github.com/vapor/vapor). Most of the ORM code lives in FluentKit. 
+
+Driver packages can be found by searching GitHub for [`#fluent-driver`](https://github.com/topics/fluent-driver). Each driver package will also usually contain relatively little code with most of the functionality coming from lower level packages. 
+
+## Xcode
+
+To open Fluent in Xcode:
+
+- Clone the repo to your computer
+- Drag and drop the folder onto Xcode
+
+To test within Xcode, press `CMD+U`.
+
+## SPM
+
+To develop using SPM, open the code in your favorite code editor. Use the following commands from within the project's root folder to build and test.
+
+```sh
+swift build
+swift test
+```
+
+## SemVer
+
+Vapor follows [SemVer](https://semver.org). This means that any changes to the source code that can cause
+existing code to stop compiling _must_ wait until the next major version to be included. 
+
+Code that is only additive and will not break any existing code can be included in the next minor release.
+
+----------
+
+Join us on Discord if you have any questions: [vapor.team](http://vapor.team).
+
+— Thanks! 🙌

.github/FUNDING.yml

@@ -1,2 +1,2 @@
-github: [tanner0101] # loganwright, joscdk
+github: [tanner0101]
 open_collective: vapor

.github/workflows/test.yml

@@ -1,18 +1,45 @@
 name: test
 on:
-- pull_request
+  pull_request:
+  push:
+    branches:
+      - master
 jobs:
-  fluent_xenial:
-    container: 
-      image: vapor/swift:5.2-xenial
+  linux:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        image:
+          - swift:5.2-xenial
+          - swift:5.2-bionic
+          - swiftlang/swift:nightly-5.2-xenial
+          - swiftlang/swift:nightly-5.2-bionic
+          - swiftlang/swift:nightly-5.3-xenial
+          - swiftlang/swift:nightly-5.3-bionic
+          - swiftlang/swift:nightly-master-xenial
+          - swiftlang/swift:nightly-master-bionic
+          - swiftlang/swift:nightly-master-focal
+          - swiftlang/swift:nightly-master-centos8
+          - swiftlang/swift:nightly-master-amazonlinux2
+    container: ${{ matrix.image }}
+    env:
+      LOG_LEVEL: info
+    steps:  
+      - name: Checkout Fluent
+        uses: actions/checkout@v2
+      - name: Run base tests with Thread Sanitizer
+        run: swift test --enable-test-discovery --sanitize=thread
+  macOS:
+    env:
+      LOG_LEVEL: info
+    runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v1
-    - run: swift test --enable-test-discovery --sanitize=thread
-  fluent_bionic:
-    container: 
-      image: vapor/swift:5.2-bionic
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: swift test --enable-test-discovery --sanitize=thread
+      - name: Select latest available Xcode
+        uses: maxim-lobanov/[email protected]
+        with:
+          xcode-version: latest
+      - name: Checkout Fluent
+        uses: actions/checkout@v2
+      - name: Run base Fluent tests with Thread Sanitizer
+        run: swift test --enable-test-discovery --sanitize=thread

Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         .library(name: "Fluent", targets: ["Fluent"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.0.0-rc.2.4"),
+        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.0.0"),
         .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
     ],
     targets: [

README.md

@@ -6,8 +6,8 @@
     >
     <br>
     <br>
-    <a href="https://api.vapor.codes/fluent/master/Fluent/index.html">
-        <img src="http://img.shields.io/badge/api-docs-2196f3.svg" alt="Documentation">
+    <a href="https://docs.vapor.codes/4.0/">
+        <img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
     </a>
     <a href="https://discord.gg/vapor">
         <img src="https://img.shields.io/discord/431917998102675485.svg" alt="Team Chat">

Sources/Fluent/Deprecated.swift

@@ -110,7 +110,7 @@ private struct DatabaseSessionAuthenticator<User>: SessionAuthenticator
 public final class SessionRecord: Model {
     public static let schema = "_fluent_sessions"
 
-    private struct _Migration: Migration {
+    struct Create: Migration {
         func prepare(on database: Database) -> EventLoopFuture<Void> {
             database.schema("_fluent_sessions")
                 .id()
@@ -126,7 +126,7 @@ public final class SessionRecord: Model {
     }
 
     public static var migration: Migration {
-        _Migration()
+        Create()
     }
 
     @ID(key: .id)

Sources/Fluent/Fluent+Sessions.swift

@@ -4,6 +4,10 @@ import Fluent
 import Vapor
 
 final class SessionTests: XCTestCase {
+    func testSessionMigrationName() {
+        XCTAssertEqual(SessionRecord.migration.name, "Fluent.SessionRecord.Create")
+    }
+    
     func testSessions() throws {
         let app = Application(.testing)
         defer { app.shutdown() }