Merge pull request #67 from MatsMoll/develop

Updated Swift version and minor improvments
MatsMoll · Mar 31, 2020 · 769c43f · 769c43f
2 parents 39e4327 + 1696ba5
commit 769c43f
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 35 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   bionic-job:
     container: 
-      image: vapor/swift:5.1-bionic
+      image: swift:5.2-bionic
       env:
         DATABASE_USER: postgres
         DATABASE_PASSWORD: postgres

diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-5.1.2
+5.2
diff --git a/Package.swift b/Package.swift
@@ -1,15 +1,15 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.2
 import PackageDescription
 import Foundation
 
 var dependencies: [Package.Dependency] = [
     // 💧 A server-side Swift web framework.
-    .package(url: "https://github.com/vapor/vapor.git", from: "3.3.1"),
+    .package(name: "Vapor", url: "https://github.com/vapor/vapor.git", from: "3.3.3"),
 
     // Encodes Form requests
-    .package(url: "https://github.com/vapor/url-encoded-form.git", from: "1.0.0"),
+    .package(name: "URLEncodedForm", url: "https://github.com/vapor/url-encoded-form.git", from: "1.0.0"),
 
-    .package(url: "https://github.com/MatsMoll/htmlkit-vapor-3-provider.git", from: "1.0.0-beta.3"),
+    .package(name: "HTMLKitVaporProvider", url: "https://github.com/MatsMoll/htmlkit-vapor-3-provider.git", from: "1.0.0-beta.3"),
 ]
 
 
@@ -25,19 +25,19 @@ case "LOCAL":
     )
 case "DEV":
     dependencies.append(contentsOf: [
-            .package(url: "https://Kognita:[email protected]/MatsMoll/KognitaCore", .branch("develop")),
-            .package(url: "https://Kognita:[email protected]/MatsMoll/KognitaPages", .branch("develop")),
-            .package(url: "https://Kognita:[email protected]/MatsMoll/kognita-rest-api", .branch("develop")),
+        .package(name: "KognitaCore", url: "https://Kognita:[email protected]/MatsMoll/KognitaCore", .branch("develop")),
+        .package(name: "KognitaViews", url: "https://Kognita:[email protected]/MatsMoll/KognitaPages", .branch("develop")),
+        .package(name: "KognitaAPI", url: "https://Kognita:[email protected]/MatsMoll/kognita-rest-api", .branch("develop")),
         ]
     )
 default:
     let coreVersion     = ProcessInfo.processInfo.environment["KOGNITA_CORE"]   ?? "2.0.0"
     let pagesVersion    = ProcessInfo.processInfo.environment["KOGNITA_PAGES"]  ?? "2.0.0"
     let apiVersion      = ProcessInfo.processInfo.environment["KOGNITA_API"]    ?? "2.0.0"
     dependencies.append(contentsOf: [
-        .package(url: "https://Kognita:[email protected]/MatsMoll/KognitaCore",       from: Version(stringLiteral: coreVersion)),
-        .package(url: "https://Kognita:[email protected]/MatsMoll/KognitaPages",      from: Version(stringLiteral: pagesVersion)),
-        .package(url: "https://Kognita:[email protected]/MatsMoll/kognita-rest-api",  from: Version(stringLiteral: apiVersion)),
+        .package(name: "KognitaCore", url: "https://Kognita:[email protected]/MatsMoll/KognitaCore",       from: Version(stringLiteral: coreVersion)),
+        .package(name: "KognitaViews", url: "https://Kognita:[email protected]/MatsMoll/KognitaPages",      from: Version(stringLiteral: pagesVersion)),
+        .package(name: "KognitaAPI", url: "https://Kognita:[email protected]/MatsMoll/kognita-rest-api",  from: Version(stringLiteral: apiVersion)),
         ]
     )
 }
@@ -50,15 +50,18 @@ let package = Package(
     dependencies: dependencies,
     targets: [
         .target(name: "App", dependencies: [
-            "KognitaCore",
-            "KognitaViews",
-            "KognitaAPI",
-            "Vapor",
-            "URLEncodedForm",
-            "HTMLKitVaporProvider",
+            .product(name: "Vapor", package: "Vapor"),
+            .product(name: "KognitaCore", package: "KognitaCore"),
+            .product(name: "KognitaViews", package: "KognitaViews"),
+            .product(name: "KognitaAPI", package: "KognitaAPI"),
+            .product(name: "URLEncodedForm", package: "URLEncodedForm"),
+            .product(name: "HTMLKitVaporProvider", package: "HTMLKitVaporProvider"),
         ]),
         .target(name: "Run", dependencies: ["App"]),
-        .testTarget(name: "AppTests", dependencies: ["App", "KognitaCoreTestable"])
+        .testTarget(name: "AppTests", dependencies: [
+            .target(name: "App"),
+            .product(name: "KognitaCoreTestable", package: "KognitaCore"),
+        ])
     ]
 )
 
diff --git a/Public/assets/css/File b/Public/assets/css/File
diff --git a/Public/assets/css/app.css b/Public/assets/css/app.css
@@ -10925,4 +10925,11 @@ div.dt-button-info {
 .text-break {
   word-break: break-word !important;
   overflow-wrap: break-word !important;
+}
+
+@media (min-width: 992px) {
+  .compendium-toc {
+    position: fixed;
+    z-index: 1030;
+  }
 }