Skip to content

Commit 86a3acf

Browse files
committed
Upgrade Kotlin to 2
1 parent 0018b88 commit 86a3acf

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

components/ide/jetbrains/toolbox/build.gradle.kts

+8-6
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import com.github.jk1.license.filter.ExcludeTransitiveDependenciesFilter
66
import com.github.jk1.license.render.JsonReportRenderer
7-
import org.jetbrains.intellij.pluginRepository.PluginRepositoryFactory
87
import org.jetbrains.kotlin.com.intellij.openapi.util.SystemInfoRt
8+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
99
import java.nio.file.Path
1010
import kotlin.io.path.div
1111

@@ -94,10 +94,12 @@ licenseReport {
9494
filters = arrayOf(ExcludeTransitiveDependenciesFilter())
9595
}
9696

97+
98+
kotlin {
99+
jvmToolchain(21)
100+
}
97101
tasks.compileKotlin {
98-
kotlinOptions.freeCompilerArgs += listOf(
99-
"-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
100-
)
102+
compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
101103
}
102104

103105
val restartToolbox by tasks.creating {
@@ -180,8 +182,8 @@ val uploadPlugin by tasks.creating {
180182
dependsOn(pluginZip)
181183

182184
doLast {
183-
val token = System.getenv("JB_MARKETPLACE_PUBLISH_TOKEN")
184-
val instance = PluginRepositoryFactory.create("https://plugins.jetbrains.com", token)
185+
// val token = System.getenv("JB_MARKETPLACE_PUBLISH_TOKEN")
186+
// val instance = PluginRepositoryFactory.create("https://plugins.jetbrains.com", token)
185187

186188
// first upload
187189
// instance.uploader.uploadNewPlugin(

components/ide/jetbrains/toolbox/gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
gateway = "2.6.0.34606"
3-
kotlin = "1.9.0"
3+
kotlin = "2.0.10"
44
coroutines = "1.7.3"
55
serialization = "1.5.0"
66
okhttp = "4.10.0"

components/public-api/java/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
plugins {
66
// Apply the java-library plugin for API and implementation separation.
77
`java-library`
8-
id("org.jetbrains.kotlin.jvm") version "1.9.0"
8+
id("org.jetbrains.kotlin.jvm") version "2.0.10"
99
}
1010

1111
repositories {

0 commit comments

Comments
 (0)