Deprecates `ScopedDisposable` and `scopedDispose` in favor of `DisposeBag`.

CHANGELOG.md

@@ -135,6 +135,7 @@ let (
 * Deprecates `ConcurrentMainScheduler.sharedInstance` in favor of `ConcurrentMainScheduler.instance`
 * Deprecates factory methods from `Drive` in favor of `Driver` factory methods.
 * Deprecates `sampleLatest` in favor of `withLatestFrom`.
+* Deprecates `ScopedDisposable` and `scopedDispose()` in favor of `DisposeBag`.
 
 #### Fixed
 

RxSwift/Disposables/ScopedDisposable.swift

@@ -21,6 +21,7 @@ extension Disposable {
     
     - returns: `ScopedDisposable` that will dispose `self` on `deinit`.
     */
+    @available(*, deprecated=2.0.0, message="Please use `DisposeBag` and `addDisposableTo`")
     public func scopedDispose() -> ScopedDisposable {
         return ScopedDisposable(disposable: self)
     }
@@ -32,6 +33,7 @@ extension Disposable {
 
 This returns ARC (RAII) like resource management to `RxSwift`.
 */
+@available(*, deprecated=2.0.0, message="Please use `DisposeBag` and `addDisposableTo`")
 public class ScopedDisposable : DisposeBase {
     private var _disposable: Disposable?
     

Tests/RxCocoaTests/NSObject+RxTests.swift

@@ -63,7 +63,7 @@ extension NSObjectTests {
         var a = NSObject()
         
         var fired = false
-        
+
         _ = a
             .rx_deallocated
             .map { _ in
@@ -72,8 +72,8 @@ extension NSObjectTests {
             .subscribeNext { _ in
                 fired = true
             }
-            .scopedDispose()
-        
+            .dispose()
+
         XCTAssertFalse(fired)
         
         a = NSObject()
@@ -131,7 +131,7 @@ extension NSObjectTests {
         var a = NSObject()
         
         var fired = false
-        
+
         _ = a
             .rx_deallocating
             .map { _ in
@@ -140,7 +140,7 @@ extension NSObjectTests {
             .subscribeNext { _ in
                 fired = true
             }
-            .scopedDispose()
+            .dispose()
         
         XCTAssertFalse(fired)
         

Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift

@@ -34,7 +34,7 @@ extension ObservableConcurrencyTest {
 
     func runDispatchQueueSchedulerTests(tests: (scheduler: SerialDispatchQueueScheduler) -> Disposable) {
         let scheduler = SerialDispatchQueueScheduler(internalSerialQueueName: "testQueue1")
-        let _ = runDispatchQueueSchedulerTests(scheduler, tests: tests).scopedDispose
+        runDispatchQueueSchedulerTests(scheduler, tests: tests).dispose()
     }
 
     func runDispatchQueueSchedulerTests(scheduler: SerialDispatchQueueScheduler, tests: (scheduler: SerialDispatchQueueScheduler) -> Disposable) -> Disposable {

Tests/RxSwiftTests/Tests/VariableTest.swift

@@ -46,11 +46,11 @@ class VariableTest : RxTest {
 
         var latest = 0
         var completed = false
-        a.asObservable().subscribe(onNext: { n in
-            latest = n
-        }, onCompleted: {
-            completed = true
-        })
+        _ = a.asObservable().subscribe(onNext: { n in
+                latest = n
+            }, onCompleted: {
+                completed = true
+            })
 
         XCTAssertEqual(latest, 1)
         XCTAssertFalse(completed)