Upgrade Kotlin to 2

gitpod-io · Dec 19, 2024 · 59e19e5 · 59e19e5
1 parent a0a149b
commit 59e19e5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/components/ide/jetbrains/toolbox/build.gradle.kts b/components/ide/jetbrains/toolbox/build.gradle.kts
@@ -4,8 +4,8 @@
 
 import com.github.jk1.license.filter.ExcludeTransitiveDependenciesFilter
 import com.github.jk1.license.render.JsonReportRenderer
-import org.jetbrains.intellij.pluginRepository.PluginRepositoryFactory
 import org.jetbrains.kotlin.com.intellij.openapi.util.SystemInfoRt
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.nio.file.Path
 import kotlin.io.path.div
 
@@ -94,10 +94,12 @@ licenseReport {
     filters = arrayOf(ExcludeTransitiveDependenciesFilter())
 }
 
+
+kotlin {
+    jvmToolchain(21)
+}
 tasks.compileKotlin {
-    kotlinOptions.freeCompilerArgs += listOf(
-        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
-    )
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
 }
 
 val restartToolbox by tasks.creating {
@@ -180,8 +182,8 @@ val uploadPlugin by tasks.creating {
     dependsOn(pluginZip)
 
     doLast {
-        val token = System.getenv("JB_MARKETPLACE_PUBLISH_TOKEN")
-        val instance = PluginRepositoryFactory.create("https://plugins.jetbrains.com", token)
+//        val token = System.getenv("JB_MARKETPLACE_PUBLISH_TOKEN")
+//        val instance = PluginRepositoryFactory.create("https://plugins.jetbrains.com", token)
 
         // first upload
         // instance.uploader.uploadNewPlugin(

diff --git a/components/ide/jetbrains/toolbox/gradle/libs.versions.toml b/components/ide/jetbrains/toolbox/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 gateway = "2.6.0.34606"
-kotlin = "1.9.0"
+kotlin = "2.0.10"
 coroutines = "1.7.3"
 serialization = "1.5.0"
 okhttp = "4.10.0"

diff --git a/components/public-api/java/build.gradle.kts b/components/public-api/java/build.gradle.kts
@@ -5,7 +5,7 @@
 plugins {
     // Apply the java-library plugin for API and implementation separation.
     `java-library`
-    id("org.jetbrains.kotlin.jvm") version "1.9.0"
+    id("org.jetbrains.kotlin.jvm") version "2.0.10"
 }
 
 repositories {