aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jaros <rjaros@finn.pl>2020-03-27 18:30:42 +0100
committerRobert Jaros <rjaros@finn.pl>2020-03-27 18:30:42 +0100
commit9e9dc5f75b503def28a814f448f1c366e23c922b (patch)
tree8d64e959e6de101500d031e973c135ab29c6e639
parentddaa99a3ff9e502a67d11c5aca549a843cd1c3d7 (diff)
downloadkvision-9e9dc5f75b503def28a814f448f1c366e23c922b.tar.gz
kvision-9e9dc5f75b503def28a814f448f1c366e23c922b.tar.bz2
kvision-9e9dc5f75b503def28a814f448f1c366e23c922b.zip
Upgrade dependencies (Kotlin, coroutines, spring, jooby, redux-kotlin)
-rw-r--r--buildSrc/build.gradle.kts2
-rw-r--r--gradle.properties14
-rw-r--r--kvision-modules/kvision-redux-kotlin/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt4
3 files changed, 10 insertions, 10 deletions
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 5d2c5a5d..3fc0d7a0 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -8,6 +8,6 @@ repositories {
}
dependencies {
- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70")
+ implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71")
implementation(gradleApi())
}
diff --git a/gradle.properties b/gradle.properties
index ba402650..bfae6cc9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
group=pl.treksoft
version=3.5.3
-systemProp.kotlinVersion=1.3.70
+systemProp.kotlinVersion=1.3.71
javaVersion=1.8
-coroutinesVersion=1.3.4
+coroutinesVersion=1.3.5
serializationVersion=0.20.0
systemProp.dokkaVersion=0.10.1
-joobyVersion=2.6.2
-springBootVersion=2.2.5.RELEASE
+joobyVersion=2.7.3
+springBootVersion=2.2.6.RELEASE
ktorVersion=1.3.2
javalinVersion=3.7.0
guiceVersion=4.2.2
@@ -16,9 +16,9 @@ jqueryKotlinVersion=0.0.4
snabbdomKotlinVersion=0.1.1
navigoKotlinVersion=0.0.3
nodeKtVersion=0.1.0
-kotlinReduxVersion=4.0.0-pre.93-kotlin-1.3.70
-reduxKotlinVersion=0.3.2
-reduxKotlinThunkVersion=0.2.9
+kotlinReduxVersion=4.0.0-pre.94-kotlin-1.3.70
+reduxKotlinVersion=0.4.0
+reduxKotlinThunkVersion=0.4.0
mpaptRuntimeVersion=0.8.4
systemProp.org.gradle.internal.publish.checksums.insecure=true
diff --git a/kvision-modules/kvision-redux-kotlin/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt b/kvision-modules/kvision-redux-kotlin/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt
index 45f743f3..040b8631 100644
--- a/kvision-modules/kvision-redux-kotlin/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt
+++ b/kvision-modules/kvision-redux-kotlin/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt
@@ -24,9 +24,9 @@ package pl.treksoft.kvision.redux
import org.reduxkotlin.ActionTypes
import org.reduxkotlin.Middleware
import org.reduxkotlin.Store
+import org.reduxkotlin.Thunk
import org.reduxkotlin.applyMiddleware
import org.reduxkotlin.createStore
-import org.reduxkotlin.createThunk
import org.reduxkotlin.createThunkMiddleware
import pl.treksoft.kvision.state.ObservableState
@@ -92,7 +92,7 @@ class ReduxStore<S : Any, A : RAction>(
*/
fun dispatch(actionCreator: ActionCreator<A, S>) {
@Suppress("UNCHECKED_CAST")
- val thunk = createThunk<S> { dispatch, getState, _ -> actionCreator(dispatch as ((A) -> Unit), getState) }
+ val thunk: Thunk<S> = { dispatch, getState, _ -> actionCreator(dispatch as ((A) -> Unit), getState) }
store.dispatch(thunk)
}