Split RX/Flow, add Incremental compilation support

Author: Pablo Orgaz

app/src/main/java/org/sample/SampleActivity.kt

@@ -8,6 +8,7 @@ import kotlinx.android.synthetic.main.home_activity.*
 import mini.Action
 import mini.LoggerInterceptor
 import mini.MiniGen
+import mini.Reducer
 import mini.Store
 
 class SampleActivity : FluxActivity() {
@@ -45,4 +46,10 @@ interface ActionInterface {
 class ActionTwo(override val text: String) : ActionInterface
 
 data class DummyState(val text: String = "dummy")
-class DummyStore : Store<DummyState>()
+class DummyStore : Store<DummyState>() {
+
+    @Reducer
+    fun hello(action: ActionInterface) {
+
+    }
+}

build.gradle

@@ -1,7 +1,9 @@
+apply plugin: 'maven-publish'
+
 buildscript {
     ext {
         kotlin_version = "1.3.50"
-        mini_version = "4.0.5"
+        mini_version = "4.1.0"
     }
 
     repositories {
@@ -29,7 +31,3 @@ allprojects {
         google()
     }
 }
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}

mini-android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: "com.github.dcendents.android-maven"
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.0"
+    buildToolsVersion "29.0.2"
 
     defaultConfig {
         minSdkVersion 14
@@ -25,9 +25,9 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     api project(":mini-common")
 
-    api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1"
-    api "androidx.appcompat:appcompat:1.0.2"
-    api "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-alpha02"
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0"
+    api "androidx.appcompat:appcompat:1.1.0"
+    api "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-alpha05"
 
     testImplementation "junit:junit:4.12"
     androidTestImplementation "androidx.test:runner:1.2.0"

mini-common/build.gradle

@@ -1,39 +1,11 @@
-apply plugin: 'kotlin'
+apply plugin: "kotlin"
 apply from: "../jitpack.gradle"
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-
-    //Optional Rx and Android bindings, one day these should be modules,
-    //for now we compile against them but let user package library
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compileOnly "com.google.android:android:4.1.1.4"
 
-    def coroutines = "1.3.0-RC"
-    compileOnly "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines"
-    testCompile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines"
-
-    def rx = "2.2.6"
-    compileOnly "io.reactivex.rxjava2:rxjava:$rx"
-    testCompile "io.reactivex.rxjava2:rxjava:$rx"
-
-    testCompile 'junit:junit:4.12'
+    testImplementation "junit:junit:4.12"
     testImplementation "org.amshove.kluent:kluent:1.44"
-}
-
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions.freeCompilerArgs += [
-            "-Xuse-experimental=kotlin.Experimental",
-            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-Xuse-experimental=kotlinx.coroutines.FlowPreview",
-    ]
-}
-
-apply plugin: 'idea'
-
-idea {
-    module {
-        sourceDirs += files('build/generated/source/kapt/main', 'build/generated/source/kaptKotlin/main')
-        generatedSourceDirs += files('build/generated/source/kapt/main', 'build/generated/source/kaptKotlin/main')
-    }
 }

mini-common/src/main/java/mini/LoggerInterceptor.kt

@@ -1,20 +1,18 @@
 package mini
 
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.asCoroutineDispatcher
-import kotlinx.coroutines.launch
 import java.util.concurrent.Executors
 import kotlin.math.min
 
 /** Actions implementing this interface won't log anything */
-@Action interface SilentAction
+@Action
+interface SilentAction
 
 class LoggerInterceptor constructor(stores: Collection<Store<*>>,
                                     private val logFn: (tag: String, msg: String) -> Unit,
                                     private val logInBackground: Boolean = false,
                                     private val tag: String = "MiniLog") : Interceptor {
 
-    private val coroutineDispatcher by lazy { Executors.newSingleThreadExecutor().asCoroutineDispatcher() }
+    private val executor by lazy { Executors.newSingleThreadExecutor() }
     private val stores = stores.toList()
     private var lastActionTime = System.currentTimeMillis()
     private var actionCounter: Long = 0
@@ -41,8 +39,8 @@ class LoggerInterceptor constructor(stores: Collection<Store<*>>,
             sb.append('\n')
             sb.append("┌────────────────────────────────────────────\n")
             sb.append(String.format("├─> %s %dms [+%dms][%d] - %s",
-                action.javaClass.simpleName, processTime, timeSinceLastAction, actionCounter % 10, action))
-                .append("\n")
+                    action.javaClass.simpleName, processTime, timeSinceLastAction, actionCounter % 10, action))
+                    .append("\n")
 
             for (i in beforeStates.indices) {
                 val oldState = beforeStates[i]
@@ -58,9 +56,7 @@ class LoggerInterceptor constructor(stores: Collection<Store<*>>,
         }
 
         if (logInBackground) {
-            GlobalScope.launch(coroutineDispatcher) {
-                logRunnable.run()
-            }
+            executor.submit(logRunnable)
         } else {
             logRunnable.run()
         }

mini-flow/build.gradle

@@ -0,0 +1,20 @@
+apply plugin: "kotlin"
+apply from: "../jitpack.gradle"
+
+dependencies {
+    implementation project(":mini-common")
+
+    def coroutines = "1.3.0"
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines"
+
+    testImplementation "junit:junit:4.12"
+    testImplementation "org.amshove.kluent:kluent:1.44"
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions.freeCompilerArgs += [
+            "-Xuse-experimental=kotlin.Experimental",
+            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-Xuse-experimental=kotlinx.coroutines.FlowPreview",
+    ]
+}