RxJava3 support

docs/rxjava3.md

@@ -0,0 +1,11 @@
+# Mavericks + RxJava3
+
+[//]: # (TODO refine the documentation)
+
+MvRx 1.x was designed to work well with RxJava 2. 
+
+However, Mavericks now uses coroutines internally.
+
+RxJava 3 compatibility is available via the `mavericks-rxjava3` artifact.
+
+To use it, use `BaseMvRxViewModel` instead of `MavericksViewModel`. Doing so will give you access to `execute` extensions on `Single<T>` and `Observable<T>` as well as all other MvRx 1.x APIs.

gradle/jacoco.gradle

@@ -1,5 +1,5 @@
 // Mostly from https://nolambda.stream/posts/jacoco-setup-for-multi-module-project/
-def coveredProjectNames = ["mvrx", "mvrx-compose", "mvrx-mocking", "mvrx-navigation", "mvrx-hilt", "mvrx-rxjava2"]
+def coveredProjectNames = ["mvrx", "mvrx-compose", "mvrx-mocking", "mvrx-navigation", "mvrx-hilt", "mvrx-rxjava2", "mvrx-rxjava3"]
 def coveredProjects = subprojects.findAll( project -> {
     coveredProjectNames.contains(project.name)
 })

gradle/libs.versions.toml

@@ -27,6 +27,7 @@ activity = "androidx.activity:activity:_"
 activityCompose = "androidx.activity:activity-compose:_"
 appcompat = "androidx.appcompat:appcompat:_"
 cardview = "androidx.cardview:cardview:_"
+material = "com.google.android.material:material:_"
 constraintlayout = "androidx.constraintlayout:constraintlayout:_"
 coordinatorLayout = "androidx.coordinatorlayout:coordinatorlayout:_"
 coreKtx = "androidx.core:core-ktx:_"
@@ -59,12 +60,17 @@ picasso = "com.squareup.picasso:picasso:_"
 recyclerview = "androidx.recyclerview:recyclerview:_"
 retrofit = "com.squareup.retrofit2:retrofit:_"
 retrofitMoshi = "com.squareup.retrofit2:converter-moshi:_"
-retrofitRxJava = "com.squareup.retrofit2:adapter-rxjava2:_"
+retrofitRxJava2 = "com.squareup.retrofit2:adapter-rxjava2:_"
+retrofitRxJava3 = "com.squareup.retrofit2:adapter-rxjava3:_"
+coil = "io.coil-kt:coil:_"
+
 roomRuntime = "androidx.room:room-runtime:_"
 roomRxJava = "androidx.room:room-rxjava2:_"
 runtimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:_"
-rxAndroid = "io.reactivex.rxjava2:rxandroid:_"
-rxJava = "io.reactivex.rxjava2:rxjava:_"
+rxJava2 = "io.reactivex.rxjava2:rxjava:_"
+rxAndroid2 = "io.reactivex.rxjava2:rxandroid:_"
+rxJava3 = "io.reactivex.rxjava3:rxjava:_"
+rxAndroid3 = "io.reactivex.rxjava3:rxandroid:_"
 viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:_"
 viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:_"
 viewModelSavedState = "androidx.lifecycle:lifecycle-viewmodel-savedstate:_"

mvrx-rxjava2/build.gradle

@@ -32,7 +32,7 @@ android {
 
 dependencies {
     api project(':mvrx')
-    api libs.rxJava
+    api libs.rxJava2
 
     implementation libs.fragment
     implementation libs.lifecycleCommon

mvrx-rxjava3/.gitignore

@@ -0,0 +1 @@
+/build

mvrx-rxjava3/build.gradle

@@ -0,0 +1,47 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+apply plugin: "com.vanniktech.maven.publish"
+
+tasks.withType(KotlinCompile).all {
+    kotlinOptions {
+        freeCompilerArgs += [
+                '-opt-in=com.airbnb.mvrx.InternalMavericksApi',
+                '-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+                '-opt-in=com.airbnb.mvrx.ExperimentalMavericksApi',
+        ]
+    }
+}
+
+android {
+    resourcePrefix "mvrx_"
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+            all {
+                jacoco {
+                    includeNoLocationClasses = true
+                    jacoco.excludes = ['jdk.internal.*']
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    api project(':mvrx')
+    api libs.rxJava3
+
+    implementation libs.fragment
+    implementation libs.lifecycleCommon
+    implementation libs.runtimeKtx
+
+    testImplementation project(':mvrx-testing')
+    testImplementation libs.junit
+    testImplementation libs.appcompat
+    testImplementation libs.kotlinCoroutinesTest
+    testImplementation libs.mockito
+    testImplementation libs.roboeletric
+}

mvrx-rxjava3/gradle.properties

@@ -0,0 +1,4 @@
+POM_NAME=Mavericks
+POM_ARTIFACT_ID=mavericks-rxjava2
+POM_PACKAGING=aar
+GROUP=com.airbnb.android

mvrx-rxjava3/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<manifest package="com.airbnb.mvrx.rxjava2">
+
+    <application />
+
+</manifest>

mvrx-rxjava3/src/main/kotlin/com/airbnb/mvrx/BaseMvRxFragment.kt

@@ -0,0 +1,12 @@
+package com.airbnb.mvrx
+
+import androidx.annotation.LayoutRes
+import androidx.fragment.app.Fragment
+
+/**
+ * Make your base Fragment class extend this to get MvRx functionality.
+ *
+ * This is necessary for the view model delegates and persistence to work correctly.
+ */
+@Deprecated("You no longer need a base MvRxFragment. All you need to do is make your Fragment implement MavericksView.")
+abstract class BaseMvRxFragment(@LayoutRes contentLayoutId: Int = 0) : Fragment(contentLayoutId), MvRxView