kotlin -> 1.3.70. Change thunk to typealias and remove interface. breaking change.

Author: Patrick Jackson

README.md

@@ -64,15 +64,15 @@ kotlin {
   sourceSets {
         commonMain { //   <---  name may vary on your project
             dependencies {
-                implementation "org.reduxkotlin:redux-kotlin-thunk:0.3.1"
+                implementation "org.reduxkotlin:redux-kotlin-thunk:0.4.0"
             }
         }
  }
 ```
 
 For JVM only:
 ```
-  implementation "org.reduxkotlin:redux-kotlin-jvm-thunk:0.3.1"
+  implementation "org.reduxkotlin:redux-kotlin-jvm-thunk:0.4.0"
 ```
 
 [badge-android]: http://img.shields.io/badge/platform-android-brightgreen.svg?style=flat

gradle.properties

@@ -21,7 +21,7 @@ android.enableJetifier=true
 kotlin.code.style=official
 
 GROUP=org.reduxkotlin
-VERSION_NAME=0.1.1
+VERSION_NAME=0.4.0
 
 POM_ARTIFACT_ID=reduxkotlin-thunk
 POM_DESCRIPTION=Redux thunmk implementation for Redux-Kotlin.  Mulitiplatform supported.

gradle/dependencies.gradle

@@ -1,9 +1,9 @@
 ext.versions = [
-        kotlin          : '1.3.61',
+        kotlin          : '1.3.70',
         dokka           : '0.9.17',
         spek            : '2.1.0-alpha.0.9+3d5d865',
         atrium          : '0.8.0',
-        redux           : '0.3.1'
+        redux           : '0.4.0'
 ]
 
 ext.deps = [

lib/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'kotlin-multiplatform'
 archivesBaseName = 'redux-kotlin-thunk'
 
 group 'org.reduxkotlin'
-version '0.3.1'
+version '0.4.0'
 
 kotlin {
     jvm()
@@ -20,41 +20,6 @@ kotlin {
             }
         }
     }
-    //-module-name args are needed to prevent circular deps bug on native platforms
-    iosArm64("ios") {
-        compilations.main.extraOpts.addAll(["-module-name", "thunk"])
-    }
-
-    iosX64("iosSim") {
-        compilations.main.extraOpts.addAll(["-module-name", "thunk"])
-    }
-    macosX64("macos") {
-        compilations.main.extraOpts.addAll(["-module-name", "thunk"])
-    }
-
-    mingwX64("win") {
-        compilations.main.extraOpts.addAll(["-module-name", "thunk"])
-    }
-
-    wasm32("wasm") {
-        compilations.main.extraOpts.addAll(["-module-name", "thunk"])
-    }
-
-    linuxArm32Hfp("linArm32") {
-        compilations.main.extraOpts.addAll(["-module-name", "thunk"])
-    }
-
-    linuxMips32("linMips32") {
-        compilations.main.extraOpts.addAll(["-module-name", "thunk"])
-    }
-
-    linuxMipsel32("linMipsel32") {
-        compilations.main.extraOpts.addAll(["-module-name", "thunk"])
-    }
-
-    linuxX64("lin64") {
-        compilations.main.extraOpts.addAll(["-module-name", "thunk"])
-    }
 
     sourceSets {
         commonMain {

lib/src/commonMain/kotlin/org/reduxkotlin/Thunk.kt

@@ -6,7 +6,7 @@ package org.reduxkotlin
  *    val store = createStore(myReducer, initialState,
  *          applyMiddleware(thunk, myMiddleware))
  *
- *    val myNetworkThunk(query: String) = createThunk { dispatch, getState, extraArgument ->
+ *    fun myNetworkThunk(query: String): Thunk<AppState> = { dispatch, getState, extraArgument ->
  *          launch {
  *              dispatch(LoadingAction())
  *              //do async stuff
@@ -17,71 +17,18 @@ package org.reduxkotlin
  *
  *    store.dispatch(myNetworkThunk("query"))
  */
-@Suppress("UNCHECKED_CAST")
-fun <State> createThunkMiddleware(extraArgument: Any? = null): ThunkMiddleware<State> =
-    { store: Store<State> ->
-        { next: Dispatcher ->
-            { action: Any ->
-                if (action is Thunk<*>) {
-                    try {
-                        (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()
-                    }
-                } else {
-                    next(action)
-                }
-            }
-        }
-    }
-
+typealias Thunk<State> = (dispatch: Dispatcher, getState: GetState<State>, extraArg: Any?) -> Any
 typealias ThunkMiddleware<State> = Middleware<State>
 
 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<State> {
-    fun dispatch(dispatch: Dispatcher, getState: GetState<State>, extraArgument: Any?): Any
-}
-/**
- * Convenience function for creating thunks.
- * Usage:
- *      val myThunk = createThunk { dispatch, getState, extraArgument ->
- *              //do async stuff
- *              dispatch(NewAction())
- *              }
- *
- *      ....
- *
- *      store.dispatch(myThunk)
- *
- * DEV NOTE:  This will not be needed if/when typealias for Thunk works with K/N
- */
-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.
- * 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 =
+fun <State> createThunkMiddleware(extraArgument: Any? = null): ThunkMiddleware<State> =
     { store ->
         { next: Dispatcher ->
             { action: Any ->
                 if (action is Function<*>) {
                     try {
-                        (action as Thunk)(store.dispatch, store.getState, extraArgument)
+                        (action as Thunk<*>)(store.dispatch, store.getState, extraArgument)
                     } catch (e: Exception) {
                         throw IllegalArgumentException()
 //                    Logger.d("Dispatching functions must use type Thunk: " + e.message)
@@ -92,6 +39,3 @@ fun createThunkMiddleware(extraArgument: Any? = null): ThunkMiddleware =
             }
         }
     }
- */
-
-