update to redux 0.2.6 and use State type params

Author: Patrick Jackson

build.gradle

@@ -3,6 +3,7 @@ buildscript {
 
     repositories {
         google()
+        mavenCentral()
         maven { url 'https://dl.bintray.com/jetbrains/kotlin-native-dependencies' }
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
@@ -19,10 +20,10 @@ apply from: "$rootDir/gradle/dependencies.gradle"
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
         maven { url "https://dl.bintray.com/spekframework/spek-dev" }
-
+        jcenter()
     }
 
     group = GROUP

gradle/dependencies.gradle

@@ -2,7 +2,8 @@ ext.versions = [
         kotlin          : '1.3.41',
         dokka           : '0.9.17',
         spek            : '2.1.0-alpha.0.9+3d5d865',
-        atrium          : '0.8.0'
+        atrium          : '0.8.0',
+        redux           : '0.2.6'
 ]
 
 ext.deps = [

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Wed Apr 17 16:40:04 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -7,7 +7,7 @@ apply plugin: 'kotlin-multiplatform'
 archivesBaseName = 'redux-kotlin-thunk'
 
 group 'org.reduxkotlin'
-version '0.2.6'
+version '0.2.7'
 
 kotlin {
     jvm()
@@ -60,7 +60,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin("stdlib-common")
-                implementation "org.reduxkotlin:redux-kotlin:0.2.4"
+                implementation "org.reduxkotlin:redux-kotlin:$project.versions.redux"
             }
         }
         commonTest {

lib/build.gradle

@@ -1,4 +1,10 @@
-package org.reduxkotlin
+package com.willowtreeapps.common.external
+
+import org.reduxkotlin.Dispatcher
+import org.reduxkotlin.GetState
+import org.reduxkotlin.Middleware
+import org.reduxkotlin.Store
+
 
 /**
  * Thunk middleware for async action dispatches.
@@ -17,13 +23,14 @@ package org.reduxkotlin
  *
  *    store.dispatch(myNetworkThunk("query"))
  */
-fun createThunkMiddleware(extraArgument: Any? = null): ThunkMiddleware =
-    { store ->
+@Suppress("UNCHECKED_CAST")
+fun <State> createThunkMiddleware(extraArgument: Any? = null): ThunkMiddleware<State> =
+    { store: Store<State> ->
         { next: Dispatcher ->
             { action: Any ->
-                if (action is Thunk) {
+                if (action is Thunk<*>) {
                     try {
-                        action.dispatch(store.dispatch, store.getState, extraArgument)
+                        (action as Thunk<State>).dispatch(store.dispatch, store.getState, extraArgument)
                     } catch (e: Exception) {
 //                        Logger.d("Dispatching functions must use type Thunk: " + e.message)
                         throw IllegalArgumentException()
@@ -35,18 +42,17 @@ fun createThunkMiddleware(extraArgument: Any? = null): ThunkMiddleware =
         }
     }
 
-typealias ThunkMiddleware = Middleware
-val thunk = createThunkMiddleware()
+typealias ThunkMiddleware<State> = Middleware<State>
 
-fun ThunkMiddleware.withExtraArgument(arg: Any?) = createThunkMiddleware(arg)
+fun <State> ThunkMiddleware<State>.withExtraArgument(arg: Any?) = createThunkMiddleware<State>(arg)
 
 /**
  * Interface that can be dispatched and handled by ThunkMiddleware.
  * Asynchronous operations and Actions may be dispatched from within a Thunk.
  * Due to limitation of K/N a type alias does not work currently.
  */
-interface Thunk {
-    fun dispatch(dispatch: Dispatcher, getState: GetState, extraArgument: Any?): Any
+interface Thunk<State> {
+    fun dispatch(dispatch: Dispatcher, getState: GetState<State>, extraArgument: Any?): Any
 }
 /**
  * Convenience function for creating thunks.
@@ -62,16 +68,17 @@ interface Thunk {
  *
  * DEV NOTE:  This will not be needed if/when typealias for Thunk works with K/N
  */
-fun createThunk(thunkLambda: (dispatch: Dispatcher, getState: GetState, extraArgument: Any?) -> Any): Thunk {
-    return object : Thunk {
-        override fun dispatch(dispatch: Dispatcher, getState: GetState, extraArgument: Any?): Any =
+fun <State> createThunk(thunkLambda: (dispatch: Dispatcher, getState: GetState<State>, extraArgument: Any?) -> Any): Thunk<State> {
+    return object : Thunk<State> {
+        override fun dispatch(dispatch: Dispatcher, getState: GetState<State>, extraArgument: Any?): Any =
             thunkLambda(dispatch, getState, extraArgument)
     }
 }
 
 /*
  * Unable to use Thunk as a typealias currently do to a limitation of kotlin native.
- * Leaving code here as a reference to revisit.
+ * Dependent on https://youtrack.jetbrains.com/issue/KT-33149
+ * Leaving code here as a reference to revisit once the above is fixed.
  * /
 typealias Thunk = (Dispatcher, GetState, Any?) -> Any
 fun createThunkMiddleware(extraArgument: Any? = null): ThunkMiddleware =