swift5

Cartfile

@@ -1 +1 @@
-github "antitypical/Result" ~> 3.2.0
+github "antitypical/Result" ~> 4.1.0

JSONRPCKit.xcodeproj/project.pbxproj

@@ -219,6 +219,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -445,7 +446,7 @@
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -467,7 +468,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.bricklife.JSONRPCKit;
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

JSONRPCKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Sources/JSONRPCKit/Batch.swift

@@ -40,7 +40,7 @@ public struct Batch1<Request: JSONRPCKit.Request>: Batch {
     }
 
     public static func responses(from results: Results) throws -> Responses {
-        return try results.dematerialize()
+        return try results.get()
     }
 }
 
@@ -85,8 +85,8 @@ public struct Batch2<Request1: Request, Request2: Request>: Batch {
 
     public static func responses(from results: Results) throws -> Responses {
         return (
-            try results.0.dematerialize(),
-            try results.1.dematerialize()
+            try results.0.get(),
+            try results.1.get()
         )
     }
 }
@@ -137,9 +137,9 @@ public struct Batch3<Request1: Request, Request2: Request, Request3: Request>: B
 
     public static func responses(from results: Results) throws -> Responses {
         return (
-            try results.0.dematerialize(),
-            try results.1.dematerialize(),
-            try results.2.dematerialize()
+            try results.0.get(),
+            try results.1.get(),
+            try results.2.get()
         )
     }
 }
@@ -195,10 +195,10 @@ public struct Batch4<Request1: Request, Request2: Request, Request3: Request, Re
 
     public static func responses(from results: Results) throws -> Responses {
         return (
-            try results.0.dematerialize(),
-            try results.1.dematerialize(),
-            try results.2.dematerialize(),
-            try results.3.dematerialize()
+            try results.0.get(),
+            try results.1.get(),
+            try results.2.get(),
+            try results.3.get()
         )
     }
 }
@@ -259,11 +259,11 @@ public struct Batch5<Request1: Request, Request2: Request, Request3: Request, Re
 
     public static func responses(from results: Results) throws -> Responses {
         return (
-            try results.0.dematerialize(),
-            try results.1.dematerialize(),
-            try results.2.dematerialize(),
-            try results.3.dematerialize(),
-            try results.4.dematerialize()
+            try results.0.get(),
+            try results.1.get(),
+            try results.2.get(),
+            try results.3.get(),
+            try results.4.get()
         )
     }
 }
@@ -329,12 +329,12 @@ public struct Batch6<Request1: Request, Request2: Request, Request3: Request, Re
 
     public static func responses(from results: Results) throws -> Responses {
         return (
-            try results.0.dematerialize(),
-            try results.1.dematerialize(),
-            try results.2.dematerialize(),
-            try results.3.dematerialize(),
-            try results.4.dematerialize(),
-            try results.5.dematerialize()
+            try results.0.get(),
+            try results.1.get(),
+            try results.2.get(),
+            try results.3.get(),
+            try results.4.get(),
+            try results.5.get()
         )
     }
 }

Sources/JSONRPCKit/BatchElement.swift

@@ -26,7 +26,7 @@ internal protocol BatchElementProcotol {
 
 internal extension BatchElementProcotol {
     /// - Throws: JSONRPCError
-    internal func response(from object: Any) throws -> Request.Response {
+    func response(from object: Any) throws -> Request.Response {
         switch result(from: object) {
         case .success(let response):
             return response
@@ -37,7 +37,7 @@ internal extension BatchElementProcotol {
     }
 
     /// - Throws: JSONRPCError
-    internal func response(from objects: [Any]) throws -> Request.Response {
+    func response(from objects: [Any]) throws -> Request.Response {
         switch result(from: objects) {
         case .success(let response):
             return response
@@ -47,7 +47,7 @@ internal extension BatchElementProcotol {
         }
     }
 
-    internal func result(from object: Any) -> Result<Request.Response, JSONRPCError> {
+    func result(from object: Any) -> Result<Request.Response, JSONRPCError> {
         guard let dictionary = object as? [String: Any] else {
             return .failure(.unexpectedTypeObject(object))
         }
@@ -80,9 +80,9 @@ internal extension BatchElementProcotol {
         }
     }
 
-    internal func result(from objects: [Any]) -> Result<Request.Response, JSONRPCError> {
+    func result(from objects: [Any]) -> Result<Request.Response, JSONRPCError> {
         let matchedObject = objects
-            .flatMap { $0 as? [String: Any] }
+            .compactMap { $0 as? [String: Any] }
             .filter { $0["id"].flatMap(Id.init) == id }
             .first
 
@@ -95,19 +95,19 @@ internal extension BatchElementProcotol {
 }
 
 internal extension BatchElementProcotol where Request.Response == Void {
-    internal func response(_ object: Any) throws -> Request.Response {
+    func response(_ object: Any) throws -> Request.Response {
         return ()
     }
 
-    internal func response(_ objects: [Any]) throws -> Request.Response {
+    func response(_ objects: [Any]) throws -> Request.Response {
         return ()
     }
 
-    internal func result(_ object: Any) -> Result<Request.Response, JSONRPCError> {
+    func result(_ object: Any) -> Result<Request.Response, JSONRPCError> {
         return .success(())
     }
 
-    internal func result(_ objects: [Any]) -> Result<Request.Response, JSONRPCError> {
+    func result(_ objects: [Any]) -> Result<Request.Response, JSONRPCError> {
         return .success(())
     }
 }

Sources/JSONRPCKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.0</string>
+	<string>5.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/JSONRPCKit/Request.swift

@@ -21,25 +21,25 @@ public protocol Request {
 }
 
 public extension Request {
-    public var parameters: Any? {
+    var parameters: Any? {
         return nil
     }
 
-    public var extendedFields: [String: Any]? {
+    var extendedFields: [String: Any]? {
         return nil
     }
 
-    public var isNotification: Bool {
+    var isNotification: Bool {
         return false
     }
 }
 
 public extension Request where Response == Void {
-    public var isNotification: Bool {
+    var isNotification: Bool {
         return true
     }
 
-    public func response(from resultObject: Any) throws -> Response {
+    func response(from resultObject: Any) throws -> Response {
         return ()
     }
 }