Skip to content

Migrate to Kotlin 2.2.21 compilerOptions DSL #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: dependabot/gradle/org.jetbrains.kotlin.jvm-2.2.21
Choose a base branch
from
Draft

Migrate to Kotlin 2.2.21 compilerOptions DSL #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3cbe54
Initial plan
Copilot Dec 16, 2025
965d9ec
Migrate kotlinOptions to compilerOptions DSL for Kotlin 2.2.21
Copilot Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ide-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ java {


tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = targetJvm
kotlinOptions.apiVersion = "1.4"
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(targetJvm))
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
}
}

tasks.getByName("buildSearchableOptions").enabled = false
Expand Down
6 changes: 3 additions & 3 deletions server/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ java {
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = targetJvm
apiVersion = "1.5"
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(targetJvm))
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
}
}

Expand Down
10 changes: 5 additions & 5 deletions server/src/test/kotlin/cloud/skadi/ApplicationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ApplicationTest {
withTestApplication({ testModuleSetup(dbName) }) {
handleRequest(HttpMethod.Get, "/").apply {
assertEquals(HttpStatusCode.OK, response.status())
val document = Jsoup.parse(response.content)
val document = Jsoup.parse(response.content!!)
val firstLinkInMenu = document.selectFirst("#menu > a")
assertNotNull(firstLinkInMenu)
assertEquals("Login", firstLinkInMenu.text())
Expand All @@ -37,7 +37,7 @@ class ApplicationTest {
login()
handleRequest(HttpMethod.Get, "/").apply {
assertEquals(HttpStatusCode.OK, response.status())
val document = Jsoup.parse(response.content)
val document = Jsoup.parse(response.content!!)
val firstLinkInMenu = document.selectFirst("#menu > ul > li:nth-child(1) > a")
assertNotNull(firstLinkInMenu)
assertEquals("Settings", firstLinkInMenu.text())
Expand Down Expand Up @@ -266,7 +266,7 @@ class ApplicationTest {
login()
val gistUrl = testGist()
val csrfToken = handleRequest(HttpMethod.Get, gistUrl.encodedPath + "/delete").run {
val document = Jsoup.parse(response.content)
val document = Jsoup.parse(response.content!!)
val csrf =
document.selectFirst("body > div.container > form > input[type=\"hidden\"]:nth-child(2)")
csrf?.attr("value")!!
Expand All @@ -290,7 +290,7 @@ class ApplicationTest {
login()
val gistUrl = testGist()
val csrfToken = handleRequest(HttpMethod.Get, gistUrl.encodedPath + "/delete").run {
val document = Jsoup.parse(response.content)
val document = Jsoup.parse(response.content!!)
val csrf =
document.selectFirst("body > div.container > form > input[type=\"hidden\"]:nth-child(2)")
csrf?.attr("value")!!
Expand All @@ -316,7 +316,7 @@ class ApplicationTest {
login()
val gistUrl = testGist()
val csrfToken = handleRequest(HttpMethod.Get, gistUrl.encodedPath + "/delete").run {
val document = Jsoup.parse(response.content)
val document = Jsoup.parse(response.content!!)
val csrf =
document.selectFirst("body > div.container > form > input[type=\"hidden\"]:nth-child(2)")
csrf?.attr("value")!!
Expand Down
12 changes: 8 additions & 4 deletions shared/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,15 @@ java {
}

compileKotlin {
kotlinOptions.jvmTarget = targetJvm
kotlinOptions.apiVersion = "1.4"
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(targetJvm)
apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
}
}

compileTestKotlin {
kotlinOptions.jvmTarget = targetJvm
kotlinOptions.apiVersion = "1.4"
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(targetJvm)
apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
}
}