Skip to content

Commit

Permalink
Merge pull request #97 from staktrace/kotlin2
Browse files Browse the repository at this point in the history
Update kotlin to 2.0.21
  • Loading branch information
jvmakine authored Jan 27, 2025
2 parents c713a08 + 95a52e4 commit b347f5f
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ version = project.properties["version"] ?: "1.0-SNAPSHOT"

plugins {
id("java")
kotlin("kapt") version "1.9.25"
kotlin("kapt") version "2.0.21"
id("org.jetbrains.intellij.platform") version "2.0.1"

id("org.jetbrains.kotlin.jvm") version "1.9.25"
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.25"
id("org.jetbrains.kotlin.jvm") version "2.0.21"
id("org.jetbrains.kotlin.plugin.serialization") version "2.0.21"
}

// region Build, dependencies
Expand Down Expand Up @@ -57,7 +57,7 @@ val product = products.first { it.releaseType == (System.getenv("RELEASE_TYPE")

val verifyOldVersions = System.getenv("VERIFY_VERSIONS") == "old"

val kotlinVersion = "1.9.25"
val kotlinVersion = "2.0.21"
val arrowVersion = "0.11.0"

dependencies {
Expand Down Expand Up @@ -88,12 +88,14 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-api:5.4.2")
}

tasks {
compileKotlin {
kotlinOptions.jvmTarget = "17"
kotlinOptions.freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
}
}

tasks {
test {
systemProperty("idea.force.use.core.classloader", "true")
}
Expand Down Expand Up @@ -153,4 +155,4 @@ tasks {
publishPlugin {
token.set(System.getenv("JETBRAINS_TOKEN")) // JETBRAINS_TOKEN env var available in CI
}
}
}

0 comments on commit b347f5f

Please sign in to comment.