From 4e5cc2e0c0f09a04f0bf9dc8a1d67afcf86029d8 Mon Sep 17 00:00:00 2001
From: Thomas Nield <thomasnield@live.com>
Date: Sun, 26 Nov 2017 18:53:10 -0600
Subject: [PATCH] don't deprecate, just remove and do a breaking release.

---
 gradle.properties                             |  2 +-
 .../kotlin/io/reactivex/rxkotlin/maybe.kt     | 32 +------------------
 .../io/reactivex/rxkotlin/observable.kt       |  2 --
 .../kotlin/io/reactivex/rxkotlin/single.kt    | 31 ------------------
 4 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 8041cd2..505dbcf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-version=2.0.0
+version=2.2.0
 org.gradle.jvmargs=-Xms256m -Xmx1024m -XX:MaxPermSize=256m
\ No newline at end of file
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/maybe.kt b/src/main/kotlin/io/reactivex/rxkotlin/maybe.kt
index 71b0efc..43f2a51 100644
--- a/src/main/kotlin/io/reactivex/rxkotlin/maybe.kt
+++ b/src/main/kotlin/io/reactivex/rxkotlin/maybe.kt
@@ -4,37 +4,7 @@ import io.reactivex.Flowable
 import io.reactivex.Maybe
 import io.reactivex.MaybeSource
 import io.reactivex.Observable
-import java.util.concurrent.Callable
-import java.util.concurrent.Future
-
-@Deprecated(
-        message = "Use Maybe.just and Maybe.empty respectively",
-        level = DeprecationLevel.ERROR,
-        replaceWith = ReplaceWith(
-                expression = "let { if(it != null) { Maybe.just(it)!! } else { Maybe.empty()!! } }",
-                imports = "io.reactivex.Maybe"))
-fun <T : Any> T?.toMaybe(): Maybe<T> = error("Deprecated")
-@Deprecated(
-        message = "Use Maybe.fromFuture instead",
-        level = DeprecationLevel.ERROR,
-        replaceWith = ReplaceWith(
-                expression = "let { Maybe.fromFuture(it) }",
-                imports = "io.reactivex.Maybe"))
-fun <T : Any> Future<T>.toMaybe(): Maybe<T> = error("Deprecated")
-@Deprecated(
-        message = "Use Maybe.fromCallable instead",
-        level = DeprecationLevel.ERROR,
-        replaceWith = ReplaceWith(
-                expression = "let { Maybe.fromCallable(it) }",
-                imports = "io.reactivex.Maybe"))
-fun <T : Any> Callable<T>.toMaybe(): Maybe<T> = error("Deprecated")
-@Deprecated(
-        message = "Use Maybe.fromCallable instead",
-        level = DeprecationLevel.ERROR,
-        replaceWith = ReplaceWith(
-                expression = "let { Maybe.fromCallable(it) }",
-                imports = "io.reactivex.Maybe"))
-fun <T : Any> (() -> T).toMaybe(): Maybe<T> = error("Deprecated")
+
 
 inline fun <reified R : Any> Maybe<Any>.cast(): Maybe<R> = cast(R::class.java)
 inline fun <reified R : Any> Maybe<Any>.ofType(): Maybe<R> = ofType(R::class.java)
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/observable.kt b/src/main/kotlin/io/reactivex/rxkotlin/observable.kt
index 2150931..269db46 100644
--- a/src/main/kotlin/io/reactivex/rxkotlin/observable.kt
+++ b/src/main/kotlin/io/reactivex/rxkotlin/observable.kt
@@ -2,8 +2,6 @@ package io.reactivex.rxkotlin
 
 import io.reactivex.Observable
 import io.reactivex.ObservableSource
-import io.reactivex.functions.BiFunction
-import io.reactivex.functions.Function3
 
 
 fun BooleanArray.toObservable(): Observable<Boolean> = asIterable().toObservable()
diff --git a/src/main/kotlin/io/reactivex/rxkotlin/single.kt b/src/main/kotlin/io/reactivex/rxkotlin/single.kt
index b067f9d..f046819 100644
--- a/src/main/kotlin/io/reactivex/rxkotlin/single.kt
+++ b/src/main/kotlin/io/reactivex/rxkotlin/single.kt
@@ -4,37 +4,6 @@ import io.reactivex.Flowable
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.SingleSource
-import java.util.concurrent.Callable
-import java.util.concurrent.Future
-
-@Deprecated(
-        message = "Use Single.just instead",
-        level = DeprecationLevel.ERROR,
-        replaceWith = ReplaceWith(
-                expression = "let { Single.just(it) }",
-                imports = "io.reactivex.Single"))
-fun <T : Any> T.toSingle(): Single<T> = error("Deprecated")
-@Deprecated(
-        message = "Use Single.fromFuture instead",
-        level = DeprecationLevel.ERROR,
-        replaceWith = ReplaceWith(
-                expression = "let { Single.fromFuture(it) }",
-                imports = "io.reactivex.Single"))
-fun <T : Any> Future<T>.toSingle(): Single<T> = error("Deprecated")
-@Deprecated(
-        message = "Use Single.fromCallable instead",
-        level = DeprecationLevel.ERROR,
-        replaceWith = ReplaceWith(
-                expression = "let { Single.fromCallable(it) }",
-                imports = "io.reactivex.Single"))
-fun <T : Any> Callable<T>.toSingle(): Single<T> = error("Deprecated")
-@Deprecated(
-        message = "Use Single.fromCallable instead",
-        level = DeprecationLevel.ERROR,
-        replaceWith = ReplaceWith(
-                expression = "let { Single.fromCallable(it) }",
-                imports = "io.reactivex.Single"))
-fun <T : Any> (() -> T).toSingle(): Single<T> = error("Deprecated")
 
 inline fun <reified R : Any> Single<Any>.cast(): Single<R> = cast(R::class.java)