Support Linux (#52)

* Update test.yml * import FoundationNetworking * Update MIMEType.swift * Fix tests with MIMEType * Update OSLogging for Linux
RedMadRobot · Jan 15, 2022 · 787b830 · 787b830
1 parent d20a816
commit 787b830
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,11 +11,21 @@ on:
       - '**'
 
 jobs:
-  test:
-    name: Run tests
+  test-macos:
+    name: Test on macOS
     runs-on: macOS-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Build and test
         run: make test
+  test-linux:
+    name: Test on Linux
+    runs-on: ubuntu-20.04
+    container:
+      image: swift:5.5.1-focal
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Test catbird app
+        run: swift test --package-path Packages/CatbirdApp --disable-automatic-resolution
diff --git a/Packages/CatbirdAPI/Sources/CatbirdAPI/Catbird.swift b/Packages/CatbirdAPI/Sources/CatbirdAPI/Catbird.swift
@@ -1,5 +1,9 @@
 import Foundation
 
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
 /// API Client to mock server.
 public final class Catbird {
 

diff --git a/Packages/CatbirdAPI/Sources/CatbirdAPI/CatbirdAction.swift b/Packages/CatbirdAPI/Sources/CatbirdAPI/CatbirdAction.swift
@@ -1,5 +1,9 @@
 import Foundation
 
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
 /// Catbird API action.
 public enum CatbirdAction: Equatable {
     /// Add, or insert `ResponseMock` for `RequestPattern`.

diff --git a/Packages/CatbirdAPI/Sources/CatbirdAPI/CatbirdError.swift b/Packages/CatbirdAPI/Sources/CatbirdAPI/CatbirdError.swift
@@ -1,5 +1,9 @@
 import Foundation
 
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
 /// From `Vapor.ErrorMiddleware`.
 private struct ErrorResponse: Codable {
 

diff --git a/Packages/CatbirdAPI/Sources/CatbirdAPI/URLSessionTask+Wait.swift b/Packages/CatbirdAPI/Sources/CatbirdAPI/URLSessionTask+Wait.swift
@@ -1,5 +1,9 @@
 import Foundation
 
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
 extension URLSessionTask {
 
     /// Wait until task completed.

diff --git a/Packages/CatbirdApp/Package.resolved b/Packages/CatbirdApp/Package.resolved
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/Alexander-Ignition/OSLogging",
         "state": {
           "branch": null,
-          "revision": "295e9816de70fdea51c9ad9e674c18b01a0acfd6",
-          "version": "1.0.2"
+          "revision": "2370acda786974f59d1726c4662620b9d036a817",
+          "version": "1.0.3"
         }
       },
       {

diff --git a/Packages/CatbirdApp/Package.swift b/Packages/CatbirdApp/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
         .package(url: "https://github.com/stencilproject/Stencil.git", from: "0.14.0"),
 
         // macOS system logger
-        .package(url: "https://github.com/Alexander-Ignition/OSLogging", from: "1.0.0"),
+        .package(url: "https://github.com/Alexander-Ignition/OSLogging", from: "1.0.3"),
 
         // CatbirdAPI
         .package(name: "Catbird", path: "../../")

diff --git a/Packages/CatbirdApp/Sources/CatbirdApp/Common/Loggers.swift b/Packages/CatbirdApp/Sources/CatbirdApp/Common/Loggers.swift
@@ -1,12 +1,21 @@
+import Logging
+
+#if canImport(OSLogging)
 import OSLogging
+#endif
 
 enum Loggers {
     static let inMemoryStore = logger(category: "InMemory")
     static let fileStore = logger(category: "File")
 
     private static func logger(category: String) -> Logging.Logger {
-        Logging.Logger(label: CatbirdInfo.current.domain) {
+#if os(Linux)
+        return Logging.Logger(label: CatbirdInfo.current.domain)
+#else
+        return Logging.Logger(label: CatbirdInfo.current.domain) {
             OSLogHandler(subsystem: $0, category: category)
         }
+#endif
     }
+
 }
diff --git a/Packages/CatbirdApp/Sources/CatbirdApp/Common/MIMEType.swift b/Packages/CatbirdApp/Sources/CatbirdApp/Common/MIMEType.swift
@@ -1,7 +1,13 @@
 import Vapor
 import Foundation
+
+#if canImport(CoreServices)
 import CoreServices
+#endif
+
+#if canImport(UniformTypeIdentifiers)
 import UniformTypeIdentifiers
+#endif
 
 struct MIMEType: Equatable {
     private let string: String
@@ -11,11 +17,15 @@ struct MIMEType: Equatable {
     }
 
     var preferredFilenameExtension: String? {
+#if os(Linux)
+        return _UTType(mimeType: string)?.preferredFilenameExtension
+#else
         if #available(macOS 11.0, *) {
             return UTType(mimeType: string)?.preferredFilenameExtension
         } else {
             return _UTType(mimeType: string)?.preferredFilenameExtension
         }
+#endif
     }
 }
 
@@ -25,6 +35,25 @@ extension Vapor.Request {
     }
 }
 
+#if os(Linux)
+private struct _UTType {
+    private static let filenameExtension: [String: String] = [
+        "application/json": "json",
+        "text/html": "html",
+        "text/plain": "txt"
+    ]
+
+    var preferredFilenameExtension: String? {
+        Self.filenameExtension[mimeType]
+    }
+
+    private let mimeType: String
+
+    init?(mimeType: String) {
+        self.mimeType = mimeType
+    }
+}
+#else
 private struct _UTType {
     private let identifier: CFString
 
@@ -47,3 +76,4 @@ private struct _UTType {
         UTTypeCopyPreferredTagWithClass(identifier, tagClass)?.takeRetainedValue() as String?
     }
 }
+#endif