From 625e18edd452e6586791d225b9b99f22ee0e7dc8 Mon Sep 17 00:00:00 2001
From: "Victoria.Petrakovich" <victoria.petrakovich@jetbrains.com>
Date: Tue, 24 Jun 2025 12:39:37 +0200
Subject: [PATCH] [kotlin] Update Kotlin New Project wizard version to Kotlin
 2.2.0

KTIJ-34624


(cherry picked from commit c61735be51e47aec00cbd5eea11bca7ff18aa96b)

IJ-CR-167101

GitOrigin-RevId: 6600f06c312d2133d0daec29bcf901073d04bf45
---
 .../core/generated/KotlinGradleCompatibilityDefaultData.kt  | 6 ++++++
 .../core/generated/KotlinWizardVersionDefaultData.kt        | 2 +-
 .../compatibility/kotlin_gradle_compatibility.json          | 6 ++++++
 .../core/resources/compatibility/wizard_versions.json       | 2 +-
 .../wizard/GradleKotlinNewProjectWizardTestCase.kt          | 2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugins/kotlin/project-wizard/core/generated/KotlinGradleCompatibilityDefaultData.kt b/plugins/kotlin/project-wizard/core/generated/KotlinGradleCompatibilityDefaultData.kt
index 103166b73cae..b36e53e3b4d4 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.2.0",
         "2.1.21",
         "2.1.20",
         "2.1.10",
@@ -47,6 +48,11 @@ internal val DEFAULT_KOTLIN_GRADLE_COMPATIBILITY_DATA = KotlinGradleCompatibilit
         "1.5.0",
     ),
     compatibility = listOf(
+        KotlinGradleVersionMapping(
+            kotlin = "2.2.0-2.2.30",
+            gradle = "7.6.3-8.15",
+            maxJvmTarget = 24,
+        ),
         KotlinGradleVersionMapping(
             kotlin = "2.1.0-2.1.30",
             gradle = "7.6.3-8.15",
diff --git a/plugins/kotlin/project-wizard/core/generated/KotlinWizardVersionDefaultData.kt b/plugins/kotlin/project-wizard/core/generated/KotlinWizardVersionDefaultData.kt
index 2c4497602a1a..3ed287427ffe 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.1.21",
+    kotlinPluginVersion = "2.2.0",
     kotlinForComposeVersion = "1.7.20",
     composeCompilerExtension = "1.4.3",
     minGradleFoojayVersion = "7.6",
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 6243715d28d0..a289bca8e8d4 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.2.0",
             "2.1.21",
             "2.1.20",
             "2.1.10",
@@ -39,6 +40,11 @@
             "1.5.0"
         ],
         "compatibility": [
+            {
+                "kotlin": "2.2.0-2.2.30",
+                "gradle": "7.6.3-8.15",
+                "maxJvmTarget": 24
+            },
             {
                 "kotlin": "2.1.0-2.1.30",
                 "gradle": "7.6.3-8.15",
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 414e3e4b6c07..0f9599fa9f81 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.1.21",
+        "kotlinVersion": "2.2.0",
         "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 dd42c720184e..d74c8811094d 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.1.21",
+        kotlinJvmPluginVersion: String? = "2.2.0",
         configure: GradleBuildScriptBuilder<*>.() -> Unit = {}
     ) {
         withBuildFile {