Modernize Package.swift

Author: pvzig

Package.swift

@@ -1,59 +1,12 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.3
 
 import PackageDescription
 
-// MARK: Targets
-
-let SlackKit: Target = .target(name: "SlackKit",
-                               dependencies: ["SKCore", "SKClient", "SKRTMAPI", "SKServer"],
-                               path: "SlackKit/Sources")
-
-let SKClient: Target = .target(name: "SKClient",
-                               dependencies: ["SKCore"],
-                               path: "SKClient/Sources")
-
-let SKCore: Target   = .target(name: "SKCore",
-                               path: "SKCore/Sources")
-
-let SKRTMAPI: Target = .target(name: "SKRTMAPI",
-                               path: "SKRTMAPI/Sources")
-
-#if os(macOS)
-SKRTMAPI.dependencies = [
-    "SKCore",
-    "SKWebAPI",
-    "Starscream",
-    "WebSocket"
-]
-#elseif os(Linux)
-SKRTMAPI.dependencies = [
-    "SKCore",
-    "SKWebAPI",
-    "WebSocket"
-]
-#elseif os(iOS) || os(tvOS)
-SKRTMAPI.dependencies = [
-    "SKCore",
-    "SKWebAPI",
-    "Starscream",
-]
-#endif
-
-let SKServer: Target = .target(name: "SKServer",
-                               dependencies: ["SKCore", "SKWebAPI", "Swifter"],
-                               path: "SKServer/Sources")
-
-let SKWebAPI: Target = .target(name: "SKWebAPI",
-                               dependencies: ["SKCore"],
-                               path: "SKWebAPI/Sources")
-
-let SlackKitTests: Target = .testTarget(name: "SlackKitTests",
-                                        dependencies: ["SlackKit", "SKCore", "SKClient", "SKRTMAPI", "SKServer"],
-                                        path: "SlackKitTests")
-// MARK: Package
-
 let package = Package(
     name: "SlackKit",
+    platforms: [
+        .macOS(.v10_11), .iOS(.v10), .tvOS(.v10)
+    ],
     products: [
         .library(name: "SlackKit", targets: ["SlackKit"]),
         .library(name: "SKClient", targets: ["SKClient"]),
@@ -62,26 +15,43 @@ let package = Package(
         .library(name: "SKServer", targets: ["SKServer"]),
         .library(name: "SKWebAPI", targets: ["SKWebAPI"])
     ],
+    dependencies: [
+        .package(name: "Swifter", url: "https://github.com/httpswift/swifter.git", .upToNextMinor(from: "1.5.0")),
+        .package(name: "WebSocket", url: "https://github.com/vapor/websocket", .upToNextMinor(from: "1.1.2")),
+        .package(name: "Starscream", url: "https://github.com/daltoniam/Starscream", .upToNextMinor(from: "4.0.4"))
+    ],
     targets: [
-        SlackKit, SKClient, SKCore, SKRTMAPI, SKServer, SKWebAPI, SlackKitTests
-    ]
+        .target(name: "SlackKit",
+                dependencies: ["SKCore", "SKClient", "SKRTMAPI", "SKServer"],
+                path: "SlackKit/Sources"),
+        .target(name: "SKClient",
+                dependencies: ["SKCore"],
+                path: "SKClient/Sources"),
+        .target(name: "SKCore",
+                path: "SKCore/Sources"),
+        .target(name: "SKRTMAPI",
+                dependencies: [
+                    "SKCore",
+                    "SKWebAPI",
+                    .product(name: "Starscream", package: "Starscream", condition: .when(platforms: [.macOS, .iOS, .tvOS])),
+                    .product(name: "WebSocket", package: "WebSocket", condition: .when(platforms: [.macOS, .linux])),
+                ],
+                path: "SKRTMAPI/Sources"),
+        .target(name: "SKServer",
+                dependencies: ["SKCore", "SKWebAPI", "Swifter"],
+                path: "SKServer/Sources"),
+        .target(name: "SKWebAPI",
+                dependencies: ["SKCore"],
+                path: "SKWebAPI/Sources"),
+        .testTarget(name: "SlackKitTests",
+                dependencies: ["SlackKit", "SKCore", "SKClient", "SKRTMAPI", "SKServer"],
+                path: "SlackKitTests",
+                exclude: [
+                    "Supporting Files"
+                ],
+                resources: [
+                    .copy("Resources")
+                ])
+    ],
+    swiftLanguageVersions: [.v5]
 )
-
-#if os(macOS)
-package.dependencies = [
-    .package(url: "https://github.com/httpswift/swifter.git", .upToNextMinor(from: "1.5.0")),
-    .package(url: "https://github.com/vapor/websocket", .upToNextMinor(from: "1.1.2")),
-    .package(url: "https://github.com/daltoniam/Starscream", .upToNextMinor(from: "4.0.4"))
-]
-#elseif os(Linux)
-package.dependencies = [
-    .package(url: "https://github.com/httpswift/swifter.git", .upToNextMinor(from: "1.5.0")),
-    .package(url: "https://github.com/vapor/websocket", .upToNextMinor(from: "1.1.2"))
-]
-#elseif os(iOS) || os(tvOS)
-package.dependencies = [
-    .package(url: "https://github.com/httpswift/swifter.git", .upToNextMinor(from: "1.5.0")),
-    .package(url: "https://github.com/daltoniam/Starscream", .upToNextMinor(from: "4.0.4"))
-]
-#endif
-