diff options
| author | Joffrey Bion <joffrey.bion@booking.com> | 2020-08-20 16:05:20 +0200 |
|---|---|---|
| committer | Joffrey Bion <joffrey.bion@booking.com> | 2020-08-31 15:47:51 +0200 |
| commit | df83c7cb14ee46d73743c1fd053d47a9b0e79e2a (patch) | |
| tree | 84d73d348f05892248f7d531c49fb1a0f276dba1 /sw-ui/src/main/kotlin/org/luxons | |
| parent | Upgrade ktlint and re-enable import order check (diff) | |
| download | seven-wonders-df83c7cb14ee46d73743c1fd053d47a9b0e79e2a.tar.gz seven-wonders-df83c7cb14ee46d73743c1fd053d47a9b0e79e2a.tar.bz2 seven-wonders-df83c7cb14ee46d73743c1fd053d47a9b0e79e2a.zip | |
Upgrade to Kotlin 1.4 and corresponding library versions
- Kotlinx Serialization 1.0.0-RC
- Coroutines 1.3.9
- Krossbow 0.30.1
Diffstat (limited to 'sw-ui/src/main/kotlin/org/luxons')
4 files changed, 5 insertions, 5 deletions
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/SevenWondersUi.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/SevenWondersUi.kt index 8b38e010..83e5b593 100644 --- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/SevenWondersUi.kt +++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/SevenWondersUi.kt @@ -1,5 +1,7 @@ package org.luxons.sevenwonders.ui +import kotlinx.browser.document +import kotlinx.browser.window import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import org.luxons.sevenwonders.ui.components.application @@ -13,8 +15,6 @@ import react.redux.provider import redux.RAction import redux.Store import redux.WrapperAction -import kotlin.browser.document -import kotlin.browser.window fun main() { window.onload = { diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Store.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Store.kt index 6f50a627..9011f389 100644 --- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Store.kt +++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Store.kt @@ -1,5 +1,6 @@ package org.luxons.sevenwonders.ui.redux +import kotlinx.browser.window import org.luxons.sevenwonders.ui.redux.sagas.SagaManager import redux.RAction import redux.Store @@ -8,7 +9,6 @@ import redux.applyMiddleware import redux.compose import redux.createStore import redux.rEnhancer -import kotlin.browser.window val INITIAL_STATE = SwState() diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/sagas/Sagas.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/sagas/Sagas.kt index 7b56594c..3f25e826 100644 --- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/sagas/Sagas.kt +++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/sagas/Sagas.kt @@ -1,5 +1,6 @@ package org.luxons.sevenwonders.ui.redux.sagas +import kotlinx.browser.window import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.coroutineScope @@ -15,7 +16,6 @@ import org.luxons.sevenwonders.ui.router.routerSaga import redux.RAction import redux.WrapperAction import webpack.isProdEnv -import kotlin.browser.window typealias SwSagaContext = SagaContext<SwState, RAction, WrapperAction> diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/router/Router.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/router/Router.kt index 82218ee1..3a22b1ed 100644 --- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/router/Router.kt +++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/router/Router.kt @@ -1,11 +1,11 @@ package org.luxons.sevenwonders.ui.router +import kotlinx.browser.window import kotlinx.coroutines.Job import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch import org.luxons.sevenwonders.ui.redux.sagas.SwSagaContext import redux.RAction -import kotlin.browser.window enum class Route(val path: String) { HOME("/"), |