diff options
| author | Joffrey Bion <joffrey.bion@gmail.com> | 2021-11-17 16:45:43 +0100 |
|---|---|---|
| committer | Joffrey Bion <joffrey.bion@gmail.com> | 2021-11-18 01:40:53 +0100 |
| commit | 144649a4570cffdc6426e20073002dae9b9fd5e5 (patch) | |
| tree | 9d857d9ddabbcf45977e7d3c37a7b6a4229285ef /build.gradle.kts | |
| parent | Rename ci-cd workflow to deploy since it's manual now (diff) | |
| download | seven-wonders-144649a4570cffdc6426e20073002dae9b9fd5e5.tar.gz seven-wonders-144649a4570cffdc6426e20073002dae9b9fd5e5.tar.bz2 seven-wonders-144649a4570cffdc6426e20073002dae9b9fd5e5.zip | |
Upgrade to Kotlin 1.6.0 and JDK 17
Diffstat (limited to 'build.gradle.kts')
| -rw-r--r-- | build.gradle.kts | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index ac27625f..42ba7593 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,12 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { - val kotlinVersion = "1.5.31" + val kotlinVersion = "1.6.0" kotlin("js") version kotlinVersion apply false kotlin("jvm") version kotlinVersion apply false kotlin("multiplatform") version kotlinVersion apply false kotlin("plugin.spring") version kotlinVersion apply false kotlin("plugin.serialization") version kotlinVersion apply false - id("org.jlleitschuh.gradle.ktlint") version "10.1.0" } allprojects { @@ -17,20 +16,14 @@ allprojects { } subprojects { - apply(plugin = "org.jlleitschuh.gradle.ktlint") - - ktlint { - disabledRules.set(setOf("no-wildcard-imports")) - } - tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> { // JVM only - kotlinOptions.jvmTarget = "15" + kotlinOptions.jvmTarget = "17" } tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> { kotlinOptions.freeCompilerArgs += listOf( "-Xopt-in=kotlin.RequiresOptIn", - "-Xopt-in=kotlin.time.ExperimentalTime", + "-Xopt-in=kotlin.time.ExperimentalTime", // for measureTimedValue and withTimeout(Duration) "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi" ) } |