trello-archive · dlew · May 24, 2020 · May 20, 2020 · May 20, 2020 · May 20, 2020
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$verKotlin"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$verKotlin"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.25.0'
@@ -36,8 +36,8 @@ ext {
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 
     // Define all dependencies in the base project, to unify & make it easy to update
-    rxJava = 'io.reactivex.rxjava2:rxjava:2.2.12'
-    rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    rxJava = 'io.reactivex.rxjava3:rxjava:3.0.3'
+    rxAndroid = 'io.reactivex.rxjava3:rxandroid:3.0.0'
     navi = 'com.trello.navi2:navi:2.1.0'
     lifecycle = "androidx.lifecycle:lifecycle-runtime:$lifecycleRuntimeVersion"
     lifecycleProcessor = "androidx.lifecycle:lifecycle-compiler:$lifecycleVersion"

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.trello.rxlifecycle3
-VERSION_NAME=3.1.0-SNAPSHOT
+VERSION_NAME=4.0.0-SNAPSHOT
 
 POM_URL=https://github.com/trello/RxLifecycle
 POM_SCM_URL=https://github.com/trello/RxLifecycle
@@ -11,4 +11,6 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 
 POM_DEVELOPER_ID=dlew
-POM_DEVELOPER_NAME=Dan Lew
+POM_DEVELOPER_NAME=Dan Lew
+
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed May 20 19:08:31 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/...ycle-kotlin/src/main/java/com/trello/rxlifecycle3/android/lifecycle/kotlin/rxlifecycle.kt b/...ycle-kotlin/src/main/java/com/trello/rxlifecycle3/android/lifecycle/kotlin/rxlifecycle.kt
@@ -17,7 +17,7 @@ package com.trello.rxlifecycle3.android.lifecycle.kotlin
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import com.trello.lifecycle2.android.lifecycle.AndroidLifecycle
-import io.reactivex.*
+import io.reactivex.rxjava3.core.*
 
 fun <T> Observable<T>.bindToLifecycle(owner: LifecycleOwner): Observable<T>
         = this.compose(AndroidLifecycle.createLifecycleProvider(owner).bindToLifecycle())

diff --git a/...oid-lifecycle/src/main/java/com/trello/lifecycle2/android/lifecycle/AndroidLifecycle.java b/...oid-lifecycle/src/main/java/com/trello/lifecycle2/android/lifecycle/AndroidLifecycle.java
@@ -10,8 +10,8 @@
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.OnLifecycleEvent;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 /**
  * Wraps a {@link LifecycleOwner} so that it can be used as a {@link LifecycleProvider}. For example,

diff --git a/...le/src/main/java/com/trello/lifecycle2/android/lifecycle/RxLifecycleAndroidLifecycle.java b/...le/src/main/java/com/trello/lifecycle2/android/lifecycle/RxLifecycleAndroidLifecycle.java
@@ -6,8 +6,8 @@
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.Lifecycle;
-import io.reactivex.Observable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.functions.Function;
 
 import static com.trello.rxlifecycle3.RxLifecycle.bind;
 

diff --git a/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java b/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java
@@ -9,10 +9,10 @@
 import org.robolectric.annotation.Config;
 
 import androidx.lifecycle.Lifecycle;
-import io.reactivex.Observable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.BehaviorSubject;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)

diff --git a/...src/test/java/com/trello/rxlifecycle3/android/lifecycle/AndroidLifecycleActivityTest.java b/...src/test/java/com/trello/rxlifecycle3/android/lifecycle/AndroidLifecycleActivityTest.java
@@ -14,9 +14,9 @@
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleOwner;
-import io.reactivex.Observable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE, sdk = 17)

diff --git a/...src/test/java/com/trello/rxlifecycle3/android/lifecycle/AndroidLifecycleFragmentTest.java b/...src/test/java/com/trello/rxlifecycle3/android/lifecycle/AndroidLifecycleFragmentTest.java
@@ -15,9 +15,9 @@
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleOwner;
-import io.reactivex.Observable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)

diff --git a/rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/RxLifecycleAndroid.java b/rxlifecycle-android/src/main/java/com/trello/rxlifecycle3/android/RxLifecycleAndroid.java
@@ -21,8 +21,8 @@
 
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
-import io.reactivex.Observable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.functions.Function;
 
 import static com.trello.rxlifecycle3.RxLifecycle.bind;
 import static com.trello.rxlifecycle3.internal.Preconditions.checkNotNull;

diff --git a/...ecycle-android/src/main/java/com/trello/rxlifecycle3/android/ViewDetachesOnSubscribe.java b/...ecycle-android/src/main/java/com/trello/rxlifecycle3/android/ViewDetachesOnSubscribe.java
@@ -16,11 +16,11 @@
 
 import android.view.View;
 
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
-import io.reactivex.android.MainThreadDisposable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+import io.reactivex.rxjava3.android.MainThreadDisposable;
 
-import static io.reactivex.android.MainThreadDisposable.verifyMainThread;
+import static io.reactivex.rxjava3.android.MainThreadDisposable.verifyMainThread;
 
 final class ViewDetachesOnSubscribe implements ObservableOnSubscribe<Object> {
 

diff --git a/rxlifecycle-android/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java b/rxlifecycle-android/src/test/java/com/trello/rxlifecycle3/RxLifecycleTest.java
@@ -30,10 +30,10 @@
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import io.reactivex.Observable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.BehaviorSubject;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;

diff --git a/...m/trello/rxlifecycle3/components/preference/RxEditTextPreferenceDialogFragmentCompat.java b/...m/trello/rxlifecycle3/components/preference/RxEditTextPreferenceDialogFragmentCompat.java
@@ -28,8 +28,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.EditTextPreferenceDialogFragmentCompat;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxEditTextPreferenceDialogFragmentCompat extends EditTextPreferenceDialogFragmentCompat implements LifecycleProvider<FragmentEvent> {
 

diff --git a/...a/com/trello/rxlifecycle3/components/preference/RxListPreferenceDialogFragmentCompat.java b/...a/com/trello/rxlifecycle3/components/preference/RxListPreferenceDialogFragmentCompat.java
@@ -28,8 +28,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.ListPreferenceDialogFragmentCompat;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxListPreferenceDialogFragmentCompat extends ListPreferenceDialogFragmentCompat implements LifecycleProvider<FragmentEvent> {
 

diff --git a/.../java/com/trello/rxlifecycle3/components/preference/RxPreferenceDialogFragmentCompat.java b/.../java/com/trello/rxlifecycle3/components/preference/RxPreferenceDialogFragmentCompat.java
@@ -28,8 +28,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceDialogFragmentCompat;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxPreferenceDialogFragmentCompat extends PreferenceDialogFragmentCompat implements LifecycleProvider<FragmentEvent> {
 

diff --git a/...c/main/java/com/trello/rxlifecycle3/components/preference/RxPreferenceFragmentCompat.java b/...c/main/java/com/trello/rxlifecycle3/components/preference/RxPreferenceFragmentCompat.java
@@ -28,8 +28,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceFragmentCompat;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxPreferenceFragmentCompat extends PreferenceFragmentCompat implements LifecycleProvider<FragmentEvent> {
 

diff --git a/...java/com/trello/rxlifecycle3/components/preference/RxPreferenceFragmentLifecycleTest.java b/...java/com/trello/rxlifecycle3/components/preference/RxPreferenceFragmentLifecycleTest.java
@@ -28,9 +28,9 @@
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
-import io.reactivex.Observable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 import static com.trello.rxlifecycle3.android.FragmentEvent.STOP;
 

diff --git a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxActivity.java b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxActivity.java
@@ -27,8 +27,8 @@
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxActivity extends Activity implements LifecycleProvider<ActivityEvent> {
 

diff --git a/...fecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxDialogFragment.java b/...fecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxDialogFragment.java
@@ -28,8 +28,8 @@
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxDialogFragment extends DialogFragment implements LifecycleProvider<FragmentEvent> {
 

diff --git a/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxFragment.java b/rxlifecycle-components/src/main/java/com/trello/rxlifecycle3/components/RxFragment.java
@@ -28,8 +28,8 @@
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxFragment extends Fragment implements LifecycleProvider<FragmentEvent> {
 

diff --git a/...cle-components/src/main/java/com/trello/rxlifecycle3/components/RxPreferenceFragment.java b/...cle-components/src/main/java/com/trello/rxlifecycle3/components/RxPreferenceFragment.java
@@ -28,8 +28,8 @@
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxPreferenceFragment extends PreferenceFragment implements LifecycleProvider<FragmentEvent> {
 

diff --git a/...ponents/src/main/java/com/trello/rxlifecycle3/components/support/RxAppCompatActivity.java b/...ponents/src/main/java/com/trello/rxlifecycle3/components/support/RxAppCompatActivity.java
@@ -30,8 +30,8 @@
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxAppCompatActivity extends AppCompatActivity implements LifecycleProvider<ActivityEvent> {
 

diff --git a/...s/src/main/java/com/trello/rxlifecycle3/components/support/RxAppCompatDialogFragment.java b/...s/src/main/java/com/trello/rxlifecycle3/components/support/RxAppCompatDialogFragment.java
@@ -28,8 +28,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatDialogFragment;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxAppCompatDialogFragment extends AppCompatDialogFragment implements LifecycleProvider<FragmentEvent> {
 

diff --git a/...components/src/main/java/com/trello/rxlifecycle3/components/support/RxDialogFragment.java b/...components/src/main/java/com/trello/rxlifecycle3/components/support/RxDialogFragment.java
@@ -28,8 +28,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxDialogFragment extends DialogFragment implements LifecycleProvider<FragmentEvent> {
 

diff --git a/...cycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxFragment.java b/...cycle-components/src/main/java/com/trello/rxlifecycle3/components/support/RxFragment.java
@@ -30,8 +30,8 @@
 import com.trello.rxlifecycle3.android.FragmentEvent;
 import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxFragment extends Fragment implements LifecycleProvider<FragmentEvent> {
 

diff --git a/...mponents/src/main/java/com/trello/rxlifecycle3/components/support/RxFragmentActivity.java b/...mponents/src/main/java/com/trello/rxlifecycle3/components/support/RxFragmentActivity.java
@@ -30,8 +30,8 @@
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.trello.rxlifecycle3.android.RxLifecycleAndroid;
 
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public abstract class RxFragmentActivity extends FragmentActivity implements LifecycleProvider<ActivityEvent> {
 

diff --git a/...-components/src/test/java/com/trello/rxlifecycle3/components/RxActivityLifecycleTest.java b/...-components/src/test/java/com/trello/rxlifecycle3/components/RxActivityLifecycleTest.java
@@ -26,9 +26,9 @@
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 
-import io.reactivex.Observable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 import static com.trello.rxlifecycle3.android.ActivityEvent.STOP;
 

diff --git a/...-components/src/test/java/com/trello/rxlifecycle3/components/RxFragmentLifecycleTest.java b/...-components/src/test/java/com/trello/rxlifecycle3/components/RxFragmentLifecycleTest.java
@@ -26,9 +26,9 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.FragmentTestUtil;
 
-import io.reactivex.Observable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 import static com.trello.rxlifecycle3.android.FragmentEvent.STOP;
 import static org.robolectric.util.FragmentTestUtil.startFragment;

diff --git a/.../test/java/com/trello/rxlifecycle3/components/support/RxSupportFragmentLifecycleTest.java b/.../test/java/com/trello/rxlifecycle3/components/support/RxSupportFragmentLifecycleTest.java
@@ -26,9 +26,9 @@
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
-import io.reactivex.Observable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 import static com.trello.rxlifecycle3.android.FragmentEvent.STOP;
 

diff --git a/rxlifecycle-kotlin/src/main/java/com/trello/rxlifecycle3/kotlin/rxlifecycle.kt b/rxlifecycle-kotlin/src/main/java/com/trello/rxlifecycle3/kotlin/rxlifecycle.kt
@@ -18,8 +18,8 @@ import android.view.View
 import com.trello.rxlifecycle3.LifecycleProvider
 import com.trello.rxlifecycle3.RxLifecycle
 import com.trello.rxlifecycle3.android.RxLifecycleAndroid
-import io.reactivex.*
-import io.reactivex.functions.Function
+import io.reactivex.rxjava3.core.*
+import io.reactivex.rxjava3.functions.Function
 
 // RxLifecycle extensions
 

diff --git a/rxlifecycle-navi/build.gradle b/rxlifecycle-navi/build.gradle
diff --git a/rxlifecycle-navi/gradle.properties b/rxlifecycle-navi/gradle.properties