new version with logging

Author: mig35

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.71'
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

commandbasedarchitecture_coroutine/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
         classpath "com.github.dcendents:android-maven-plugin:1.2"
@@ -25,7 +25,7 @@ group = "io.scal"
 final def siteUrl = 'https://github.com/scalio/command-based-architecture'
 final def gitUrl = "https://github.com/scalio/command-based-architecture.git"
 // This is the library version used when deploying the artifact
-version = "0.5.1"
+version = "0.5.2"
 
 final Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())

commandbasedarchitecture_coroutine/src/main/java/io/scal/commandbasedarchitecture/broadcast/BaseBroadcastCommandViewModel.kt

@@ -75,7 +75,8 @@ data class DataState<ChildKey, ChildState>(
  * ViewModel that will store all child view models and return already existing one with the same key.
  */
 abstract class BaseBroadcastCommandViewModel<ChildKey, ChildState, ChildModel : ChildViewModel<ChildState>>(
-    private val loggerCallback: ((message: String) -> Unit)? = null
+    private val loggerCallback: ((message: String) -> Unit)? = null,
+    private val errorLoggerCallback: ((message: String, error: Throwable) -> Unit)? = null
 ) {
 
     protected open val mutableDataState =
@@ -89,7 +90,7 @@ abstract class BaseBroadcastCommandViewModel<ChildKey, ChildState, ChildModel :
     protected open val viewModelScope = CoroutineScope(Dispatchers.Main)
 
     protected open fun createCommandManager(mutableDataState: MutableLiveData<DataState<ChildKey, ChildState>>): CommandManager<DataState<ChildKey, ChildState>> =
-        CommandManagerImpl(mutableDataState, viewModelScope, loggerCallback)
+        CommandManagerImpl(mutableDataState, viewModelScope, loggerCallback, errorLoggerCallback)
 
     /**
      * Will get existing view model with the same key or create a new one

commandbasedarchitecture_rxjava/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
         classpath "com.github.dcendents:android-maven-plugin:1.2"
@@ -25,7 +25,7 @@ group = "io.scal"
 final def siteUrl = 'https://github.com/scalio/command-based-architecture'
 final def gitUrl = "https://github.com/scalio/command-based-architecture.git"
 // This is the library version used when deploying the artifact
-version = "0.5.1"
+version = "0.5.2"
 
 final Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())

commandbasedarchitecture_rxjava/src/main/java/io/scal/commandbasedarchitecture/broadcast/BaseBroadcastCommandViewModel.kt

@@ -76,7 +76,8 @@ data class DataState<ChildKey, ChildState>(
  */
 abstract class BaseBroadcastCommandViewModel<ChildKey, ChildState, ChildModel : ChildViewModel<ChildState>>(
     private val mainThreadScheduler: Scheduler,
-    private val loggerCallback: ((message: String) -> Unit)? = null
+    private val loggerCallback: ((message: String) -> Unit)? = null,
+    private val errorLoggerCallback: ((message: String, error: Throwable) -> Unit)? = null
 ) {
 
     protected open val mutableDataState =
@@ -94,7 +95,8 @@ abstract class BaseBroadcastCommandViewModel<ChildKey, ChildState, ChildModel :
             mutableDataState,
             mainThreadScheduler,
             compositeDisposable,
-            loggerCallback
+            loggerCallback,
+            errorLoggerCallback
         )
 
     /**

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Mar 23 10:43:55 NOVT 2020
+#Tue Jun 02 12:42:20 NOVT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

sample_coroutine/build.gradle

@@ -38,7 +38,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
 //    implementation project(path: ':commandbasedarchitecture_coroutine')
-    implementation 'io.scal:commandbasedarchitecture_coroutine:0.5.1'
+    implementation 'io.scal:commandbasedarchitecture_coroutine:0.5.2'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
@@ -47,7 +47,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.0.0-beta6"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
 
-    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.core:core-ktx:1.3.0"
     implementation "androidx.fragment:fragment-ktx:1.2.4"
 
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:${rootProject.architectureComponentsVersion}"

sample_coroutine/src/main/java/io/scal/commandbasedarchitecture/sample_coroutine/ui/details/SimpleDetailsViewModel.kt

@@ -24,7 +24,12 @@ class SimpleDetailsViewModel(application: Application) : DetailsViewModel(applic
     override val screenState: LiveData<DetailsScreenState> = mutableScreenState
 
     private val commandManager: CommandManager<DetailsScreenState> by lazy {
-        CommandManagerImpl(mutableScreenState, viewModelScope) { Log.w("SimpleViewModel", it) }
+        CommandManagerImpl(
+            mutableScreenState,
+            viewModelScope,
+            { Log.w("SimpleViewModel", it) },
+            { message, error ->  Log.w("SimpleViewModel", message, error) }
+        )
     }
 
 

sample_coroutine/src/main/java/io/scal/commandbasedarchitecture/sample_coroutine/ui/list/SimpleListViewModel.kt

@@ -24,7 +24,12 @@ class SimpleListViewModel(application: Application) : ListViewModel(application)
     )
     override val screenState: LiveData<ListScreenState> = mutableScreenState
     override val commandManager: CommandManager<ListScreenState> by lazy {
-        CommandManagerImpl(mutableScreenState, viewModelScope) { Log.w("SimpleViewModel", it) }
+        CommandManagerImpl(
+            mutableScreenState,
+            viewModelScope,
+            { Log.w("SimpleViewModel", it) },
+            { message, error ->  Log.w("SimpleViewModel", message, error) }
+        )
     }
 
     init {