update dependencies (#24)

OguzYuuksel · Oguz Yuksel · web-flow · commit a32f85f18943 · 2025-02-07T09:57:09.000+01:00
Co-authored-by: Oguz Yuksel &lt;oguz.yueksel@teufel.de&gt;
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.9
 
 import PackageDescription
 
@@ -10,8 +10,8 @@ let package = Package(
         .library(name: "CombineWampDynamic", type: .dynamic, targets: ["CombineWamp"])
     ],
     dependencies: [
-        .package(url: "https://github.com/teufelaudio/CombineWebSocket.git", .upToNextMajor(from: "0.1.1")),
-        .package(url: "https://github.com/teufelaudio/FoundationExtensions.git", .upToNextMajor(from: "1.1.1"))
+        .package(url: "https://github.com/teufelaudio/CombineWebSocket.git", from: "0.1.0"),
+        .package(url: "https://github.com/teufelaudio/FoundationExtensions.git", from: "2.0.0")
     ],
     targets: [
         .target(
diff --git a/Sources/CombineWamp/PeerWorkflow/Client/WampCallee.swift b/Sources/CombineWamp/PeerWorkflow/Client/WampCallee.swift
@@ -38,7 +38,7 @@ public struct WampCallee: WampCalleeProtocol {
 
                     return Empty().eraseToAnyPublisher()
                 }
-                .promise(onEmpty: { .failure(.sessionIsNotValid) })
+                .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))
         }
         .map { registeredMessage -> AnyPublisher<(invocation: Message.Invocation, responder: ([ElementType]) -> Publishers.Promise<Void, ModuleError>), ModuleError> in
             messageBus
@@ -100,8 +100,7 @@ public struct WampCallee: WampCalleeProtocol {
 
                     return Empty().eraseToAnyPublisher()
                 }
-                .promise(onEmpty: { .failure(.sessionIsNotValid) })
+                .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))
         }
-        .promise
     }
 }
diff --git a/Sources/CombineWamp/PeerWorkflow/Client/WampCaller.swift b/Sources/CombineWamp/PeerWorkflow/Client/WampCaller.swift
@@ -37,8 +37,7 @@ public struct WampCaller: WampCallerProtocol {
 
                     return Empty().eraseToAnyPublisher()
                 }
-                .promise(onEmpty: { .failure(.sessionIsNotValid) })
+                .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))
         }
-        .promise
     }
 }
diff --git a/Sources/CombineWamp/PeerWorkflow/Client/WampClient.swift b/Sources/CombineWamp/PeerWorkflow/Client/WampClient.swift
@@ -103,7 +103,7 @@ public struct WampClient {
                         return .init(error: ModuleError.wampError(.protocolViolation))
                     }
                 }
-                .promise(onEmpty: { .failure(.sessionIsNotValid) })
+                .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))
         }
     }
 
@@ -137,7 +137,7 @@ public struct WampClient {
                 }
                 .first()
                 .setFailureType(to: ModuleError.self)
-                .promise(onEmpty: { .failure(.sessionIsNotValid) })
+                .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))
         }
     }
 
diff --git a/Sources/CombineWamp/PeerWorkflow/Client/WampPublisher.swift b/Sources/CombineWamp/PeerWorkflow/Client/WampPublisher.swift
@@ -37,9 +37,8 @@ public struct WampPublisher: WampPublisherProtocol {
 
                     return Empty().eraseToAnyPublisher()
                 }
-                .promise(onEmpty: { .failure(.sessionIsNotValid) })
+                .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))
         }
-        .promise
     }
 
     public func publishWithoutAck(topic: URI, positionalArguments: [ElementType]? = nil, namedArguments: [String : ElementType]? = nil)
diff --git a/Sources/CombineWamp/PeerWorkflow/Client/WampSubscriber.swift b/Sources/CombineWamp/PeerWorkflow/Client/WampSubscriber.swift
@@ -38,7 +38,7 @@ public struct WampSubscriber: WampSubscriberProtocol {
 
                     return Empty().eraseToAnyPublisher()
                 }
-                .promise(onEmpty: { .failure(.sessionIsNotValid) })
+                .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))
         }
         .map { subscribedMessage -> AnyPublisher<Message.Event, ModuleError> in
             messageBus
@@ -90,8 +90,7 @@ public struct WampSubscriber: WampSubscriberProtocol {
 
                     return Empty().eraseToAnyPublisher()
                 }
-                .promise(onEmpty: { .failure(.sessionIsNotValid) })
+                .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))
         }
-        .promise
     }
 }
diff --git a/Sources/CombineWamp/PeerWorkflow/Connection/WampSession.swift b/Sources/CombineWamp/PeerWorkflow/Connection/WampSession.swift
@@ -76,9 +76,9 @@ public class WampSession: Cancellable {
                 return self.transport
                     .send(message: message)
                     .mapError { _ in ModuleError.wampError(.networkFailure) }
-                    .promise
+
             }
-            .promise
+
     }
 
     public func cancel() {
diff --git a/Sources/CombineWamp/PeerWorkflow/Connection/WampTransport.swift b/Sources/CombineWamp/PeerWorkflow/Connection/WampTransport.swift
@@ -66,9 +66,7 @@ extension WampTransport {
                 }.eraseToAnyPublisher()
             },
             send: { message in
-                webSocket
-                    .send(message)
-                    .promise
+                Publishers.Promise(webSocket.send(message))
             }
         )
     }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public struct WampCallee: WampCalleeProtocol {`
`38`	`38`
`39`	`39`	`return Empty().eraseToAnyPublisher()`
`40`	`40`	`}`
`41`		`- .promise(onEmpty: { .failure(.sessionIsNotValid) })`
	`41`	`+ .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))`
`42`	`42`	`}`
`43`	`43`	`.map { registeredMessage -> AnyPublisher<(invocation: Message.Invocation, responder: ([ElementType]) -> Publishers.Promise<Void, ModuleError>), ModuleError> in`
`44`	`44`	`messageBus`
`@@ -100,8 +100,7 @@ public struct WampCallee: WampCalleeProtocol {`
`100`	`100`
`101`	`101`	`return Empty().eraseToAnyPublisher()`
`102`	`102`	`}`
`103`		`- .promise(onEmpty: { .failure(.sessionIsNotValid) })`
	`103`	`+ .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))`
`104`	`104`	`}`
`105`		`- .promise`
`106`	`105`	`}`
`107`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,7 @@ public struct WampCaller: WampCallerProtocol {`
`37`	`37`
`38`	`38`	`return Empty().eraseToAnyPublisher()`
`39`	`39`	`}`
`40`		`- .promise(onEmpty: { .failure(.sessionIsNotValid) })`
	`40`	`+ .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))`
`41`	`41`	`}`
`42`		`- .promise`
`43`	`42`	`}`
`44`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public struct WampClient {`
`103`	`103`	`return .init(error: ModuleError.wampError(.protocolViolation))`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`- .promise(onEmpty: { .failure(.sessionIsNotValid) })`
	`106`	`+ .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`@@ -137,7 +137,7 @@ public struct WampClient {`
`137`	`137`	`}`
`138`	`138`	`.first()`
`139`	`139`	`.setFailureType(to: ModuleError.self)`
`140`		`- .promise(onEmpty: { .failure(.sessionIsNotValid) })`
	`140`	`+ .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,8 @@ public struct WampPublisher: WampPublisherProtocol {`
`37`	`37`
`38`	`38`	`return Empty().eraseToAnyPublisher()`
`39`	`39`	`}`
`40`		`- .promise(onEmpty: { .failure(.sessionIsNotValid) })`
	`40`	`+ .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))`
`41`	`41`	`}`
`42`		`- .promise`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`public func publishWithoutAck(topic: URI, positionalArguments: [ElementType]? = nil, namedArguments: [String : ElementType]? = nil)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public struct WampSubscriber: WampSubscriberProtocol {`
`38`	`38`
`39`	`39`	`return Empty().eraseToAnyPublisher()`
`40`	`40`	`}`
`41`		`- .promise(onEmpty: { .failure(.sessionIsNotValid) })`
	`41`	`+ .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))`
`42`	`42`	`}`
`43`	`43`	`.map { subscribedMessage -> AnyPublisher<Message.Event, ModuleError> in`
`44`	`44`	`messageBus`
`@@ -90,8 +90,7 @@ public struct WampSubscriber: WampSubscriberProtocol {`
`90`	`90`
`91`	`91`	`return Empty().eraseToAnyPublisher()`
`92`	`92`	`}`
`93`		`- .promise(onEmpty: { .failure(.sessionIsNotValid) })`
	`93`	`+ .eraseToPromise(onEmpty: .failure(.sessionIsNotValid))`
`94`	`94`	`}`
`95`		`- .promise`
`96`	`95`	`}`
`97`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,9 @@ public class WampSession: Cancellable {`
`76`	`76`	`return self.transport`
`77`	`77`	`.send(message: message)`
`78`	`78`	`.mapError { _ in ModuleError.wampError(.networkFailure) }`
`79`		`- .promise`
	`79`	`+`
`80`	`80`	`}`
`81`		`- .promise`
	`81`	`+`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public func cancel() {`
Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,7 @@ extension WampTransport {`
`66`	`66`	`}.eraseToAnyPublisher()`
`67`	`67`	`},`
`68`	`68`	`send: { message in`
`69`		`- webSocket`
`70`		`- .send(message)`
`71`		`- .promise`
	`69`	`+ Publishers.Promise(webSocket.send(message))`
`72`	`70`	`}`
`73`	`71`	`)`
`74`	`72`	`}`