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-common-model | |
| 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-common-model')
| -rw-r--r-- | sw-common-model/build.gradle.kts | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sw-common-model/build.gradle.kts b/sw-common-model/build.gradle.kts index 14cae06e..a7146bc0 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 = "0.20.0" +val kotlinSerialization = "1.0.0-RC" kotlin { jvm() @@ -13,8 +13,7 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation(kotlin("stdlib-common")) - api("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$kotlinSerialization") + api("org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlinSerialization") } } val commonTest by getting { @@ -23,24 +22,12 @@ kotlin { implementation(kotlin("test-annotations-common")) } } - val jvmMain by getting { - dependencies { - implementation(kotlin("stdlib-jdk8")) - api("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlinSerialization") - } - } val jvmTest by getting { dependencies { implementation(kotlin("test")) implementation(kotlin("test-junit")) } } - val jsMain by getting { - dependencies { - implementation(kotlin("stdlib-js")) - api("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$kotlinSerialization") - } - } val jsTest by getting { dependencies { implementation(kotlin("test-js")) |