From 28d5e431f6d929e1c9229153a5cc51e3032774f9 Mon Sep 17 00:00:00 2001 From: Srdan Rasic Date: Sat, 18 Mar 2017 16:19:01 +0100 Subject: [PATCH] Expose `bag` on `NSObject` reactive extensions for backwards compatibility. --- ReactiveKit.podspec | 4 ++-- ReactiveKit/Info.plist | 2 +- Sources/Deallocatable.swift | 1 + Sources/Reactive.swift | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ReactiveKit.podspec b/ReactiveKit.podspec index e0b5218..d68cf80 100644 --- a/ReactiveKit.podspec +++ b/ReactiveKit.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = "ReactiveKit" - s.version = "3.4.1" + s.version = "3.4.2" s.summary = "A Swift Reactive Programming Framework" s.description = "ReactiveKit is a Swift framework for reactive and functional reactive programming." s.homepage = "https://github.com/ReactiveKit/ReactiveKit" s.license = 'MIT' s.author = { "Srdan Rasic" => "srdan.rasic@gmail.com" } - s.source = { :git => "https://github.com/ReactiveKit/ReactiveKit.git", :tag => "v3.4.1" } + s.source = { :git => "https://github.com/ReactiveKit/ReactiveKit.git", :tag => "v3.4.2" } s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.9' diff --git a/ReactiveKit/Info.plist b/ReactiveKit/Info.plist index e6eabdf..c206b9f 100644 --- a/ReactiveKit/Info.plist +++ b/ReactiveKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.4.1 + 3.4.2 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/Deallocatable.swift b/Sources/Deallocatable.swift index de237e9..2081fbd 100644 --- a/Sources/Deallocatable.swift +++ b/Sources/Deallocatable.swift @@ -51,6 +51,7 @@ extension DisposeBagProvider { static var DisposeBagKey = "DisposeBagKey" } + /// A `DisposeBag` that can be used to dispose observations and bindings. public var bag: DisposeBag { if let disposeBag = objc_getAssociatedObject(self, &NSObject.AssociatedKeys.DisposeBagKey) { return disposeBag as! DisposeBag diff --git a/Sources/Reactive.swift b/Sources/Reactive.swift index 6b1fa2b..ec72119 100644 --- a/Sources/Reactive.swift +++ b/Sources/Reactive.swift @@ -71,6 +71,11 @@ extension NSObject: ReactiveExtensionsProvider {} public var deallocated: SafeSignal { return base.bag.deallocated } + + /// A `DisposeBag` that can be used to dispose observations and bindings. + public var bag: DisposeBag { + return base.bag + } } #endif