diff options
| author | joffrey-bion <joffrey.bion@gmail.com> | 2021-01-30 00:24:09 +0100 |
|---|---|---|
| committer | joffrey-bion <joffrey.bion@gmail.com> | 2021-01-30 00:24:09 +0100 |
| commit | 11146a58ff9851881a14c048213d08e34d0634e3 (patch) | |
| tree | ee5417bad3c44efef99ccc1eff01aa2a317dcb6f | |
| parent | Move from Gson to Kotlin Serialization for definitions (diff) | |
| download | seven-wonders-11146a58ff9851881a14c048213d08e34d0634e3.tar.gz seven-wonders-11146a58ff9851881a14c048213d08e34d0634e3.tar.bz2 seven-wonders-11146a58ff9851881a14c048213d08e34d0634e3.zip | |
Upgrade Kotlin to 1.4.21 and corresponding UI deps
| -rw-r--r-- | build.gradle.kts | 2 | ||||
| -rw-r--r-- | sw-ui/build.gradle.kts | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 87da5b4e..46f043f3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { - val kotlinVersion = "1.4.10" + val kotlinVersion = "1.4.21" kotlin("js") version kotlinVersion apply false kotlin("jvm") version kotlinVersion apply false kotlin("multiplatform") version kotlinVersion apply false diff --git a/sw-ui/build.gradle.kts b/sw-ui/build.gradle.kts index f87ac49f..dc95896e 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.129-kotlin-1.4.10" +val kotlinWrappersVersion = "pre.144-kotlin-1.4.21" kotlin { js { @@ -21,7 +21,7 @@ kotlin { dependencies { implementation(project(":sw-client")) - val reactVersion = "17.0.0" + val reactVersion = "17.0.1" implementation("org.jetbrains:kotlin-react:$reactVersion-$kotlinWrappersVersion") implementation(npm("react", reactVersion)) implementation("org.jetbrains:kotlin-react-dom:$reactVersion-$kotlinWrappersVersion") @@ -31,7 +31,7 @@ kotlin { implementation("org.jetbrains:kotlin-react-redux:$reactReduxVersion-$kotlinWrappersVersion") implementation(npm("react-redux", reactReduxVersion)) // redux version aligned with the wrapper's build: - // https://github.com/JetBrains/kotlin-wrappers/blob/master/gradle.properties#L39 + // https://github.com/JetBrains/kotlin-wrappers/blob/master/gradle.properties#L42 implementation(npm("redux", "4.0.5")) val reactRouterDomVersion = "5.2.0" @@ -61,7 +61,6 @@ kotlin { tasks { "processResources"(ProcessResources::class) { val webpack = project.tasks.withType(KotlinWebpack::class).first() - into(webpack.destinationDirectory!!) val bundleFile = webpack.outputFileName val publicPath = "./" // TODO get public path from webpack config |