Improve nullability in generics + update to RxJava 3.1.0 (#453)

* Update RxJava and improve generics nullability

* Opportunistic suppress a deprecation

* Update RxJava to 3.1.0

Author: ZacSweers

android/autodispose-android/src/main/java/autodispose2/android/KotlinExtensions.kt

@@ -44,7 +44,7 @@ inline fun View.scope(): ScopeProvider = ViewScopeProvider.from(this)
  * Extension that proxies to [Flowable.as] + [AutoDispose.autoDisposable]
  */
 @CheckReturnValue
-inline fun <T> Flowable<T>.autoDispose(
+inline fun <T : Any> Flowable<T>.autoDispose(
   view: View
 ): FlowableSubscribeProxy<T> =
   this.to(AutoDispose.autoDisposable(ViewScopeProvider.from(view)))
@@ -53,7 +53,7 @@ inline fun <T> Flowable<T>.autoDispose(
  * Extension that proxies to [Observable.as] + [AutoDispose.autoDisposable]
  */
 @CheckReturnValue
-inline fun <T> Observable<T>.autoDispose(
+inline fun <T : Any> Observable<T>.autoDispose(
   view: View
 ): ObservableSubscribeProxy<T> =
   this.to(AutoDispose.autoDisposable(ViewScopeProvider.from(view)))
@@ -62,7 +62,7 @@ inline fun <T> Observable<T>.autoDispose(
  * Extension that proxies to [Single.as] + [AutoDispose.autoDisposable]
  */
 @CheckReturnValue
-inline fun <T> Single<T>.autoDispose(
+inline fun <T : Any> Single<T>.autoDispose(
   view: View
 ): SingleSubscribeProxy<T> =
   this.to(AutoDispose.autoDisposable(ViewScopeProvider.from(view)))
@@ -71,7 +71,7 @@ inline fun <T> Single<T>.autoDispose(
  * Extension that proxies to [Maybe.as] + [AutoDispose.autoDisposable]
  */
 @CheckReturnValue
-inline fun <T> Maybe<T>.autoDispose(
+inline fun <T : Any> Maybe<T>.autoDispose(
   view: View
 ): MaybeSubscribeProxy<T> =
   this.to(AutoDispose.autoDisposable(ViewScopeProvider.from(view)))
@@ -89,7 +89,7 @@ inline fun Completable.autoDispose(
  * Extension that proxies to [ParallelFlowable.as] + [AutoDispose.autoDisposable]
  */
 @CheckReturnValue
-inline fun <T> ParallelFlowable<T>.autoDispose(
+inline fun <T : Any> ParallelFlowable<T>.autoDispose(
   view: View
 ): ParallelFlowableSubscribeProxy<T> =
   this.to(AutoDispose.autoDisposable(ViewScopeProvider.from(view)))

android/autodispose-androidx-lifecycle-test/src/main/java/autodispose2/androidx/lifecycle/test/KotlinExtensions.kt

@@ -24,6 +24,7 @@ import io.reactivex.rxjava3.annotations.CheckReturnValue
 /**
  * Extension that returns a [TestLifecycleOwner] for this [LifecycleRegistry].
  */
+@Suppress("DEPRECATION")
 @SuppressLint("RestrictedApi")
 @CheckReturnValue
 @Deprecated("Switch to androidx.lifecycle.testing.TestLifecycleOwner")

android/autodispose-androidx-lifecycle/src/main/java/autodispose2/androidx/lifecycle/KotlinExtensions.kt

@@ -111,7 +111,7 @@ inline fun Lifecycle.scope(
  * @param untilEvent Optional lifecycle event when subscription will be disposed.
  */
 @CheckReturnValue
-inline fun <T> Flowable<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent: Event? = null): FlowableSubscribeProxy<T> {
+inline fun <T : Any> Flowable<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent: Event? = null): FlowableSubscribeProxy<T> {
   return if (untilEvent == null) {
     this.to(AutoDispose.autoDisposable(AndroidLifecycleScopeProvider.from(lifecycleOwner)))
   } else {
@@ -134,7 +134,7 @@ inline fun <T> Flowable<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEven
  * @param untilEvent Optional lifecycle event when subscription will be disposed.
  */
 @CheckReturnValue
-inline fun <T> Observable<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent: Event? = null): ObservableSubscribeProxy<T> {
+inline fun <T : Any> Observable<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent: Event? = null): ObservableSubscribeProxy<T> {
   return if (untilEvent == null) {
     this.to(
       AutoDispose.autoDisposable(
@@ -161,7 +161,7 @@ inline fun <T> Observable<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEv
  * @param untilEvent Optional lifecycle event when subscription will be disposed.
  */
 @CheckReturnValue
-inline fun <T> Single<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent: Event? = null): SingleSubscribeProxy<T> {
+inline fun <T : Any> Single<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent: Event? = null): SingleSubscribeProxy<T> {
   return if (untilEvent == null) {
     this.to(
       AutoDispose.autoDisposable(
@@ -188,7 +188,7 @@ inline fun <T> Single<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent:
  * @param untilEvent Optional lifecycle event when subscription will be disposed.
  */
 @CheckReturnValue
-inline fun <T> Maybe<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent: Event? = null): MaybeSubscribeProxy<T> {
+inline fun <T : Any> Maybe<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent: Event? = null): MaybeSubscribeProxy<T> {
   return if (untilEvent == null) {
     this.to(
       AutoDispose.autoDisposable(
@@ -242,7 +242,7 @@ inline fun Completable.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent: E
  * @param untilEvent Optional lifecycle event when subscription will be disposed.
  */
 @CheckReturnValue
-inline fun <T> ParallelFlowable<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent: Event? = null): ParallelFlowableSubscribeProxy<T> {
+inline fun <T : Any> ParallelFlowable<T>.autoDispose(lifecycleOwner: LifecycleOwner, untilEvent: Event? = null): ParallelFlowableSubscribeProxy<T> {
   return if (untilEvent == null) {
     this.to(
       AutoDispose.autoDisposable(

autodispose-interop/coroutines/src/main/kotlin/autodispose2/interop/coroutines/AutoDisposeCoroutinesInterop.kt

@@ -38,22 +38,22 @@ import kotlinx.coroutines.cancel
 import kotlin.coroutines.CoroutineContext
 
 /** Extension that proxies to the normal [autoDispose] extension function with a [ScopeProvider]. */
-public inline fun <T> Flowable<T>.autoDispose(scope: CoroutineScope): FlowableSubscribeProxy<T> {
+public inline fun <T : Any> Flowable<T>.autoDispose(scope: CoroutineScope): FlowableSubscribeProxy<T> {
   return autoDispose(scope.asScopeProvider())
 }
 
 /** Extension that proxies to the normal [autoDispose] extension function with a [ScopeProvider]. */
-public inline fun <T> Observable<T>.autoDispose(scope: CoroutineScope): ObservableSubscribeProxy<T> {
+public inline fun <T : Any> Observable<T>.autoDispose(scope: CoroutineScope): ObservableSubscribeProxy<T> {
   return autoDispose(scope.asScopeProvider())
 }
 
 /** Extension that proxies to the normal [autoDispose] extension function with a [ScopeProvider]. */
-public inline fun <T> Single<T>.autoDispose(scope: CoroutineScope): SingleSubscribeProxy<T> {
+public inline fun <T : Any> Single<T>.autoDispose(scope: CoroutineScope): SingleSubscribeProxy<T> {
   return autoDispose(scope.asScopeProvider())
 }
 
 /** Extension that proxies to the normal [autoDispose] extension function with a [ScopeProvider]. */
-public inline fun <T> Maybe<T>.autoDispose(scope: CoroutineScope): MaybeSubscribeProxy<T> {
+public inline fun <T : Any> Maybe<T>.autoDispose(scope: CoroutineScope): MaybeSubscribeProxy<T> {
   return autoDispose(scope.asScopeProvider())
 }
 

autodispose-lifecycle/src/main/java/autodispose2/lifecycle/CorrespondingEventsFunction.java

@@ -16,6 +16,7 @@
 package autodispose2.lifecycle;
 
 import autodispose2.OutsideScopeException;
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.functions.Function;
 
 /**
@@ -24,7 +25,7 @@
  *
  * @param <E> the event type.
  */
-public interface CorrespondingEventsFunction<E> extends Function<E, E> {
+public interface CorrespondingEventsFunction<@NonNull E> extends Function<E, E> {
 
   /**
    * Given an event {@code event}, returns the next corresponding event that this lifecycle should

autodispose-lifecycle/src/main/java/autodispose2/lifecycle/LifecycleScopeProvider.java

@@ -18,6 +18,7 @@
 import autodispose2.ScopeProvider;
 import autodispose2.internal.DoNotMock;
 import io.reactivex.rxjava3.annotations.CheckReturnValue;
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.CompletableSource;
@@ -34,7 +35,7 @@
  * @see LifecycleScopes
  */
 @DoNotMock(value = "Use TestLifecycleScopeProvider instead")
-public interface LifecycleScopeProvider<E> extends ScopeProvider {
+public interface LifecycleScopeProvider<@NonNull E> extends ScopeProvider {
 
   /**
    * Returns a sequence of lifecycle events. Note that completion of this lifecycle will also

autodispose-lifecycle/src/main/java/autodispose2/lifecycle/LifecycleScopes.java

@@ -17,6 +17,7 @@
 
 import autodispose2.AutoDisposePlugins;
 import autodispose2.OutsideScopeException;
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.CompletableSource;
@@ -51,7 +52,7 @@ private LifecycleScopes() {
    * @throws OutsideScopeException if the {@link LifecycleScopeProvider#correspondingEvents()}
    *     throws an {@link OutsideScopeException} during resolution.
    */
-  public static <E> CompletableSource resolveScopeFromLifecycle(
+  public static <@NonNull E> CompletableSource resolveScopeFromLifecycle(
       final LifecycleScopeProvider<E> provider) throws OutsideScopeException {
     return resolveScopeFromLifecycle(provider, true);
   }
@@ -74,7 +75,7 @@ public static <E> CompletableSource resolveScopeFromLifecycle(
    * @throws OutsideScopeException if the {@link LifecycleScopeProvider#correspondingEvents()}
    *     throws an {@link OutsideScopeException} during resolution.
    */
-  public static <E> CompletableSource resolveScopeFromLifecycle(
+  public static <@NonNull E> CompletableSource resolveScopeFromLifecycle(
       final LifecycleScopeProvider<E> provider, final boolean checkEndBoundary)
       throws OutsideScopeException {
     E lastEvent = provider.peekLifecycle();
@@ -114,7 +115,7 @@ public static <E> CompletableSource resolveScopeFromLifecycle(
    * @param endEvent the target end event
    * @param <E> the lifecycle event type
    */
-  public static <E> CompletableSource resolveScopeFromLifecycle(
+  public static <@NonNull E> CompletableSource resolveScopeFromLifecycle(
       Observable<E> lifecycle, final E endEvent) {
     @Nullable Comparator<E> comparator = null;
     if (endEvent instanceof Comparable) {
@@ -133,7 +134,7 @@ public static <E> CompletableSource resolveScopeFromLifecycle(
    * @param comparator an optional comparator for checking event equality.
    * @param <E> the lifecycle event type
    */
-  public static <E> CompletableSource resolveScopeFromLifecycle(
+  public static <@NonNull E> CompletableSource resolveScopeFromLifecycle(
       Observable<E> lifecycle, final E endEvent, @Nullable final Comparator<E> comparator) {
     Predicate<E> equalityPredicate;
     if (comparator != null) {

autodispose/src/main/java/autodispose2/AutoDispose.java

@@ -18,6 +18,7 @@
 import static autodispose2.AutoDisposeUtil.checkNotNull;
 import static autodispose2.Scopes.completableOf;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.CompletableObserver;
 import io.reactivex.rxjava3.core.CompletableSource;
@@ -76,7 +77,7 @@ public final class AutoDispose {
    * @return an {@link AutoDisposeConverter} to transform with operators like {@link
    *     Observable#to(ObservableConverter)}
    */
-  public static <T> AutoDisposeConverter<T> autoDisposable(final ScopeProvider provider) {
+  public static <@NonNull T> AutoDisposeConverter<T> autoDisposable(final ScopeProvider provider) {
     checkNotNull(provider, "provider == null");
     return autoDisposable(completableOf(provider));
   }
@@ -97,7 +98,7 @@ public static <T> AutoDisposeConverter<T> autoDisposable(final ScopeProvider pro
    * @return an {@link AutoDisposeConverter} to transform with operators like {@link
    *     Observable#to(ObservableConverter)}
    */
-  public static <T> AutoDisposeConverter<T> autoDisposable(final CompletableSource scope) {
+  public static <@NonNull T> AutoDisposeConverter<T> autoDisposable(final CompletableSource scope) {
     checkNotNull(scope, "scope == null");
     return new AutoDisposeConverter<T>() {
       @Override
@@ -136,7 +137,7 @@ public void subscribe(CompletableObserver observer) {
           }
 
           @Override
-          public <E extends CompletableObserver> E subscribeWith(E observer) {
+          public <@NonNull E extends CompletableObserver> E subscribeWith(E observer) {
             return new AutoDisposeCompletable(upstream, scope).subscribeWith(observer);
           }
 
@@ -194,7 +195,7 @@ public void subscribe(Subscriber<? super T> observer) {
           }
 
           @Override
-          public <E extends Subscriber<? super T>> E subscribeWith(E observer) {
+          public <@NonNull E extends Subscriber<? super T>> E subscribeWith(E observer) {
             return new AutoDisposeFlowable<>(upstream, scope).subscribeWith(observer);
           }
 
@@ -261,7 +262,7 @@ public void subscribe(MaybeObserver<? super T> observer) {
           }
 
           @Override
-          public <E extends MaybeObserver<? super T>> E subscribeWith(E observer) {
+          public <@NonNull E extends MaybeObserver<? super T>> E subscribeWith(E observer) {
             return new AutoDisposeMaybe<>(upstream, scope).subscribeWith(observer);
           }
 
@@ -319,7 +320,7 @@ public void subscribe(Observer<? super T> observer) {
           }
 
           @Override
-          public <E extends Observer<? super T>> E subscribeWith(E observer) {
+          public <@NonNull E extends Observer<? super T>> E subscribeWith(E observer) {
             return new AutoDisposeObservable<>(upstream, scope).subscribeWith(observer);
           }
 
@@ -375,7 +376,7 @@ public void subscribe(SingleObserver<? super T> observer) {
           }
 
           @Override
-          public <E extends SingleObserver<? super T>> E subscribeWith(E observer) {
+          public <@NonNull E extends SingleObserver<? super T>> E subscribeWith(E observer) {
             return new AutoDisposeSingle<>(upstream, scope).subscribeWith(observer);
           }
 

autodispose/src/main/java/autodispose2/AutoDisposeConverter.java

@@ -15,6 +15,7 @@
  */
 package autodispose2;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.CompletableConverter;
 import io.reactivex.rxjava3.core.FlowableConverter;
 import io.reactivex.rxjava3.core.MaybeConverter;
@@ -28,7 +29,7 @@
  *
  * @param <T> the type.
  */
-public interface AutoDisposeConverter<T>
+public interface AutoDisposeConverter<@NonNull T>
     extends FlowableConverter<T, FlowableSubscribeProxy<T>>,
         ParallelFlowableConverter<T, ParallelFlowableSubscribeProxy<T>>,
         ObservableConverter<T, ObservableSubscribeProxy<T>>,

autodispose/src/main/java/autodispose2/AutoDisposeFlowable.java

@@ -15,12 +15,14 @@
  */
 package autodispose2;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.CompletableSource;
 import io.reactivex.rxjava3.core.Flowable;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 
-final class AutoDisposeFlowable<T> extends Flowable<T> implements FlowableSubscribeProxy<T> {
+final class AutoDisposeFlowable<@NonNull T> extends Flowable<T>
+    implements FlowableSubscribeProxy<T> {
   private final Publisher<T> source;
   private final CompletableSource scope;