don't deprecate, just remove and do a breaking release.

ReactiveX · Nov 27, 2017 · 4e5cc2e · 4e5cc2e
1 parent b6c934b
commit 4e5cc2e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 65 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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)