From 9ea05fee4497b3bf35d521c693389ad6cde3e806 Mon Sep 17 00:00:00 2001 From: Victoria Petrakovich Date: Mon, 16 Mar 2026 14:07:44 +0100 Subject: [PATCH] [kotlin] KTIJ-37734 Update Kotlin version in wizard to 2.3.20 (cherry picked from commit 3e6d1029d184e71ea7f3bfd811f29939ab4b11a2) IJ-CR-196903 GitOrigin-RevId: 0090ea583ea04df475e375cc0d9fb6d2e95a757c --- .../idea/framework/ui/ConfigureDialogWithModulesAndVersion.kt | 2 +- .../core/generated/KotlinGradleCompatibilityDefaultData.kt | 1 + .../core/generated/KotlinWizardVersionDefaultData.kt | 2 +- .../resources/compatibility/kotlin_gradle_compatibility.json | 1 + .../core/resources/compatibility/wizard_versions.json | 2 +- .../wizard/GradleKotlinNewProjectWizardTestCase.kt | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.kt b/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.kt index e7cf5b9ba13a..3fb56e507e52 100644 --- a/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.kt +++ b/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.kt @@ -219,7 +219,7 @@ class ConfigureDialogWithModulesAndVersion( private const val MODULES_TO_DISPLAY_SIZE = 2 - internal const val DEFAULT_KOTLIN_VERSION = "2.3.10" + internal const val DEFAULT_KOTLIN_VERSION = "2.3.20" @JvmStatic val defaultKotlinVersion: IdeKotlinVersion diff --git a/plugins/kotlin/project-wizard/core/generated/KotlinGradleCompatibilityDefaultData.kt b/plugins/kotlin/project-wizard/core/generated/KotlinGradleCompatibilityDefaultData.kt index 10c9a83571f7..7969d14c3b7e 100644 --- a/plugins/kotlin/project-wizard/core/generated/KotlinGradleCompatibilityDefaultData.kt +++ b/plugins/kotlin/project-wizard/core/generated/KotlinGradleCompatibilityDefaultData.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.tools.projectWizard.compatibility.KotlinGradleCompat */ internal val DEFAULT_KOTLIN_GRADLE_COMPATIBILITY_DATA = KotlinGradleCompatibilityState( kotlinVersions = listOf( + "2.3.20", "2.3.10", "2.3.0", "2.2.21", diff --git a/plugins/kotlin/project-wizard/core/generated/KotlinWizardVersionDefaultData.kt b/plugins/kotlin/project-wizard/core/generated/KotlinWizardVersionDefaultData.kt index a573ebd2c701..0e30a56439e5 100644 --- a/plugins/kotlin/project-wizard/core/generated/KotlinWizardVersionDefaultData.kt +++ b/plugins/kotlin/project-wizard/core/generated/KotlinWizardVersionDefaultData.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.tools.projectWizard.compatibility.KotlinWizardVersio * DO NOT EDIT IT BY HAND, run "Generate Kotlin Wizard Default Data" configuration instead */ internal val DEFAULT_KOTLIN_WIZARD_VERSIONS = KotlinWizardVersionState( - kotlinPluginVersion = "2.3.10", + kotlinPluginVersion = "2.3.20", kotlinForComposeVersion = "1.7.20", composeCompilerExtension = "1.4.3", minKotlinFoojayVersion = "1.5.30", diff --git a/plugins/kotlin/project-wizard/core/resources/compatibility/kotlin_gradle_compatibility.json b/plugins/kotlin/project-wizard/core/resources/compatibility/kotlin_gradle_compatibility.json index 0736b740d4ad..bdfcafe76b7f 100644 --- a/plugins/kotlin/project-wizard/core/resources/compatibility/kotlin_gradle_compatibility.json +++ b/plugins/kotlin/project-wizard/core/resources/compatibility/kotlin_gradle_compatibility.json @@ -2,6 +2,7 @@ { "ideVersion": "2023.1 EAP-INF", "kotlinVersions": [ + "2.3.20", "2.3.10", "2.3.0", "2.2.21", diff --git a/plugins/kotlin/project-wizard/core/resources/compatibility/wizard_versions.json b/plugins/kotlin/project-wizard/core/resources/compatibility/wizard_versions.json index 5c72273fc81b..bbec481b4d50 100644 --- a/plugins/kotlin/project-wizard/core/resources/compatibility/wizard_versions.json +++ b/plugins/kotlin/project-wizard/core/resources/compatibility/wizard_versions.json @@ -2,7 +2,7 @@ { "ideVersion": "2023.1 EAP-INF", - "kotlinVersion": "2.3.10", + "kotlinVersion": "2.3.20", "kotlinForComposeVersion": "1.7.20", "composeCompilerExtension": "1.4.3", diff --git a/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/GradleKotlinNewProjectWizardTestCase.kt b/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/GradleKotlinNewProjectWizardTestCase.kt index e3e9b267910e..a3d681e23f0a 100644 --- a/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/GradleKotlinNewProjectWizardTestCase.kt +++ b/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/GradleKotlinNewProjectWizardTestCase.kt @@ -64,7 +64,7 @@ abstract class GradleKotlinNewProjectWizardTestCase : GradleNewProjectWizardTest } fun ModuleInfo.Builder.withKotlinBuildFile( - kotlinJvmPluginVersion: String? = "2.3.10", + kotlinJvmPluginVersion: String? = "2.3.20", configure: GradleBuildScriptBuilder<*>.() -> Unit = {} ) { withBuildFile {