Split packages (#1)

* Update dependencies. Calculate version with Gradle plug-in

* Make the sample work

* Test publish mini-rx and mini-rx-android

* Add StateMerger and Activity extensions in rx package. Add Rx ViewModels in rx-android package

* Move mini-rx packages to mini-rx2 to be more explicit about library version. Adjust depdendencies

* Add mini-kodein and mini-kodein-android packages. Fix comments and remove unneeded lines in Gradle files

* Fix jitpack compilation

Author: Adrián García

.floo

@@ -8,7 +8,6 @@ buildscript {
         leak_canary_version = "1.5"
         butterkinfe_version = "8.4.0"
         support_version = "27.0.0"
-        target_sdk_version = 28
     }
 }
 
@@ -24,25 +23,18 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 
-//Kotlin
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
-}
-
 //Android
 android {
-    compileSdkVersion target_sdk_version
-    buildToolsVersion '28.0.3'
+    compileSdkVersion android_target_sdk
+    buildToolsVersion android_build_tools_version
 
     defaultConfig {
         applicationId "com.bq.mini"
         minSdkVersion 21
-        targetSdkVersion target_sdk_version
-        versionCode 1
+        targetSdkVersion android_target_sdk
+        versionCode android_version_code
+        versionName android_version_name
         multiDexEnabled true
-        versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -76,29 +68,30 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation project(":mini-android")
+    implementation project(':mini-rx2')
+    implementation project(':mini-rx2-android')
+
     kapt project(":mini-processor")
 
     //Misc
     implementation 'com.github.minikorp:grove:1.0.3'
 
     //Reactive
-    def coroutines = "1.3.0-RC"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines"
-    def rx = "2.2.6"
-    implementation "io.reactivex.rxjava2:rxjava:$rx"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "io.reactivex.rxjava2:rxjava:$rx_version"
 
     //Support
-    implementation "androidx.core:core:1.0.1"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
+    implementation "androidx.core:core:1.1.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     //Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
-    androidTestImplementation 'com.agoda.kakao:kakao:1.4.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
+    androidTestImplementation 'com.agoda.kakao:kakao:2.1.0'
 }
 
 

.flooignore

@@ -14,6 +14,11 @@
         <activity
             android:name=".SampleActivity"
             android:screenOrientation="portrait">
+        </activity>
+
+        <activity
+            android:name=".SampleRxActivity"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/build.gradle

@@ -5,10 +5,8 @@ import com.mini.android.FluxActivity
 import com.minikorp.grove.ConsoleLogTree
 import com.minikorp.grove.Grove
 import kotlinx.android.synthetic.main.home_activity.*
-import mini.Action
 import mini.LoggerInterceptor
 import mini.MiniGen
-import mini.Store
 
 class SampleActivity : FluxActivity() {
 
@@ -35,14 +33,3 @@ class SampleActivity : FluxActivity() {
         dispatcher.dispatch(ActionTwo("2"))
     }
 }
-
-@Action
-interface ActionInterface {
-    val text: String
-}
-
-@Action
-class ActionTwo(override val text: String) : ActionInterface
-
-data class DummyState(val text: String = "dummy")
-class DummyStore : Store<DummyState>()

app/src/main/AndroidManifest.xml

@@ -0,0 +1,21 @@
+package org.sample
+
+import mini.Action
+import mini.Reducer
+import mini.Store
+
+@Action
+interface ActionInterface {
+    val text: String
+}
+
+@Action
+class ActionTwo(override val text: String) : ActionInterface
+
+data class DummyState(val text: String = "dummy")
+class DummyStore : Store<DummyState>() {
+    @Reducer
+    fun onActionTwo(action: ActionTwo) {
+        newState = state.copy(text = action.text)
+    }
+}

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

@@ -0,0 +1,38 @@
+package org.sample
+
+import android.os.Bundle
+import com.minikorp.grove.ConsoleLogTree
+import com.minikorp.grove.Grove
+import kotlinx.android.synthetic.main.home_activity.*
+import mini.LoggerInterceptor
+import mini.MiniGen
+import mini.rx.android.activities.FluxRxActivity
+import mini.rx.flowable
+
+class SampleRxActivity : FluxRxActivity() {
+
+    private val dispatcher = MiniGen.newDispatcher()
+    private val dummyStore = DummyStore()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.home_activity)
+
+        val stores = listOf(dummyStore)
+        MiniGen.subscribe(dispatcher, stores)
+        stores.forEach { it.initialize() }
+
+        dummyStore.flowable()
+            .subscribe {
+                demo_text.text = it.text
+            }
+            .track()
+
+        Grove.plant(ConsoleLogTree())
+        dispatcher.addInterceptor(LoggerInterceptor(stores, { tag, msg ->
+            Grove.tag(tag).d { msg }
+        }))
+
+        dispatcher.dispatch(ActionTwo("2"))
+    }
+}

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

@@ -1,26 +1,53 @@
+apply plugin: "com.github.ben-manes.versions"
+apply plugin: 'com.gladed.androidgitversion'
+
 buildscript {
     ext {
         kotlin_version = "1.3.50"
-        mini_version = "4.0.5"
+
+        android_compile_sdk = 29
+        android_target_sdk = 29
+        android_build_tools_version = "29.0.1"
+
+        lifecycle_version = "2.1.0"
+        rx_version = "2.2.6"
+        coroutines_version = "1.3.2"
     }
 
     repositories {
         jcenter()
         mavenCentral()
         google()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
 
     dependencies {
         classpath "com.android.tools.build:gradle:3.5.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.0"
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
+        classpath "com.gladed.androidgitversion:gradle-android-git-version:0.4.10"
+        classpath "com.github.ben-manes:gradle-versions-plugin:0.21.0"
     }
 }
 
+androidGitVersion {
+    codeFormat "MNNPP"
+    baseCode 1
+    tagPattern(/^v[0-9]+.*/) // Tag names should follow the pattern vM.NN.PP
+}
+
 allprojects {
+    ext {
+        mini_version = androidGitVersion.name()
+        android_version_name = androidGitVersion.name()
+        // The Android version is multiplied by a big number so it is placed in the leftmost part
+        // of the version code because we can't add it in androidGitVersion's codeFormat parameter
+        android_version_code = (android_compile_sdk * 100000) + androidGitVersion.code()
+    }
+
     version = mini_version
-    group = "com.mini"
+    group = "com.bq.mini"
 
     repositories {
         jcenter()

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

@@ -3,14 +3,14 @@ apply plugin: "kotlin-android"
 apply plugin: "com.github.dcendents.android-maven"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.0"
+    compileSdkVersion android_compile_sdk
+    buildToolsVersion android_build_tools_version
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion android_target_sdk
+        versionCode android_version_code
+        versionName android_version_name
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -22,12 +22,11 @@ android {
 }
 
 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:$coroutines_version"
+    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"

build.gradle

@@ -2,22 +2,17 @@ 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"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "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
     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"
+    compileOnly "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    testCompileOnly "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
 
-    def rx = "2.2.6"
-    compileOnly "io.reactivex.rxjava2:rxjava:$rx"
-    testCompile "io.reactivex.rxjava2:rxjava:$rx"
-
-    testCompile 'junit:junit:4.12'
+    testCompileOnly 'junit:junit:4.12'
     testImplementation "org.amshove.kluent:kluent:1.44"
 }
 

mini-android/build.gradle

@@ -110,17 +110,42 @@ inline fun <T, R> Resource<T>.map(crossinline transform: (data: T) -> R): Resour
     return Resource(value)
 }
 
-/** All tasks succeeded. */
+/** All resources succeeded. */
 fun <T> Iterable<Resource<T>>.allSuccesful(): Boolean {
     return this.all { it.isSuccess }
 }
 
-/** Any tasks failed. */
+/** Any resources failed. */
 fun <T> Iterable<Resource<T>>.anyFailure(): Boolean {
     return this.any { it.isFailure }
 }
 
-/** Any task is running. */
+/** Any resource is loading. */
 fun <T> Iterable<Resource<T>>.anyLoading(): Boolean {
     return this.any { it.isLoading }
-}
+}
+
+/** Any resource empty */
+fun <T> Iterable<Resource<T>>.anyEmpty(): Boolean = this.any { it.isEmpty }
+
+fun <T> Iterable<Resource<T>>.onAllSuccessful(fn: () -> Unit): Iterable<Resource<T>> {
+    if (this.allSuccesful()) fn()
+    return this
+}
+
+fun <T> Iterable<Resource<T>>.onAnyFailure(fn: () -> Unit): Iterable<Resource<T>> {
+    if (this.anyFailure()) fn()
+    return this
+}
+
+fun <T> Iterable<Resource<T>>.onAnyLoading(fn: () -> Unit): Iterable<Resource<T>> {
+    if (this.anyLoading()) fn()
+    return this
+}
+
+fun <T> Iterable<Resource<T>>.onAnyEmpty(fn: () -> Unit): Iterable<Resource<T>> {
+    if (this.anyEmpty()) fn()
+    return this
+}
+
+fun Iterable<Task>.onAnyIdle(fn: () -> Unit): Iterable<Task> = onAnyEmpty(fn).map { it as Task }

mini-android/src/androidTest/java/com/mini/ExampleInstrumentedTest.java

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