Fixes SPM integration.

NoTests · Oct 22, 2017 · c4a4223 · c4a4223
1 parent 4866057
commit c4a4223
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,7 @@ env:
   - BUILD="swift build"
   - BUILD="carthage update --platform ios && carthage build --no-skip-current --platform iOS"
   - BUILD="carthage update --platform tvOS && carthage build --no-skip-current --platform tvOS"
+  - BUILD="swift test"
 
 script: eval "${BUILD}"
 

diff --git a/Package.pins b/Package.pins
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "RxSwift",
+        "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "12cccb171ad9038251af6883807f0290c1d75a5b",
+          "version": "4.0.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
@@ -1,11 +1,16 @@
+// swift-tools-version:4.0
 import PackageDescription
 
 let package = Package(
-    name: "RxFeedback",
-    targets: [
-        Target(name: "RxFeedback", dependencies: [])
-    ],
-    dependencies: [
-        .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 4)
-    ]
+  name: "RxDataSources",
+  products: [
+    .library(name: "RxFeedback", targets: ["RxFeedback"])
+  ],
+  dependencies: [
+    .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.0.0")),
+  ],
+  targets: [
+    .target(name: "RxFeedback", dependencies: ["RxSwift", "RxCocoa"]),
+    .testTarget(name: "RxFeedbackTests", dependencies: ["RxFeedback", "RxSwift", "RxCocoa", "RxBlocking"]),
+  ]
 )
diff --git a/Tests/RxFeedbackTests/RxFeedbackDriverTests.swift b/Tests/RxFeedbackTests/RxFeedbackDriverTests.swift
@@ -225,7 +225,7 @@ extension RxFeedbackDriverTests {
             reduce: { oldState, append in
                 return  oldState + append
             },
-            feedback: bind { (stateAndScheduler) in
+            feedback: RxFeedback.bind { (stateAndScheduler) in
                 let results = stateAndScheduler.flatMap { state -> Signal<String> in
                     if state == "initial" {
                         return Signal.just("_a").delay(0.01)
@@ -268,7 +268,7 @@ extension RxFeedbackDriverTests {
             reduce: { oldState, append in
                 return  oldState + append
             },
-            feedback: bind(owner) { (_, stateAndScheduler) in
+            feedback: RxFeedback.bind(owner) { (_, stateAndScheduler) in
                 let results = stateAndScheduler.flatMap { state -> Signal<String> in
                     if state == "initial" {
                         return Signal.just("_a").delay(0.01)

diff --git a/Tests/RxFeedbackTests/RxFeedbackObservableTests.swift b/Tests/RxFeedbackTests/RxFeedbackObservableTests.swift
@@ -254,7 +254,7 @@ extension RxFeedbackObservableTests {
                 return  oldState + append
             },
             scheduler: MainScheduler.instance,
-            scheduledFeedback: UI.bind { (stateAndScheduler) in
+            scheduledFeedback: RxFeedback.bind { (stateAndScheduler) in
                 let results = stateAndScheduler.flatMap { state -> Observable<String> in
                     if state == "initial" {
                         return Observable.just("_a").delay(0.01, scheduler: MainScheduler.instance)
@@ -269,7 +269,7 @@ extension RxFeedbackObservableTests {
                         return Observable.never()
                     }
                 }
-                return UI.Bindings(subscriptions: [], events: [results])
+                return Bindings(subscriptions: [], events: [results])
         })
 
         let result = (try?
@@ -297,7 +297,7 @@ extension RxFeedbackObservableTests {
                 return  oldState + append
             },
             scheduler: MainScheduler.instance,
-            scheduledFeedback: UI.bind(owner) { (_, stateAndScheduler) in
+            scheduledFeedback: RxFeedback.bind(owner) { (_, stateAndScheduler) in
                 let results = stateAndScheduler.flatMap { state -> Observable<String> in
                     if state == "initial" {
                         return Observable.just("_a").delay(0.01, scheduler: MainScheduler.instance)
@@ -312,7 +312,7 @@ extension RxFeedbackObservableTests {
                         return Observable.never()
                     }
                 }
-                return UI.Bindings(subscriptions: [], events: [results])
+                return Bindings(subscriptions: [], events: [results])
         })
 
         let result = (try?