Skip to content

Commit 372675e

Browse files
committed
Add PackageConfig
1 parent 871259f commit 372675e

File tree

8 files changed

+67
-45
lines changed

8 files changed

+67
-45
lines changed

Package.resolved

Lines changed: 37 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ let package = Package(
3232
// Development
3333
.package(url: "https://github.com/Quick/Nimble.git", .exact("8.0.2")), // dev
3434
.package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.35.8"), // dev
35-
.package(url: "https://github.com/jpsim/SourceKitten", .exact("0.25.0")), // dev
35+
.package(url: "https://github.com/jpsim/SourceKitten", from: "0.26.0"), // dev
3636
.package(url: "https://github.com/shibapm/Rocket", from: "0.4.0"), // dev
3737
.package(url: "https://github.com/Realm/SwiftLint", from: "0.35.0"), // dev
38-
.package(url: "https://github.com/eneko/SourceDocs", from: "0.5.1"), // dev
38+
.package(url: "https://github.com/eneko/SourceDocs", from: "0.6.1"), // dev
3939
.package(url: "https://github.com/shibapm/PackageConfig.git", from: "0.12.2"), // dev
4040
.package(url: "https://github.com/shibapm/Komondor.git", from: "1.0.0"), // dev
4141
],

Sources/Mini/Promise.swift

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -216,21 +216,15 @@ extension Promise where T == () {
216216
public convenience init() {
217217
self.init(box: SealedBox<Result<Void, Error>>(value: .success(())))
218218
}
219-
}
220219

221-
extension Promise: Equatable where T == () {
222-
public static func == (_: Promise<T>, _: Promise<T>) -> Bool {
223-
return true
220+
public static func empty() -> Promise<T> {
221+
self.init()
224222
}
225223
}
226224

227-
extension Promise where T == Never {
228-
public class func never() -> Promise<T> {
229-
self.init(with: PreSealedBox())
230-
}
231-
232-
public static func == (_: Promise<Never>, _: Promise<Never>) -> Bool {
233-
return true
225+
extension Promise: Equatable where T == () {
226+
public static func == (lhs: Promise<T>, rhs: Promise<T>) -> Bool {
227+
return ObjectIdentifier(lhs) == ObjectIdentifier(rhs)
234228
}
235229
}
236230

Sources/Mini/Utils/PayloadAction.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public protocol PayloadAction {
2424

2525
public protocol CompletableAction: Action & PayloadAction {}
2626

27-
public protocol EmptyAction: Action & PayloadAction where Payload == Swift.Never {
28-
init(promise: Promise<Never>)
27+
public protocol EmptyAction: Action & PayloadAction where Payload == Swift.Void {
28+
init(promise: Promise<Void>)
2929
}
3030

3131
public extension EmptyAction {

Sources/Mini/Utils/RxSwift/PrimitiveSequenceType+Extensions.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public extension PrimitiveSequenceType where Trait == CompletableTrait, Element
9797
let subscription = subscribe { completable in
9898
switch completable {
9999
case .completed:
100-
let action = A(promise: .never())
100+
let action = A(promise: .empty())
101101
dispatcher.dispatch(action, mode: mode)
102102
case let .error(error):
103103
let action = A(promise: .error(error))
@@ -113,7 +113,7 @@ public extension PrimitiveSequenceType where Trait == CompletableTrait, Element
113113
let subscription = self.subscribe { event in
114114
switch event {
115115
case .completed:
116-
let action = A(promise: .never())
116+
let action = A(promise: .empty())
117117
single(.success(action))
118118
case let .error(error):
119119
let action = A(promise: .error(error))

Tests/MiniSwiftTests/PromiseTests.swift

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,8 @@ class PromiseTests: XCTestCase {
9090

9191
XCTAssertFalse(promise.value! == 2)
9292

93-
let neverPromise: Promise<Never> = .never()
94-
9593
XCTAssertTrue(promise.isCompleted)
9694

97-
neverPromise.reject(Error.dummy)
98-
9995
XCTAssertTrue(promise.error == nil)
10096
}
10197

@@ -121,10 +117,23 @@ class PromiseTests: XCTestCase {
121117
}
122118

123119
func test_equality_completed() {
124-
let promise1: Promise<Never> = .never()
125-
let promise2: Promise<Never> = .never()
120+
let promise1: Promise<Void> = .empty()
121+
let promise2: Promise<Void> = .empty()
126122

127-
XCTAssertTrue(promise1 == promise2)
123+
let promise3 = promise1
124+
125+
XCTAssertFalse(promise1 == promise2)
126+
XCTAssertTrue(promise1 == promise3)
127+
}
128+
129+
func test_empty_resolution() {
130+
let promise: Promise<Void> = .empty()
131+
132+
let resolution = promise.resolve(.success(()))
133+
134+
XCTAssertNotNil(resolution)
135+
136+
XCTAssertTrue(promise.isResolved)
128137
}
129138

130139
func test_promise_properties() {

Tests/MiniSwiftTests/RxTests/PrimitiveSequenceTypeTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ final class PrimitiveSequenceTypeTests: XCTestCase {
5757
}
5858

5959
class TestEmptyAction: EmptyAction {
60-
let promise: Promise<Never>
60+
let promise: Promise<Void>
6161

62-
required init(promise: Promise<Never>) {
62+
required init(promise: Promise<Void>) {
6363
self.promise = promise
6464
}
6565

Tests/MiniSwiftTests/XCTestManifests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
// `swift test --generate-linuxmain`
7272
// to regenerate.
7373
static let __allTests__PromiseTests = [
74+
("test_empty_resolution", test_empty_resolution),
7475
("test_equality_completed", test_equality_completed),
7576
("test_equality_error", test_equality_error),
7677
("test_equality_pending", test_equality_pending),

0 commit comments

Comments
 (0)