Skip to content

Commit 1139580

Browse files
committed
Use multipeer middleware from SPM
1 parent 56c1f59 commit 1139580

File tree

67 files changed

+66
-2033
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+66
-2033
lines changed

MonitoredAppMiddleware/Package.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ let package = Package(
1212
.library(name: "MonitoredAppMiddleware", targets: ["MonitoredAppMiddleware"])
1313
],
1414
dependencies: [
15-
.package(name: "MultipeerCombine", path: "../MultipeerCombine"),
16-
.package(name: "MultipeerRedux", path: "../MultipeerRedux"),
17-
.package(name: "CombineRex", url: "https://github.com/SwiftRex/SwiftRex.git", from: "0.7.0")
15+
.package(name: "CombineRex", url: "https://github.com/SwiftRex/SwiftRex.git", from: "0.7.0"),
16+
.package(name: "MultipeerMiddleware", url: "https://github.com/SwiftRex/MultipeerMiddleware.git", .branch("master"))
1817
],
1918
targets: [
20-
.target(name: "MonitoredAppMiddleware", dependencies: ["MultipeerCombine", "MultipeerRedux", "CombineRex"]),
19+
.target(name: "MonitoredAppMiddleware", dependencies: ["CombineRex", "MultipeerMiddleware"]),
2120
.testTarget(name: "MonitoredAppMiddlewareTests", dependencies: ["MonitoredAppMiddleware"])
2221
]
23-
)
22+
)

MonitoredAppMiddleware/Sources/MonitoredAppMiddleware/.sourcery.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ templates:
55
output:
66
CodeGen
77
args:
8-
imports: ["MultipeerConnectivity", "MultipeerRedux"]
8+
imports: ["MultipeerConnectivity", "MultipeerMiddleware"]
99
testable-imports: []

MonitoredAppMiddleware/Sources/MonitoredAppMiddleware/CodeGen/AutoMockable.generated.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ import AppKit
1111
#endif
1212

1313
import MultipeerConnectivity
14-
import MultipeerRedux
14+
import MultipeerMiddleware
1515

MonitoredAppMiddleware/Sources/MonitoredAppMiddleware/CodeGen/EnumCodable.generated.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44

55
import MultipeerConnectivity
6-
import MultipeerRedux
6+
import MultipeerMiddleware
77
extension MessageType: Codable {
88
enum CodingKeys: String, CodingKey {
99
case type

MonitoredAppMiddleware/Sources/MonitoredAppMiddleware/CodeGen/Prism.generated.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44

55
import MultipeerConnectivity
6-
import MultipeerRedux
6+
import MultipeerMiddleware

MonitoredAppMiddleware/Sources/MonitoredAppMiddleware/CodeGen/TypeErase.generated.abstract.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// DO NOT EDIT
33

44
import MultipeerConnectivity
5-
import MultipeerRedux
5+
import MultipeerMiddleware
66
@inline(never)
77
private func _abstract(file: StaticString = #file, line: UInt = #line) -> Never {
88
fatalError("Method must be overridden", file: file, line: line)

MonitoredAppMiddleware/Sources/MonitoredAppMiddleware/CodeGen/TypeErase.generated.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44

55
import MultipeerConnectivity
6-
import MultipeerRedux
6+
import MultipeerMiddleware
77

MonitoredAppMiddleware/Sources/MonitoredAppMiddleware/MonitoredAppMiddleware.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Combine
22
import Foundation
33
import MultipeerCombine
44
import MultipeerConnectivity
5-
import MultipeerRedux
5+
import MultipeerMiddleware
66
import SwiftRex
77

88
public final class MonitoredAppMiddleware<Action, State>: Middleware {

MultipeerCombine/.swiftpm/xcode/xcshareddata/xcschemes/MultipeerCombine.xcscheme

Lines changed: 0 additions & 77 deletions
This file was deleted.

MultipeerCombine/Package.swift

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)