Skip to content

Commit 87f6838

Browse files
kylefkylef
committed
Update to RxSwift 2.0.0-beta.3
1 parent e7ec82d commit 87f6838

File tree

6 files changed

+23
-49
lines changed

6 files changed

+23
-49
lines changed

‎Podfile.lock‎

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,13 @@
11
PODS:
2-
- QueryKit (0.11.0-beta.1):
3-
- QueryKit/Attribute (= 0.11.0-beta.1)
4-
- QueryKit/ObjectiveC (= 0.11.0-beta.1)
5-
- QueryKit/QuerySet (= 0.11.0-beta.1)
6-
- QueryKit/Swift (= 0.11.0-beta.1)
7-
- QueryKit/Attribute (0.11.0-beta.1):
8-
- QueryKit/Attribute/Bridge (= 0.11.0-beta.1)
9-
- QueryKit/Attribute/ObjectiveC (= 0.11.0-beta.1)
10-
- QueryKit/Attribute/Swift (= 0.11.0-beta.1)
11-
- QueryKit/Attribute/Bridge (0.11.0-beta.1):
12-
- QueryKit/Attribute/ObjectiveC
13-
- QueryKit/Attribute/Swift
14-
- QueryKit/Attribute/ObjectiveC (0.11.0-beta.1)
15-
- QueryKit/Attribute/Swift (0.11.0-beta.1):
16-
- QueryKit/QuerySet/Swift
17-
- QueryKit/ObjectiveC (0.11.0-beta.1):
18-
- QueryKit/Attribute/ObjectiveC
19-
- QueryKit/QuerySet/ObjectiveC
20-
- QueryKit/QuerySet (0.11.0-beta.1):
21-
- QueryKit/QuerySet/Bridge (= 0.11.0-beta.1)
22-
- QueryKit/QuerySet/ObjectiveC (= 0.11.0-beta.1)
23-
- QueryKit/QuerySet/Swift (= 0.11.0-beta.1)
24-
- QueryKit/QuerySet/Bridge (0.11.0-beta.1):
25-
- QueryKit/QuerySet/ObjectiveC
26-
- QueryKit/QuerySet/Swift
27-
- QueryKit/QuerySet/ObjectiveC (0.11.0-beta.1)
28-
- QueryKit/QuerySet/Swift (0.11.0-beta.1)
29-
- QueryKit/Swift (0.11.0-beta.1):
30-
- QueryKit/Attribute/Swift
31-
- QueryKit/QuerySet/Swift
32-
- RxSwift (2.0-alpha.1)
2+
- QueryKit (0.12.1)
3+
- RxSwift (2.0.0-beta.3)
334

345
DEPENDENCIES:
35-
- QueryKit (~> 0.11.0-beta.1)
36-
- RxSwift (= 2.0-alpha.1)
6+
- QueryKit (~> 0.12.0)
7+
- RxSwift (= 2.0.0-beta.3)
378

389
SPEC CHECKSUMS:
39-
QueryKit: f61e84faac3b4cf1345ee06ecf1920932629b10a
40-
RxSwift: 48982aff7a725bc6d0799aae6d539f360b940ff4
10+
QueryKit: 6a8dbe9f33ffac00c424143695681a949b58518d
11+
RxSwift: 19fbe885b404d1d36d42ac8535134739a9b42952
4112

42-
COCOAPODS: 0.39.0.beta.4
13+
COCOAPODS: 0.39.0

‎RxQueryKit.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Pod::Spec.new do |spec|
1212
spec.ios.deployment_target = '8.0'
1313
spec.osx.deployment_target = '10.9'
1414
spec.requires_arc = true
15-
spec.dependency 'RxSwift', '2.0.0-alpha.3'
16-
spec.dependency 'QueryKit', '~> 0.11.0'
15+
spec.dependency 'RxSwift', '2.0.0-beta.3'
16+
spec.dependency 'QueryKit', '~> 0.12.0'
1717
end
1818

‎RxQueryKit.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
/* Begin PBXBuildFile section */
1010
270A330B1B9C04DB00AEE90E /* RxQueryKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 270A330A1B9C04DB00AEE90E /* RxQueryKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
11-
270A33121B9C04DB00AEE90E /* RxQueryKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 270A33071B9C04DB00AEE90E /* RxQueryKit.framework */; settings = {ASSET_TAGS = (); }; };
11+
270A33121B9C04DB00AEE90E /* RxQueryKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 270A33071B9C04DB00AEE90E /* RxQueryKit.framework */; };
1212
270A33171B9C04DB00AEE90E /* RxQueryKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270A33161B9C04DB00AEE90E /* RxQueryKitTests.swift */; };
13-
270A33221B9C07B100AEE90E /* RxManagedObjectContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270A33211B9C07B100AEE90E /* RxManagedObjectContext.swift */; settings = {ASSET_TAGS = (); }; };
14-
270A33241B9C09A500AEE90E /* RxManagedObjectContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270A33231B9C09A500AEE90E /* RxManagedObjectContextTests.swift */; settings = {ASSET_TAGS = (); }; };
15-
270A33261B9C105000AEE90E /* RxQueryKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270A33251B9C105000AEE90E /* RxQueryKit.swift */; settings = {ASSET_TAGS = (); }; };
16-
63FD81FDCFE39B3CDFDF0774 /* Pods_RxQueryKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8F2DEC34DCEF2E7340DBC7E /* Pods_RxQueryKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
17-
FA80A9986F4F0DEDE3B0CEBF /* Pods_RxQueryKitTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49C94D6480DB8DB97DDCE442 /* Pods_RxQueryKitTests.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
13+
270A33221B9C07B100AEE90E /* RxManagedObjectContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270A33211B9C07B100AEE90E /* RxManagedObjectContext.swift */; };
14+
270A33241B9C09A500AEE90E /* RxManagedObjectContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270A33231B9C09A500AEE90E /* RxManagedObjectContextTests.swift */; };
15+
270A33261B9C105000AEE90E /* RxQueryKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270A33251B9C105000AEE90E /* RxQueryKit.swift */; };
16+
63FD81FDCFE39B3CDFDF0774 /* Pods_RxQueryKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8F2DEC34DCEF2E7340DBC7E /* Pods_RxQueryKit.framework */; };
17+
FA80A9986F4F0DEDE3B0CEBF /* Pods_RxQueryKitTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49C94D6480DB8DB97DDCE442 /* Pods_RxQueryKitTests.framework */; };
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXContainerItemProxy section */

‎RxQueryKit/RxManagedObjectContext.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import RxSwift
44

55
extension NSNotificationCenter {
66
func rx_notification(name: String, object: AnyObject?) -> Observable<NSNotification> {
7-
return AnonymousObservable { observer in
7+
return create { observer in
88
let nsObserver = self.addObserverForName(name, object: object, queue: nil) { notification in
99
observer.on(.Next(notification))
1010
}

‎RxQueryKit/RxQueryKit.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ extension QuerySet {
1919
public func count() throws -> Observable<Int> {
2020
var count:Int = try self.count()
2121

22-
return AnonymousObservable { observer in
22+
return create { observer in
2323
observer.on(.Next(count))
2424

2525
return self.context.qk_objectsDidChange().subscribeNext { notification in

‎RxQueryKitTests/RxManagedObjectContextTests.swift‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
import XCTest
2+
import RxSwift
23
import RxQueryKit
34

45
class RxManagedObjectContextTests: XCTestCase {
6+
let disposeBag = DisposeBag()
7+
58
func testObjectsDidChangeNotification() {
69
let context = NSManagedObjectContext()
710

811
let expectation = expectationWithDescription("Objects Did Change Notification")
912
context.qk_objectsDidChange().subscribeNext { [unowned context] notification in
1013
XCTAssertEqual(notification.managedObjectContext, context)
1114
expectation.fulfill()
12-
}
15+
}.addDisposableTo(disposeBag)
1316

1417
NSNotificationCenter.defaultCenter().postNotificationName(NSManagedObjectContextObjectsDidChangeNotification, object: context, userInfo: [:])
1518
waitForExpectationsWithTimeout(1.0, handler: nil)
@@ -22,7 +25,7 @@ class RxManagedObjectContextTests: XCTestCase {
2225
context.qk_willSave().subscribeNext { [unowned context] managedObjectContext in
2326
XCTAssertEqual(managedObjectContext, context)
2427
expectation.fulfill()
25-
}
28+
}.addDisposableTo(disposeBag)
2629

2730
NSNotificationCenter.defaultCenter().postNotificationName(NSManagedObjectContextWillSaveNotification, object: context, userInfo: [:])
2831
waitForExpectationsWithTimeout(1.0, handler: nil)
@@ -35,7 +38,7 @@ class RxManagedObjectContextTests: XCTestCase {
3538
context.qk_didSave().subscribeNext { [unowned context] notification in
3639
XCTAssertEqual(notification.managedObjectContext, context)
3740
expectation.fulfill()
38-
}
41+
}.addDisposableTo(disposeBag)
3942

4043
NSNotificationCenter.defaultCenter().postNotificationName(NSManagedObjectContextDidSaveNotification, object: context, userInfo: [:])
4144
waitForExpectationsWithTimeout(1.0, handler: nil)

0 commit comments

Comments
 (0)