Skip to content
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.

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

Test preview #19597

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Prev Previous commit
Next Next commit
Upgrade Kotlin to 2
  • Loading branch information
mustard-mh committed Jan 24, 2025
commit 207790197bbc758609bdfc561127048e2a9fc4a1
14 changes: 8 additions & 6 deletions components/ide/jetbrains/toolbox/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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(
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion components/public-api/java/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {