Merge branch 'develop'

Author: helje5

.github/workflows/swift.yml

@@ -2,22 +2,43 @@ name: Build and Test
 
 on:
   push:
-    branches:
-      - develop
-      - main
   pull_request:
-    branches: [ develop ]
   schedule:
-  - cron: "0 9 * * 1"
+    - cron: "35 9 * * 1"
 
 jobs:
-  build:
-
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        image:
+          - 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
+        uses: actions/checkout@v2
+      - name: Build Swift Debug Package
+        run: swift build -c debug
+      - name: Build Swift Release Package
+        run: swift build -c release
+      - name: Run Tests
+        run: swift test
+  nextstep:
     runs-on: macos-latest
-
     steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: swift build -v
-    - name: Run tests
-      run: swift test -v
+      - name: Select latest available Xcode
+        uses: maxim-lobanov/setup-xcode@v1.2.1
+        with:
+          xcode-version: 13
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Build Swift Debug Package
+        run: swift build -c debug
+      - name: Build Swift Release Package
+        run: swift build -c release
+      - name: Run Tests
+        run: swift test

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.2
 
 import PackageDescription
 
@@ -16,15 +16,19 @@ let package = Package(
 
   dependencies: [
     .package(url: "https://github.com/Macro-swift/Macro.git",
-             from: "0.5.7"),
+             from: "0.8.11"),
     .package(url: "https://github.com/Macro-swift/MacroExpress.git",
-             from: "0.5.7")
+             from: "0.8.8")
   ],
 
   targets: [
-    .target    (name: "MacroApp",
-                dependencies: [ "MacroCore", "MacroExpress"      ]),
-    .testTarget(name: "MacroAppTests",
-                dependencies: [ "MacroApp", "MacroTestUtilities" ])
+    .target(name: "MacroApp", dependencies: [ 
+      .product(name: "MacroCore", package: "Macro"), 
+      "MacroExpress"
+    ]),
+    .testTarget(name: "MacroAppTests", dependencies: [ 
+      .product(name: "MacroTestUtilities", package: "Macro"),
+      "MacroApp"
+    ])
   ]
 )

Sources/MacroApp/Builder/EndpointsBuilder.swift

@@ -2,13 +2,20 @@
 //  MacroApp
 //
 //  Created by Helge Heß.
-//  Copyright © 2020 ZeeZide GmbH. All rights reserved.
+//  Copyright © 2020-2021 ZeeZide GmbH. All rights reserved.
 //
 
+#if swift(>=5.5.0)
 /**
- * The function builder to trigger building of `Endpoint` elements.
- */
-@_functionBuilder public struct EndpointsBuilder {}
+   * The function builder to trigger building of `Endpoint` elements.
+   */
+  @resultBuilder public struct EndpointsBuilder {}
+#else
+  /**
+   * The function builder to trigger building of `Endpoint` elements.
+   */
+  @_functionBuilder public struct EndpointsBuilder {}
+#endif
 
 public extension EndpointsBuilder {
 

Sources/MacroApp/ReExports.swift

@@ -66,5 +66,7 @@ public typealias querystring = QueryStringModule
 
 // MARK: - Process stuff
 
+@inlinable
 public var argv : [ String ]          { return process.argv }
+@inlinable
 public var env  : [ String : String ] { return process.env  }