Deprecate Default/Kotlin LifecycleScopeProvider interfaces (#275)

Let's look at just unifying this into the base class instead TODO: benchmark kotlin's default method compilation effects compared to D8's for `default` ones, as the latter can have significant build time penalties since it requires recompilation of all implementers If anyone in the community wants to try this out and let us know, please do!
uber · Dec 13, 2018 · c58ef85 · c58ef85
1 parent 07489eb
commit c58ef85
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 288 deletions.
diff --git a/...jdk8/src/main/java/com/uber/autodispose/lifecycle/jdk8/DefaultLifecycleScopeProvider.java b/...jdk8/src/main/java/com/uber/autodispose/lifecycle/jdk8/DefaultLifecycleScopeProvider.java
@@ -17,18 +17,14 @@
 package com.uber.autodispose.lifecycle.jdk8;
 
 import com.uber.autodispose.lifecycle.LifecycleScopeProvider;
-import com.uber.autodispose.lifecycle.LifecycleScopes;
-import io.reactivex.CompletableSource;
 
 /**
  * A convenience {@link LifecycleScopeProvider} that has a default implementation for
  * {@link #requestScope()}.
  *
  * @param <E> the lifecycle event type.
+ * @deprecated this functionality is lifted directly into {@link LifecycleScopeProvider} now.
  */
+@Deprecated
 public interface DefaultLifecycleScopeProvider<E> extends LifecycleScopeProvider<E> {
-
-  @Override default CompletableSource requestScope() {
-    return LifecycleScopes.resolveScopeFromLifecycle(this);
-  }
 }
diff --git a/.../src/test/java/com/uber/autodispose/lifecycle/jdk8/DefaultLifecycleScopeProviderTest.java b/.../src/test/java/com/uber/autodispose/lifecycle/jdk8/DefaultLifecycleScopeProviderTest.java
diff --git a/...ecycle-ktx/src/main/kotlin/com/uber/autodispose/lifecycle/KotlinLifecycleScopeProvider.kt b/...ecycle-ktx/src/main/kotlin/com/uber/autodispose/lifecycle/KotlinLifecycleScopeProvider.kt
@@ -16,15 +16,20 @@
 
 package com.uber.autodispose.lifecycle
 
-import com.uber.autodispose.lifecycle.LifecycleScopes.resolveScopeFromLifecycle
-import io.reactivex.CompletableSource
+import kotlin.DeprecationLevel.HIDDEN
 
 /**
  * A convenience [LifecycleScopeProvider] that has a default implementation for
  * [requestScope].
  *
  * @param <E> the lifecycle event type.
  */
-interface KotlinLifecycleScopeProvider<E> : LifecycleScopeProvider<E> {
-  override fun requestScope(): CompletableSource = resolveScopeFromLifecycle(this)
-}
+@Deprecated(
+    message = "This functionality is now pushed up into LifecycleScopeProvider directly.",
+    replaceWith = ReplaceWith(
+        expression = "LifecycleScopeProvider<FIXME>", // Unfortunately we can't make this better yet https://youtrack.jetbrains.com/issue/KT-21195
+        imports = ["com.uber.autodispose.lifecycle.LifecycleScopeProvider"]
+    ),
+    level = HIDDEN
+)
+interface KotlinLifecycleScopeProvider<E> : LifecycleScopeProvider<E>
diff --git a/...le-ktx/src/test/kotlin/com/uber/autodispose/lifecycle/KotlinLifecycleScopeProviderTest.kt b/...le-ktx/src/test/kotlin/com/uber/autodispose/lifecycle/KotlinLifecycleScopeProviderTest.kt
diff --git a/...ispose-lifecycle/src/main/java/com/uber/autodispose/lifecycle/LifecycleScopeProvider.java b/...ispose-lifecycle/src/main/java/com/uber/autodispose/lifecycle/LifecycleScopeProvider.java
@@ -19,6 +19,7 @@
 import com.uber.autodispose.ScopeProvider;
 import com.uber.autodispose.internal.DoNotMock;
 import io.reactivex.Completable;
+import io.reactivex.CompletableSource;
 import io.reactivex.Observable;
 import io.reactivex.annotations.CheckReturnValue;
 import io.reactivex.annotations.Nullable;
@@ -54,4 +55,8 @@ public interface LifecycleScopeProvider<E> extends ScopeProvider {
    * LifecycleNotStartedException}.
    */
   @Nullable E peekLifecycle();
+
+  @Override default CompletableSource requestScope() {
+    return LifecycleScopes.resolveScopeFromLifecycle(this);
+  }
 }
diff --git a/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeActivity.java b/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeActivity.java
@@ -22,8 +22,6 @@
 import com.uber.autodispose.lifecycle.CorrespondingEventsFunction;
 import com.uber.autodispose.lifecycle.LifecycleEndedException;
 import com.uber.autodispose.lifecycle.LifecycleScopeProvider;
-import com.uber.autodispose.lifecycle.LifecycleScopes;
-import io.reactivex.CompletableSource;
 import io.reactivex.Observable;
 import io.reactivex.subjects.BehaviorSubject;
 
@@ -76,10 +74,6 @@ public enum ActivityEvent {
     return lifecycleEvents.getValue();
   }
 
-  @Override public CompletableSource requestScope() {
-    return LifecycleScopes.resolveScopeFromLifecycle(this);
-  }
-
   @Override protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     lifecycleEvents.onNext(ActivityEvent.CREATE);

diff --git a/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeFragment.java b/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeFragment.java
@@ -19,13 +19,11 @@
 import android.app.Fragment;
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
 import android.view.View;
+import androidx.annotation.Nullable;
 import com.uber.autodispose.lifecycle.CorrespondingEventsFunction;
 import com.uber.autodispose.lifecycle.LifecycleEndedException;
 import com.uber.autodispose.lifecycle.LifecycleScopeProvider;
-import com.uber.autodispose.lifecycle.LifecycleScopes;
-import io.reactivex.CompletableSource;
 import io.reactivex.Observable;
 import io.reactivex.subjects.BehaviorSubject;
 
@@ -86,10 +84,6 @@ public enum FragmentEvent {
     return lifecycleEvents.getValue();
   }
 
-  @Override public CompletableSource requestScope() {
-    return LifecycleScopes.resolveScopeFromLifecycle(this);
-  }
-
   @Override public void onAttach(Context context) {
     super.onAttach(context);
     lifecycleEvents.onNext(FragmentEvent.ATTACH);

diff --git a/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeView.java b/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeView.java
@@ -18,16 +18,14 @@
 
 import android.content.Context;
 import android.os.Build;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import com.uber.autodispose.android.ViewScopeProvider;
 import com.uber.autodispose.lifecycle.CorrespondingEventsFunction;
 import com.uber.autodispose.lifecycle.LifecycleEndedException;
 import com.uber.autodispose.lifecycle.LifecycleScopeProvider;
-import com.uber.autodispose.lifecycle.LifecycleScopes;
-import io.reactivex.CompletableSource;
 import io.reactivex.Observable;
 import io.reactivex.subjects.BehaviorSubject;
 
@@ -116,8 +114,4 @@ public ViewEvent peekLifecycle() {
     //noinspection ConstantConditions only in layoutlib
     return lifecycleEvents.getValue();
   }
-
-  @Override public CompletableSource requestScope() {
-    return LifecycleScopes.resolveScopeFromLifecycle(this);
-  }
 }
diff --git a/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeViewHolder.java b/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeViewHolder.java
@@ -21,8 +21,6 @@
 import com.uber.autodispose.lifecycle.CorrespondingEventsFunction;
 import com.uber.autodispose.lifecycle.LifecycleEndedException;
 import com.uber.autodispose.lifecycle.LifecycleScopeProvider;
-import com.uber.autodispose.lifecycle.LifecycleScopes;
-import io.reactivex.CompletableSource;
 import io.reactivex.Observable;
 import io.reactivex.annotations.Nullable;
 import io.reactivex.subjects.BehaviorSubject;
@@ -67,10 +65,6 @@ public AutoDisposeViewHolder(View itemView) {
     return lifecycleEvents.getValue();
   }
 
-  @Override public CompletableSource requestScope() {
-    return LifecycleScopes.resolveScopeFromLifecycle(this);
-  }
-
   @Override protected void onBind() {
     lifecycleEvents.onNext(ViewHolderEvent.BIND);
   }

diff --git a/sample/src/main/kotlin/com/uber/autodispose/recipes/AutoDisposeActivityKotlin.kt b/sample/src/main/kotlin/com/uber/autodispose/recipes/AutoDisposeActivityKotlin.kt
@@ -21,15 +21,13 @@ import android.os.Bundle
 import com.uber.autodispose.lifecycle.CorrespondingEventsFunction
 import com.uber.autodispose.lifecycle.LifecycleEndedException
 import com.uber.autodispose.lifecycle.LifecycleScopeProvider
-import com.uber.autodispose.lifecycle.LifecycleScopes
 import com.uber.autodispose.recipes.AutoDisposeActivityKotlin.ActivityEvent
 import com.uber.autodispose.recipes.AutoDisposeActivityKotlin.ActivityEvent.CREATE
 import com.uber.autodispose.recipes.AutoDisposeActivityKotlin.ActivityEvent.DESTROY
 import com.uber.autodispose.recipes.AutoDisposeActivityKotlin.ActivityEvent.PAUSE
 import com.uber.autodispose.recipes.AutoDisposeActivityKotlin.ActivityEvent.RESUME
 import com.uber.autodispose.recipes.AutoDisposeActivityKotlin.ActivityEvent.START
 import com.uber.autodispose.recipes.AutoDisposeActivityKotlin.ActivityEvent.STOP
-import io.reactivex.CompletableSource
 import io.reactivex.Observable
 import io.reactivex.subjects.BehaviorSubject
 
@@ -82,10 +80,6 @@ abstract class AutoDisposeActivityKotlin : Activity(), LifecycleScopeProvider<Ac
     super.onStop()
   }
 
-  override fun requestScope(): CompletableSource {
-    return LifecycleScopes.resolveScopeFromLifecycle(this)
-  }
-
   override fun onDestroy() {
     lifecycleEvents.onNext(ActivityEvent.DESTROY)
     super.onDestroy()

diff --git a/sample/src/main/kotlin/com/uber/autodispose/recipes/AutoDisposeFragmentKotlin.kt b/sample/src/main/kotlin/com/uber/autodispose/recipes/AutoDisposeFragmentKotlin.kt
@@ -23,7 +23,6 @@ import androidx.fragment.app.Fragment
 import com.uber.autodispose.lifecycle.CorrespondingEventsFunction
 import com.uber.autodispose.lifecycle.LifecycleEndedException
 import com.uber.autodispose.lifecycle.LifecycleScopeProvider
-import com.uber.autodispose.lifecycle.LifecycleScopes
 import com.uber.autodispose.recipes.AutoDisposeFragmentKotlin.FragmentEvent
 import com.uber.autodispose.recipes.AutoDisposeFragmentKotlin.FragmentEvent.ATTACH
 import com.uber.autodispose.recipes.AutoDisposeFragmentKotlin.FragmentEvent.CREATE
@@ -35,7 +34,6 @@ import com.uber.autodispose.recipes.AutoDisposeFragmentKotlin.FragmentEvent.PAUS
 import com.uber.autodispose.recipes.AutoDisposeFragmentKotlin.FragmentEvent.RESUME
 import com.uber.autodispose.recipes.AutoDisposeFragmentKotlin.FragmentEvent.START
 import com.uber.autodispose.recipes.AutoDisposeFragmentKotlin.FragmentEvent.STOP
-import io.reactivex.CompletableSource
 import io.reactivex.Observable
 import io.reactivex.subjects.BehaviorSubject
 
@@ -63,10 +61,6 @@ abstract class AutoDisposeFragmentKotlin : Fragment(), LifecycleScopeProvider<Fr
     return lifecycleEvents.value
   }
 
-  override fun requestScope(): CompletableSource {
-    return LifecycleScopes.resolveScopeFromLifecycle(this)
-  }
-
   override fun onAttach(context: Context) {
     super.onAttach(context)
     lifecycleEvents.onNext(FragmentEvent.ATTACH)