Better handling of platform-specific dependencies in the package manifest, bump WatchDuck verison in the UI

Author: BertanT

Package.swift

@@ -21,18 +21,38 @@
 
 import PackageDescription
 
-#if os(macOS)
+// This is quite janky, but it's more streamlined than redefining the manifest for each platform
+// We are using the prebuilt binary for SwiftLint, which is not statically linked and is not portable across
+// different Linux distributions than the ones used in their Docker image. Since WatchDuck is designed to be a
+// portable binary, SwiftLint is simply omitted from Linux builds. This is okay since the WatchDuck CI always
+// runs on a macOS machine, and the Linux binaries are cross-compiled statically. We could build SwiftLint from
+// source as part of the WatchDuck build process, but that would add too much overhead and get annoying pretty quickly. :}
+func platformDependencies() -> [Package.Dependency] {
+    #if os(macOS)
+    return [Package.Dependency.package(url: "https://github.com/SimplyDanny/SwiftLintPlugins", revision: "a60b5704f335fc18aa3aea3564c74774a338425f")]
+    #else
+    return []
+    #endif
+}
+
+func platformPlugins() -> [Target.PluginUsage] {
+    #if os(macOS)
+    return [Target.PluginUsage.plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLintPlugins")]
+    #else
+    return []
+    #endif
+}
+
 let package = Package(
     name: "WatchDuck",
     platforms: [.macOS(.v12)],
     dependencies: [
-            .package(url: "https://github.com/apple/swift-argument-parser.git", revision: "1.5.0"),
-            .package(url: "https://github.com/jpsim/Yams.git", revision: "5.3.1"),
-            .package(url: "https://github.com/JohnSundell/Plot.git", revision: "0.14.0"),
-            .package(url: "https://github.com/JohnSundell/ShellOut.git", revision: "2.3.0"),
-            .package(url: "https://github.com/SimplyDanny/SwiftLintPlugins", revision: "0.58.2"),
-            .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0")
-    ],
+            .package(url: "https://github.com/apple/swift-argument-parser.git", revision: "41982a3656a71c768319979febd796c6fd111d5c"),
+            .package(url: "https://github.com/jpsim/Yams.git", revision: "b4b8042411dc7bbb696300a34a4bf3ba1b7ad19b"),
+            .package(url: "https://github.com/JohnSundell/Plot.git", revision: "271926b4413fe868739d99f5eadcf2bd6cd62fb8"),
+            .package(url: "https://github.com/JohnSundell/ShellOut.git", revision: "e1577acf2b6e90086d01a6d5e2b8efdaae033568"),
+            .package(url: "https://github.com/swiftlang/swift-docc-plugin", revision: "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64")
+    ] + platformDependencies(),
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
         // Targets can depend on other targets in this package and products from dependencies.
@@ -42,39 +62,12 @@ let package = Package(
                             .product(name: "ArgumentParser", package: "swift-argument-parser"),
                             .product(name: "Yams", package: "Yams"),
                             .product(name: "Plot", package: "plot"),
-                            .product(name: "ShellOut", package: "ShellOut")
+                            .product(name: "ShellOut", package: "ShellOut"),
             ],
             resources: [
                 .copy("Resources")
             ],
-            plugins: [.plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLintPlugins")]
-            
-        )
-    ]
-)
-#else
-let package = Package(
-    name: "WatchDuck",
-    platforms: [.macOS(.v12)],
-    dependencies: [
-            .package(url: "https://github.com/apple/swift-argument-parser.git", revision: "1.5.0"),
-            .package(url: "https://github.com/jpsim/Yams.git", revision: "5.1.3"),
-            .package(url: "https://github.com/JohnSundell/Plot.git", revision: "0.14.0"),
-            .package(url: "https://github.com/JohnSundell/ShellOut.git", revision: "2.3.0")
-    ],
-    targets: [
-        .executableTarget(
-            name: "watchduck",
-            dependencies: [
-                            .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                            .product(name: "Yams", package: "Yams"),
-                            .product(name: "Plot", package: "plot"),
-                            .product(name: "ShellOut", package: "ShellOut")
-            ],
-            resources: [
-                .copy("Resources")
-            ]
+            plugins: [] + platformPlugins()
         )
     ]
 )
-#endif

Sources/Data/PackageResources.swift

@@ -30,7 +30,7 @@ enum PackageResources {
     static let abstract = "Lightweight web service monitor and static status page generator."
 
     /// The current Semantic Version of WatchDuck
-    static let version = "v0.1.0"
+    static let version = "v0.1.4"
 
     /// The current JSON API revision. This needs to match for a previous log file to be initialized.
     static let apiRevision = 0