Skip to content

Commit 96a607a

Browse files
kylefkylef
committed
Update to RxSwift 2.0.0-beta.2
1 parent e7ec82d commit 96a607a

File tree

6 files changed

+20
-49
lines changed

6 files changed

+20
-49
lines changed

‎Podfile.lock

+7-36
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.0)
3+
- RxSwift (2.0.0-beta.2)
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.2)
378

389
SPEC CHECKSUMS:
39-
QueryKit: f61e84faac3b4cf1345ee06ecf1920932629b10a
40-
RxSwift: 48982aff7a725bc6d0799aae6d539f360b940ff4
10+
QueryKit: 9ba1ace7bc0b93d3185bdff1ace8f6504d48b03a
11+
RxSwift: 795720c22352cf1f62669ef3695b5df7e195103b
4112

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

‎RxQueryKit.podspec

+2-2
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.2'
16+
spec.dependency 'QueryKit', '~> 0.12.0'
1717
end
1818

‎RxQueryKit.xcodeproj/project.pbxproj

+6-6
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

+1-1
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

+1-1
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class RxManagedObjectContextTests: XCTestCase {
66
let context = NSManagedObjectContext()
77

88
let expectation = expectationWithDescription("Objects Did Change Notification")
9-
context.qk_objectsDidChange().subscribeNext { [unowned context] notification in
9+
let _ = context.qk_objectsDidChange().subscribeNext { [unowned context] notification in
1010
XCTAssertEqual(notification.managedObjectContext, context)
1111
expectation.fulfill()
1212
}
@@ -19,7 +19,7 @@ class RxManagedObjectContextTests: XCTestCase {
1919
let context = NSManagedObjectContext()
2020

2121
let expectation = expectationWithDescription("Will Save Notification")
22-
context.qk_willSave().subscribeNext { [unowned context] managedObjectContext in
22+
let _ = context.qk_willSave().subscribeNext { [unowned context] managedObjectContext in
2323
XCTAssertEqual(managedObjectContext, context)
2424
expectation.fulfill()
2525
}
@@ -32,7 +32,7 @@ class RxManagedObjectContextTests: XCTestCase {
3232
let context = NSManagedObjectContext()
3333

3434
let expectation = expectationWithDescription("Did Save Notification")
35-
context.qk_didSave().subscribeNext { [unowned context] notification in
35+
let _ = context.qk_didSave().subscribeNext { [unowned context] notification in
3636
XCTAssertEqual(notification.managedObjectContext, context)
3737
expectation.fulfill()
3838
}

0 commit comments

Comments
 (0)