Merge branch 'develop'

Author: helje5

.github/workflows/swift.yml

@@ -13,11 +13,9 @@ 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 +32,7 @@ jobs:
       - name: Select latest available Xcode
         uses: maxim-lobanov/setup-xcode@v1.2.1
         with:
-          xcode-version: 12.2
+          xcode-version: 13
       - name: Checkout Repository
         uses: actions/checkout@v2
       - name: Build Swift Debug Package

Package.swift

@@ -17,14 +17,14 @@ let package = Package(
 
   dependencies: [
     .package(url: "https://github.com/apple/swift-nio.git",
-             from: "2.25.1"),
+             from: "2.33.0"),
     /* use this for proper 100-continue until 
        https://github.com/apple/swift-nio/pull/1330 is working:
       .package(url: "file:///Users/helge/dev/Swift/NIO/swift-nio-helje5",
                .branch("feature/100-continue")),
     */
     .package(url: "https://github.com/apple/swift-log.git",
-             from: "1.4.0")
+             from: "1.4.2")
   ],
 
   targets: [

Sources/MacroCore/JSON.swift

@@ -156,9 +156,7 @@ public let _defaultJSONEncoderOptions : JSONEncoder.OutputFormatting = {
 
 // MARK: - JSON Streams
 
-public extension WritableStreamType where WritablePayload == Buffer,
-                                          Self : ErrorEmitterTarget
-{
+public extension WritableStreamType where WritablePayload == Buffer {
 
   @discardableResult
   @inlinable

Sources/MacroCore/Process/Process.swift

@@ -35,14 +35,14 @@ public extension process { // File System
 
   @inlinable
   static func cwd() -> String {
-    let rc = xsys.getcwd(nil /* malloc */, 0)
-    assert(rc != nil, "process has no cwd??")
-    defer { free(rc) }
-    guard rc != nil else { return "" }
-    
-    let s = String(validatingUTF8: rc!)
+    let pathMaybe = xsys.getcwd(nil /* malloc */, 0)
+    assert(pathMaybe != nil, "process has no cwd??")
+    guard let path = pathMaybe else { return "" }
+    defer { free(path) }
+
+    let s = String(validatingUTF8: path)
     assert(s != nil, "could not convert cwd to String?!")
-    return s!
+    return s ?? "/tmp"
   }
 }
 

Tests/MacroTests/AgentTests.swift

@@ -14,7 +14,7 @@ final class AgentTests: XCTestCase {
     let exp = expectation(description: "get result")
 
     http.get("https://zeezide.de") { res in
-      XCTAssertEqual(res.statusCode, 200)
+      XCTAssertEqual(res.statusCode, 200, "Status code is not 200!")
 
       res.onError { error in
         XCTAssert(false, "an error happened: \(error)")
@@ -23,8 +23,10 @@ final class AgentTests: XCTestCase {
       res | concat { buffer in
         do {
           let s = try buffer.toString()
-          XCTAssert(s.contains("<html"))
-          XCTAssert(s.contains("ZeeZide"))
+          XCTAssert(s.contains("<html"),
+                    "buffer does not start w/ <html: \(s)")
+          XCTAssert(s.contains("ZeeZide"),
+                    "buffer does not contain ZeeZide: \(s)")
         }
         catch {
           XCTAssert(false, "failed to grab string: \(error)")