summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoffrey-bion <joffrey.bion@gmail.com>2020-10-31 13:45:14 +0100
committerjoffrey-bion <joffrey.bion@gmail.com>2020-11-25 01:51:30 +0100
commit35bdbef15323c43235add21a000a7cc1d2ea8893 (patch)
tree268c865b34ce9e927541ff3804e6a6f220a694c6
parentAdd .idea to gitignore for jetbrains dev (diff)
downloadseven-wonders-35bdbef15323c43235add21a000a7cc1d2ea8893.tar.gz
seven-wonders-35bdbef15323c43235add21a000a7cc1d2ea8893.tar.bz2
seven-wonders-35bdbef15323c43235add21a000a7cc1d2ea8893.zip
Upgrade dependencies
- Kotlinx Coroutines to 1.4.1 - Kotlinx Serialization to 1.0.0 - Krossbow to 1.1.0
-rw-r--r--sw-bot/build.gradle.kts2
-rw-r--r--sw-client/build.gradle.kts4
-rw-r--r--sw-common-model/build.gradle.kts2
-rw-r--r--sw-server/build.gradle.kts2
-rw-r--r--sw-ui/build.gradle.kts19
5 files changed, 17 insertions, 12 deletions
diff --git a/sw-bot/build.gradle.kts b/sw-bot/build.gradle.kts
index ac565683..c4cd1eaa 100644
--- a/sw-bot/build.gradle.kts
+++ b/sw-bot/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
dependencies {
implementation(project(":sw-client"))
implementation(kotlin("stdlib-jdk8"))
+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1")
+
testImplementation(kotlin("test"))
testImplementation(kotlin("test-junit"))
}
diff --git a/sw-client/build.gradle.kts b/sw-client/build.gradle.kts
index e3f75f87..0b968b0d 100644
--- a/sw-client/build.gradle.kts
+++ b/sw-client/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
kotlin("multiplatform")
}
-val krossbowVersion = "0.41.0"
+val krossbowVersion = "1.1.0"
kotlin {
jvm()
@@ -14,7 +14,7 @@ kotlin {
dependencies {
api(project(":sw-common-model"))
api("org.hildan.krossbow:krossbow-stomp-kxserialization:$krossbowVersion")
- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
+ implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0")
}
}
val commonTest by getting {
diff --git a/sw-common-model/build.gradle.kts b/sw-common-model/build.gradle.kts
index a7146bc0..dd7b5327 100644
--- a/sw-common-model/build.gradle.kts
+++ b/sw-common-model/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
kotlin("plugin.serialization")
}
-val kotlinSerialization = "1.0.0-RC"
+val kotlinSerialization = "1.0.0"
kotlin {
jvm()
diff --git a/sw-server/build.gradle.kts b/sw-server/build.gradle.kts
index a30a7e6d..aad68b42 100644
--- a/sw-server/build.gradle.kts
+++ b/sw-server/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
implementation(project(":sw-engine"))
implementation(project(":sw-bot"))
implementation(kotlin("reflect")) // required by Spring 5
- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1")
implementation("org.springframework.boot:spring-boot-starter-websocket")
implementation("org.springframework.boot:spring-boot-starter-security")
diff --git a/sw-ui/build.gradle.kts b/sw-ui/build.gradle.kts
index 1afa3308..f87ac49f 100644
--- a/sw-ui/build.gradle.kts
+++ b/sw-ui/build.gradle.kts
@@ -9,7 +9,7 @@ repositories {
maven(url = "https://kotlin.bintray.com/kotlin-js-wrappers")
}
-val kotlinWrappersVersion = "pre.112-kotlin-1.4.0"
+val kotlinWrappersVersion = "pre.129-kotlin-1.4.10"
kotlin {
js {
@@ -21,24 +21,27 @@ kotlin {
dependencies {
implementation(project(":sw-client"))
- val reactVersion = "16.13.1"
+ val reactVersion = "17.0.0"
implementation("org.jetbrains:kotlin-react:$reactVersion-$kotlinWrappersVersion")
implementation(npm("react", reactVersion))
implementation("org.jetbrains:kotlin-react-dom:$reactVersion-$kotlinWrappersVersion")
implementation(npm("react-dom", reactVersion))
- val reactReduxVersion = "5.0.7"
+ val reactReduxVersion = "7.2.1"
implementation("org.jetbrains:kotlin-react-redux:$reactReduxVersion-$kotlinWrappersVersion")
implementation(npm("react-redux", reactReduxVersion))
- implementation(npm("redux", "4.0.4"))
+ // redux version aligned with the wrapper's build:
+ // https://github.com/JetBrains/kotlin-wrappers/blob/master/gradle.properties#L39
+ implementation(npm("redux", "4.0.5"))
- val reactRouterDomVersion = "5.1.2"
+ val reactRouterDomVersion = "5.2.0"
implementation("org.jetbrains:kotlin-react-router-dom:$reactRouterDomVersion-$kotlinWrappersVersion")
implementation(npm("react-router-dom", reactRouterDomVersion))
- implementation("org.jetbrains:kotlin-styled:1.0.0-$kotlinWrappersVersion")
- implementation(npm("styled-components", "4.3.2"))
- implementation(npm("inline-style-prefixer", "5.1.0"))
+ val styledComponentsVersion = "5.2.0"
+ implementation("org.jetbrains:kotlin-styled:$styledComponentsVersion-$kotlinWrappersVersion")
+ implementation(npm("styled-components", styledComponentsVersion))
+ implementation(npm("inline-style-prefixer", "6.0.0"))
// seems to be required by "kotlin-extensions" JS lib
implementation(npm("core-js", "3.1.4"))
bgstack15