Skip to content

Commit c4a4223

Browse files
committed
Fixes SPM integration.
1 parent 4866057 commit c4a4223

File tree

6 files changed

+35
-25
lines changed

6 files changed

+35
-25
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ env:
1414
- BUILD="swift build"
1515
- BUILD="carthage update --platform ios && carthage build --no-skip-current --platform iOS"
1616
- BUILD="carthage update --platform tvOS && carthage build --no-skip-current --platform tvOS"
17+
- BUILD="swift test"
1718

1819
script: eval "${BUILD}"
1920

Package.pins

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

Package.resolved

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

Package.swift

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1+
// swift-tools-version:4.0
12
import PackageDescription
23

34
let package = Package(
4-
name: "RxFeedback",
5-
targets: [
6-
Target(name: "RxFeedback", dependencies: [])
7-
],
8-
dependencies: [
9-
.Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 4)
10-
]
5+
name: "RxDataSources",
6+
products: [
7+
.library(name: "RxFeedback", targets: ["RxFeedback"])
8+
],
9+
dependencies: [
10+
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.0.0")),
11+
],
12+
targets: [
13+
.target(name: "RxFeedback", dependencies: ["RxSwift", "RxCocoa"]),
14+
.testTarget(name: "RxFeedbackTests", dependencies: ["RxFeedback", "RxSwift", "RxCocoa", "RxBlocking"]),
15+
]
1116
)

Tests/RxFeedbackTests/RxFeedbackDriverTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ extension RxFeedbackDriverTests {
225225
reduce: { oldState, append in
226226
return oldState + append
227227
},
228-
feedback: bind { (stateAndScheduler) in
228+
feedback: RxFeedback.bind { (stateAndScheduler) in
229229
let results = stateAndScheduler.flatMap { state -> Signal<String> in
230230
if state == "initial" {
231231
return Signal.just("_a").delay(0.01)
@@ -268,7 +268,7 @@ extension RxFeedbackDriverTests {
268268
reduce: { oldState, append in
269269
return oldState + append
270270
},
271-
feedback: bind(owner) { (_, stateAndScheduler) in
271+
feedback: RxFeedback.bind(owner) { (_, stateAndScheduler) in
272272
let results = stateAndScheduler.flatMap { state -> Signal<String> in
273273
if state == "initial" {
274274
return Signal.just("_a").delay(0.01)

Tests/RxFeedbackTests/RxFeedbackObservableTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ extension RxFeedbackObservableTests {
254254
return oldState + append
255255
},
256256
scheduler: MainScheduler.instance,
257-
scheduledFeedback: UI.bind { (stateAndScheduler) in
257+
scheduledFeedback: RxFeedback.bind { (stateAndScheduler) in
258258
let results = stateAndScheduler.flatMap { state -> Observable<String> in
259259
if state == "initial" {
260260
return Observable.just("_a").delay(0.01, scheduler: MainScheduler.instance)
@@ -269,7 +269,7 @@ extension RxFeedbackObservableTests {
269269
return Observable.never()
270270
}
271271
}
272-
return UI.Bindings(subscriptions: [], events: [results])
272+
return Bindings(subscriptions: [], events: [results])
273273
})
274274

275275
let result = (try?
@@ -297,7 +297,7 @@ extension RxFeedbackObservableTests {
297297
return oldState + append
298298
},
299299
scheduler: MainScheduler.instance,
300-
scheduledFeedback: UI.bind(owner) { (_, stateAndScheduler) in
300+
scheduledFeedback: RxFeedback.bind(owner) { (_, stateAndScheduler) in
301301
let results = stateAndScheduler.flatMap { state -> Observable<String> in
302302
if state == "initial" {
303303
return Observable.just("_a").delay(0.01, scheduler: MainScheduler.instance)
@@ -312,7 +312,7 @@ extension RxFeedbackObservableTests {
312312
return Observable.never()
313313
}
314314
}
315-
return UI.Bindings(subscriptions: [], events: [results])
315+
return Bindings(subscriptions: [], events: [results])
316316
})
317317

318318
let result = (try?

0 commit comments

Comments
 (0)