Merge branch 'develop' into main

helje5 · helje5 · commit c984b696fb97 · 2021-01-03T21:34:33.000+01:00
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -0,0 +1,41 @@
+name: Build and Test
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "20 9 * * 1"
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      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
+    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
+  nextstep:
+    runs-on: macos-latest
+    steps:
+      - name: Select latest available Xcode
+        uses: maxim-lobanov/setup-xcode@v1.2.1
+        with:
+          xcode-version: 12.2
+      - 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
diff --git a/Makefile b/Makefile
@@ -0,0 +1,69 @@
+# Makefile
+
+# local config
+SWIFT_BUILD=swift build
+SWIFT_CLEAN=swift package clean
+SWIFT_BUILD_DIR=.build
+SWIFT_TEST=swift test
+CONFIGURATION=debug
+DOCKER=/usr/local/bin/docker
+#DOCKER=docker
+
+# docker config
+SWIFT_BUILD_IMAGE="swift:5.0"
+#SWIFT_BUILD_IMAGE="swift:5.3.1"
+#SWIFT_BUILD_IMAGE="swift:5.1.3"
+DOCKER_BUILD_DIR=".docker$(SWIFT_BUILD_DIR)"
+SWIFT_DOCKER_BUILD_DIR="$(DOCKER_BUILD_DIR)/x86_64-unknown-linux/$(CONFIGURATION)"
+DOCKER_BUILD_PRODUCT="$(DOCKER_BUILD_DIR)/$(TOOL_NAME)"
+
+
+SWIFT_SOURCES=Sources/*/*.swift
+
+all: all-native
+
+#all: docker-all
+
+all-native:
+	$(SWIFT_BUILD) -c $(CONFIGURATION)
+
+# Cannot test in `release` configuration?!
+test:
+	$(SWIFT_TEST) 
+	
+clean :
+	$(SWIFT_CLEAN)
+	# We have a different definition of "clean", might be just German
+	# pickyness.
+	rm -rf $(SWIFT_BUILD_DIR) 
+
+$(DOCKER_BUILD_PRODUCT): $(SWIFT_SOURCES)
+	$(DOCKER) run --rm \
+          -v "$(PWD):/src" \
+          -v "$(PWD)/$(DOCKER_BUILD_DIR):/src/.build" \
+          "$(SWIFT_BUILD_IMAGE)" \
+          bash -c 'cd /src && swift build -c $(CONFIGURATION)'
+
+docker-all: $(DOCKER_BUILD_PRODUCT)
+
+docker-test: docker-all
+	$(DOCKER) run --rm \
+          -v "$(PWD):/src" \
+          -v "$(PWD)/$(DOCKER_BUILD_DIR):/src/.build" \
+          "$(SWIFT_BUILD_IMAGE)" \
+          bash -c 'cd /src && swift test -c $(CONFIGURATION)'
+
+docker-clean:
+	rm $(DOCKER_BUILD_PRODUCT)	
+	
+docker-distclean:
+	rm -rf $(DOCKER_BUILD_DIR)
+
+distclean: clean docker-distclean
+
+docker-emacs:
+	$(DOCKER) run --rm -it \
+	          -v "$(PWD):/src" \
+	          -v "$(PWD)/$(DOCKER_BUILD_DIR):/src/.build" \
+	          "$(SWIFT_BUILD_IMAGE)" \
+		  emacs /src
diff --git a/Package.swift b/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
     .package(url: "https://github.com/Macro-swift/MacroExpress.git",
              from: "0.6.0"),
     .package(url: "https://github.com/AlwaysRightInstitute/SwiftXmlRpc.git",
-             from: "0.8.5")
+             from: "0.8.6")
   ],
   
   targets: [
diff --git a/Sources/MacroXmlRpc/RouteKeeper.swift b/Sources/MacroXmlRpc/RouteKeeper.swift
@@ -18,6 +18,6 @@ public extension RouteKeeper {
              ( XmlRpc.Call ) throws -> XmlRpcValueRepresentable)
        -> Self
   {
-    post(xmlrpc.synchronousCall(methodName, execute: execute))
+    return post(xmlrpc.synchronousCall(methodName, execute: execute))
   }
 }
diff --git a/Sources/MacroXmlRpc/TypedRoutes.swift b/Sources/MacroXmlRpc/TypedRoutes.swift
@@ -25,7 +25,7 @@ public extension RouteKeeper {
        where A1 : IntrospectibleXmlRpcValue,
              R  : IntrospectibleXmlRpcValue
   {
-    post(xmlrpc.synchronousCall(methodName) { call in
+    return post(xmlrpc.synchronousCall(methodName) { call in
       guard call.parameters.count == 1,
             let a1 = A1(xmlRpcValue: call.parameters[0])
        else { throw XmlRpc.Fault(code: 400, reason: "Invalid parameters") }
@@ -42,7 +42,7 @@ public extension RouteKeeper {
              A2 : IntrospectibleXmlRpcValue,
              R  : IntrospectibleXmlRpcValue
   {
-    post(xmlrpc.synchronousCall(methodName) { call in
+    return post(xmlrpc.synchronousCall(methodName) { call in
       guard call.parameters.count == 2,
             let a1 = A1(xmlRpcValue: call.parameters[0]),
             let a2 = A2(xmlRpcValue: call.parameters[1])
@@ -57,27 +57,27 @@ public extension RouteKeeper {
 
 extension String: IntrospectibleXmlRpcValue {
   @inlinable
-  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .string }
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType { return .string }
 }
 
 extension Int: IntrospectibleXmlRpcValue {
   @inlinable
-  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .int }
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType { return .int }
 }
 
 extension Double: IntrospectibleXmlRpcValue {
   @inlinable
-  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .double }
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType { return .double }
 }
 
 extension Bool: IntrospectibleXmlRpcValue {
   @inlinable
-  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .bool }
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType { return .bool }
 }
 
 extension Collection where Element : IntrospectibleXmlRpcValue {
   @inlinable
-  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .array }
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType { return .array }
 }
 
 extension Array   : IntrospectibleXmlRpcValue
@@ -94,7 +94,9 @@ extension Dictionary : IntrospectibleXmlRpcValue
           Value      : IntrospectibleXmlRpcValue
 {
   @inlinable
-  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .dictionary }
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType {
+    return .dictionary
+  }
 }
 
 #if canImport(Foundation)
@@ -103,11 +105,15 @@ extension Dictionary : IntrospectibleXmlRpcValue
   
   extension DateComponents: IntrospectibleXmlRpcValue {
     @inlinable
-    public static var xmlRpcValueType : XmlRpc.Value.ValueType { .dateTime }
+    public static var xmlRpcValueType : XmlRpc.Value.ValueType {
+      return .dateTime
+    }
   }
 
   extension URL: IntrospectibleXmlRpcValue {
     @inlinable
-    public static var xmlRpcValueType : XmlRpc.Value.ValueType { .string }
+    public static var xmlRpcValueType : XmlRpc.Value.ValueType {
+      return .string
+    }
   }
 #endif // canImport(Foundation)
diff --git a/Sources/MacroXmlRpc/ValueType.swift b/Sources/MacroXmlRpc/ValueType.swift
@@ -10,6 +10,7 @@ import protocol XmlRpc.XmlRpcValueRepresentable
 
 public extension XmlRpc.Value {
   
+  #if swift(>=5.1)
   /**
    * The various possible XML-RPC value types used in XML-RPC introspection.
    * Note that those are flat, i.e. arrays and dictionaries are not further
@@ -21,6 +22,13 @@ public extension XmlRpc.Value {
     case string, bool, int, double, dateTime, data
     case array, dictionary
   }
+  #else
+  enum ValueType: Hashable {
+    case null
+    case string, bool, int, double, dateTime, data
+    case array, dictionary
+  }
+  #endif
   
   @inlinable
   var xmlRpcValueType: ValueType {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ public extension RouteKeeper {`
`18`	`18`	`( XmlRpc.Call ) throws -> XmlRpcValueRepresentable)`
`19`	`19`	`-> Self`
`20`	`20`	`{`
`21`		`- post(xmlrpc.synchronousCall(methodName, execute: execute))`
	`21`	`+ return post(xmlrpc.synchronousCall(methodName, execute: execute))`
`22`	`22`	`}`
`23`	`23`	`}`