Merge branch 'develop'

Author: helje5

.github/workflows/swift.yml

@@ -13,11 +13,10 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - swift:5.0.3-xenial
-          - swift:5.1.5-xenial
           - swift:5.2.5-xenial
           - swift:5.3.2-xenial
           - swift:5.3.2-bionic
+          - swift:5.5.0-focal
     container: ${{ matrix.image }}
     steps:
       - name: Checkout Repository
@@ -34,7 +33,7 @@ jobs:
       - name: Select latest available Xcode
         uses: maxim-lobanov/[email protected]
         with:
-          xcode-version: 12.2
+          xcode-version: 13
       - name: Checkout Repository
         uses: actions/checkout@v2
       - name: Build Swift Debug Package

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.2
 
 import PackageDescription
 
@@ -17,34 +17,50 @@ let package = Package(
 
   dependencies: [
     .package(url: "https://github.com/Macro-swift/Macro.git",
-             from: "0.8.9"),
+             from: "0.8.11"),
     .package(url: "https://github.com/AlwaysRightInstitute/mustache.git",
              from: "1.0.1")
   ],
 
   targets: [
-    .target(name: "mime",    dependencies: []),
-    .target(name: "dotenv",  dependencies: [ "MacroCore", "fs" ]),
-    .target(name: "multer",
-            dependencies: [ "MacroCore", "fs", "http", "mime", "connect" ]),
-    .target(name: "connect",
-            dependencies: [ "MacroCore", "http", "fs", "mime" ]),
-    .target(name: "express",
-            dependencies: [
-              "MacroCore", "http", "fs",
-              "connect",   "mime", "mustache"
-            ]),
-    .target(name: "MacroExpress",
-            dependencies: [ 
-              "MacroCore", "xsys", "http",    "fs",
-              "dotenv",    "mime", "connect", "express", "multer"
-            ]),
+    .target(name: "mime",   dependencies: []),
+    .target(name: "dotenv", dependencies: [ 
+      .product(name: "MacroCore", package: "Macro"), 
+      .product(name: "fs", package: "Macro") 
+    ]),
+    .target(name: "multer", dependencies: [ 
+      .product(name: "MacroCore", package: "Macro"), 
+      .product(name: "fs",        package: "Macro"),
+      .product(name: "http",      package: "Macro"),
+      "mime", "connect" 
+    ]),
+    .target(name: "connect", dependencies: [ 
+      .product(name: "MacroCore", package: "Macro"), 
+      .product(name: "fs",        package: "Macro"),
+      .product(name: "http",      package: "Macro"),
+      "mime" 
+    ]),
+    .target(name: "express", dependencies: [
+      .product(name: "MacroCore", package: "Macro"),
+      .product(name: "fs",        package: "Macro"),
+      .product(name: "http",      package: "Macro"),
+      "connect",   "mime", "mustache"
+    ]),
+    .target(name: "MacroExpress", dependencies: [ 
+      .product(name: "MacroCore", package: "Macro"), 
+      .product(name: "fs",        package: "Macro"),
+      .product(name: "http",      package: "Macro"),
+      .product(name: "xsys",      package: "Macro"),
+      "dotenv", "mime", "connect", "express", "multer"
+    ]),
 
     .testTarget(name: "mimeTests",       dependencies: [ "mime"    ]),
     .testTarget(name: "multerTests",     dependencies: [ "multer"  ]),
     .testTarget(name: "bodyParserTests", dependencies: [ "connect", "Macro" ]),
     .testTarget(name: "dotenvTests",     dependencies: [ "dotenv"  ]),
-    .testTarget(name: "RouteTests",
-                dependencies: [ "express", "MacroTestUtilities" ])
+    .testTarget(name: "RouteTests", dependencies: [
+      .product(name: "MacroTestUtilities", package: "Macro"),
+      "express"
+    ])
   ]
 )