diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 83bdaec1cfc6..3810af1dabd4 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -7,8 +7,8 @@
     <option name="jvmTarget" value="17" />
   </component>
   <component name="KotlinCommonCompilerArguments">
-    <option name="apiVersion" value="2.0" />
-    <option name="languageVersion" value="2.0" />
+    <option name="apiVersion" value="2.1" />
+    <option name="languageVersion" value="2.1" />
   </component>
   <component name="KotlinCompilerSettings">
     <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi" />
diff --git a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
index 9ed008c77da5..0e4f5295b4d8 100644
--- a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
+++ b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/build/tasks/intellij.idea.community.build.tasks.iml b/build/tasks/intellij.idea.community.build.tasks.iml
index 98308ecf0ff8..329ce522368f 100644
--- a/build/tasks/intellij.idea.community.build.tasks.iml
+++ b/build/tasks/intellij.idea.community.build.tasks.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/fleet/andel/fleet.andel.iml b/fleet/andel/fleet.andel.iml
index 2aca084c4600..20c6708d248b 100644
--- a/fleet/andel/fleet.andel.iml
+++ b/fleet/andel/fleet.andel.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/fleet/fastutil/fleet.fastutil.iml b/fleet/fastutil/fleet.fastutil.iml
index 80c44a014dd7..44fdd5f0da05 100644
--- a/fleet/fastutil/fleet.fastutil.iml
+++ b/fleet/fastutil/fleet.fastutil.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/fleet/kernel/fleet.kernel.iml b/fleet/kernel/fleet.kernel.iml
index d3c1f5d98b8e..43154f401657 100644
--- a/fleet/kernel/fleet.kernel.iml
+++ b/fleet/kernel/fleet.kernel.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/fleet/multiplatform.shims/fleet.multiplatform.shims.iml b/fleet/multiplatform.shims/fleet.multiplatform.shims.iml
index ebb30be14912..1acb0f11ce25 100644
--- a/fleet/multiplatform.shims/fleet.multiplatform.shims.iml
+++ b/fleet/multiplatform.shims/fleet.multiplatform.shims.iml
@@ -6,8 +6,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/fleet/reporting/shared/fleet.reporting.shared.iml b/fleet/reporting/shared/fleet.reporting.shared.iml
index 9d05fb5833b5..b9f7e9fbe130 100644
--- a/fleet/reporting/shared/fleet.reporting.shared.iml
+++ b/fleet/reporting/shared/fleet.reporting.shared.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/fleet/rhizomedb/fleet.rhizomedb.iml b/fleet/rhizomedb/fleet.rhizomedb.iml
index d2d820bf5f4e..f82c5c558035 100644
--- a/fleet/rhizomedb/fleet.rhizomedb.iml
+++ b/fleet/rhizomedb/fleet.rhizomedb.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/fleet/rpc/fleet.rpc.iml b/fleet/rpc/fleet.rpc.iml
index 7ae066d36d1d..8725b9c56c58 100644
--- a/fleet/rpc/fleet.rpc.iml
+++ b/fleet/rpc/fleet.rpc.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/fleet/util/core/fleet.util.core.iml b/fleet/util/core/fleet.util.core.iml
index a6ed471b063f..1defee5f8407 100644
--- a/fleet/util/core/fleet.util.core.iml
+++ b/fleet/util/core/fleet.util.core.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/fleet/util/logging/api/fleet.util.logging.api.iml b/fleet/util/logging/api/fleet.util.logging.api.iml
index f699c066b466..11e03a5ff914 100644
--- a/fleet/util/logging/api/fleet.util.logging.api.iml
+++ b/fleet/util/logging/api/fleet.util.logging.api.iml
@@ -6,8 +6,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/images/intellij.platform.images.iml b/images/intellij.platform.images.iml
index f88108111ee2..91cd753848dd 100644
--- a/images/intellij.platform.images.iml
+++ b/images/intellij.platform.images.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/java/debugger/backend/intellij.java.debugger.impl.backend.iml b/java/debugger/backend/intellij.java.debugger.impl.backend.iml
index 70e15ebbbc47..0912ebd3de0b 100644
--- a/java/debugger/backend/intellij.java.debugger.impl.backend.iml
+++ b/java/debugger/backend/intellij.java.debugger.impl.backend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/java/debugger/frontend/intellij.java.debugger.impl.frontend.iml b/java/debugger/frontend/intellij.java.debugger.impl.frontend.iml
index f3ff92e68942..54b55df0b995 100644
--- a/java/debugger/frontend/intellij.java.debugger.impl.frontend.iml
+++ b/java/debugger/frontend/intellij.java.debugger.impl.frontend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/java/debugger/impl/intellij.java.debugger.impl.iml b/java/debugger/impl/intellij.java.debugger.impl.iml
index 7100ad5e700b..17783c651a53 100644
--- a/java/debugger/impl/intellij.java.debugger.impl.iml
+++ b/java/debugger/impl/intellij.java.debugger.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/java/debugger/shared/intellij.java.debugger.impl.shared.iml b/java/debugger/shared/intellij.java.debugger.impl.shared.iml
index 585352086c46..69dcafdf1e3c 100644
--- a/java/debugger/shared/intellij.java.debugger.impl.shared.iml
+++ b/java/debugger/shared/intellij.java.debugger.impl.shared.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/java/java-frontback-psi-api/intellij.java.frontback.psi.iml b/java/java-frontback-psi-api/intellij.java.frontback.psi.iml
index e6ec51fd89ad..b2a470ebc73f 100644
--- a/java/java-frontback-psi-api/intellij.java.frontback.psi.iml
+++ b/java/java-frontback-psi-api/intellij.java.frontback.psi.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml b/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml
index 2d218d09c7a2..2e5829d86e82 100644
--- a/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml
+++ b/java/java-frontback-psi-impl/intellij.java.frontback.psi.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/java/java-psi-api/intellij.java.psi.iml b/java/java-psi-api/intellij.java.psi.iml
index eae91fb228d2..783071712224 100644
--- a/java/java-psi-api/intellij.java.psi.iml
+++ b/java/java-psi-api/intellij.java.psi.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/java/java-psi-impl/intellij.java.psi.impl.iml b/java/java-psi-impl/intellij.java.psi.impl.iml
index 5b545e981e77..4513b05db7fe 100644
--- a/java/java-psi-impl/intellij.java.psi.impl.iml
+++ b/java/java-psi-impl/intellij.java.psi.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/java/java-syntax/intellij.java.syntax.iml b/java/java-syntax/intellij.java.syntax.iml
index 0b9264a78950..44c49935f4df 100644
--- a/java/java-syntax/intellij.java.syntax.iml
+++ b/java/java-syntax/intellij.java.syntax.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/jps/jps-builders/intellij.platform.jps.build.iml b/jps/jps-builders/intellij.platform.jps.build.iml
index 42974934e42a..5e0827a73b7b 100644
--- a/jps/jps-builders/intellij.platform.jps.build.iml
+++ b/jps/jps-builders/intellij.platform.jps.build.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/jps/jps-launcher/intellij.platform.jps.build.launcher.iml b/jps/jps-launcher/intellij.platform.jps.build.launcher.iml
index 8a55863aa3bb..d9a707fae140 100644
--- a/jps/jps-launcher/intellij.platform.jps.build.launcher.iml
+++ b/jps/jps-launcher/intellij.platform.jps.build.launcher.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/jps/model-api/intellij.platform.jps.model.iml b/jps/model-api/intellij.platform.jps.model.iml
index cb5372dce00e..0803ea777000 100644
--- a/jps/model-api/intellij.platform.jps.model.iml
+++ b/jps/model-api/intellij.platform.jps.model.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/jps/model-impl/intellij.platform.jps.model.impl.iml b/jps/model-impl/intellij.platform.jps.model.impl.iml
index b0b30ab27885..4eb8af6f7887 100644
--- a/jps/model-impl/intellij.platform.jps.model.impl.iml
+++ b/jps/model-impl/intellij.platform.jps.model.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/jps/model-serialization/intellij.platform.jps.model.serialization.iml b/jps/model-serialization/intellij.platform.jps.model.serialization.iml
index db9d73caca86..03978dda07ff 100644
--- a/jps/model-serialization/intellij.platform.jps.model.serialization.iml
+++ b/jps/model-serialization/intellij.platform.jps.model.serialization.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/jps/standalone-builder/intellij.tools.jps.build.standalone.iml b/jps/standalone-builder/intellij.tools.jps.build.standalone.iml
index dd0eac4b8372..cd7d692d482c 100644
--- a/jps/standalone-builder/intellij.tools.jps.build.standalone.iml
+++ b/jps/standalone-builder/intellij.tools.jps.build.standalone.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/notebooks/notebook-ui/intellij.notebooks.ui.iml b/notebooks/notebook-ui/intellij.notebooks.ui.iml
index 55cdb5120a8d..bfe64a2d77a6 100644
--- a/notebooks/notebook-ui/intellij.notebooks.ui.iml
+++ b/notebooks/notebook-ui/intellij.notebooks.ui.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/notebooks/visualization/intellij.notebooks.visualization.iml b/notebooks/visualization/intellij.notebooks.visualization.iml
index 1393cf632fb0..2479179053d0 100644
--- a/notebooks/visualization/intellij.notebooks.visualization.iml
+++ b/notebooks/visualization/intellij.notebooks.visualization.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/backend/workspace/intellij.platform.backend.workspace.iml b/platform/backend/workspace/intellij.platform.backend.workspace.iml
index b357ca029084..2aa6bbfd628d 100644
--- a/platform/backend/workspace/intellij.platform.backend.workspace.iml
+++ b/platform/backend/workspace/intellij.platform.backend.workspace.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/bookmarks/backend/intellij.platform.bookmarks.backend.iml b/platform/bookmarks/backend/intellij.platform.bookmarks.backend.iml
index 566c8a5c092f..1b4232b75131 100644
--- a/platform/bookmarks/backend/intellij.platform.bookmarks.backend.iml
+++ b/platform/bookmarks/backend/intellij.platform.bookmarks.backend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/bookmarks/frontend/intellij.platform.bookmarks.frontend.iml b/platform/bookmarks/frontend/intellij.platform.bookmarks.frontend.iml
index 1009c91c8270..900b823001c4 100644
--- a/platform/bookmarks/frontend/intellij.platform.bookmarks.frontend.iml
+++ b/platform/bookmarks/frontend/intellij.platform.bookmarks.frontend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/bookmarks/intellij.platform.bookmarks.iml b/platform/bookmarks/intellij.platform.bookmarks.iml
index ec2c9eb75143..ab6d5092e173 100644
--- a/platform/bookmarks/intellij.platform.bookmarks.iml
+++ b/platform/bookmarks/intellij.platform.bookmarks.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/bootstrap/coroutine/intellij.platform.bootstrap.coroutine.iml b/platform/bootstrap/coroutine/intellij.platform.bootstrap.coroutine.iml
index 311edc1b84f9..dd1739e4bd7b 100644
--- a/platform/bootstrap/coroutine/intellij.platform.bootstrap.coroutine.iml
+++ b/platform/bootstrap/coroutine/intellij.platform.bootstrap.coroutine.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/build-scripts/bazel/intellij.platform.buildScripts.bazel.iml b/platform/build-scripts/bazel/intellij.platform.buildScripts.bazel.iml
index ff00f8c18370..2db9d10dd8d1 100644
--- a/platform/build-scripts/bazel/intellij.platform.buildScripts.bazel.iml
+++ b/platform/build-scripts/bazel/intellij.platform.buildScripts.bazel.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/build-scripts/dev-server/intellij.platform.buildScripts.devBuildServer.iml b/platform/build-scripts/dev-server/intellij.platform.buildScripts.devBuildServer.iml
index a9baa31cf187..14cd72905bad 100644
--- a/platform/build-scripts/dev-server/intellij.platform.buildScripts.devBuildServer.iml
+++ b/platform/build-scripts/dev-server/intellij.platform.buildScripts.devBuildServer.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/build-scripts/intellij.platform.buildScripts.iml b/platform/build-scripts/intellij.platform.buildScripts.iml
index c9e780dfa913..2ba3adccb7fc 100644
--- a/platform/build-scripts/intellij.platform.buildScripts.iml
+++ b/platform/build-scripts/intellij.platform.buildScripts.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/buildData/intellij.platform.buildData.iml b/platform/buildData/intellij.platform.buildData.iml
index 58bc54b1cc8a..31c9c3c93139 100644
--- a/platform/buildData/intellij.platform.buildData.iml
+++ b/platform/buildData/intellij.platform.buildData.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/compose/intellij.platform.compose.iml b/platform/compose/intellij.platform.compose.iml
index b5545071f11f..8b01012111ff 100644
--- a/platform/compose/intellij.platform.compose.iml
+++ b/platform/compose/intellij.platform.compose.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
index 2cf2de3fb4b6..ffec10e21cbe 100644
--- a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
+++ b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/core-api/intellij.platform.core.iml b/platform/core-api/intellij.platform.core.iml
index a8cb68283621..fed0bd1b4a87 100644
--- a/platform/core-api/intellij.platform.core.iml
+++ b/platform/core-api/intellij.platform.core.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/core-impl/intellij.platform.core.impl.iml b/platform/core-impl/intellij.platform.core.impl.iml
index da9301f2d862..07de71e8a725 100644
--- a/platform/core-impl/intellij.platform.core.impl.iml
+++ b/platform/core-impl/intellij.platform.core.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml b/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml
index c77df6d4b698..168058546870 100644
--- a/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml
+++ b/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/diagnostic/intellij.platform.diagnostic.iml b/platform/diagnostic/intellij.platform.diagnostic.iml
index 9db13662db5f..0514eb5054db 100644
--- a/platform/diagnostic/intellij.platform.diagnostic.iml
+++ b/platform/diagnostic/intellij.platform.diagnostic.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml b/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml
index c50af91ba115..68cf7065d905 100644
--- a/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml
+++ b/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml b/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml
index 2a5414d3b2e9..3175978f4184 100644
--- a/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml
+++ b/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml b/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml
index 98ee5e051551..2d2695c70c1e 100644
--- a/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml
+++ b/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/diagnostic/telemetry/intellij.platform.diagnostic.telemetry.iml b/platform/diagnostic/telemetry/intellij.platform.diagnostic.telemetry.iml
index 2880c8f55511..6ca29adcea16 100644
--- a/platform/diagnostic/telemetry/intellij.platform.diagnostic.telemetry.iml
+++ b/platform/diagnostic/telemetry/intellij.platform.diagnostic.telemetry.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/diagnostic/telemetry/rt/intellij.platform.diagnostic.telemetry.rt.iml b/platform/diagnostic/telemetry/rt/intellij.platform.diagnostic.telemetry.rt.iml
index ceac8fef685c..891b1bd2dbda 100644
--- a/platform/diagnostic/telemetry/rt/intellij.platform.diagnostic.telemetry.rt.iml
+++ b/platform/diagnostic/telemetry/rt/intellij.platform.diagnostic.telemetry.rt.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/execution-impl/backend/intellij.platform.execution.impl.backend.iml b/platform/execution-impl/backend/intellij.platform.execution.impl.backend.iml
index 87fd90a45f33..2acb775b7e9c 100644
--- a/platform/execution-impl/backend/intellij.platform.execution.impl.backend.iml
+++ b/platform/execution-impl/backend/intellij.platform.execution.impl.backend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/execution-impl/frontend/intellij.platform.execution.impl.frontend.iml b/platform/execution-impl/frontend/intellij.platform.execution.impl.frontend.iml
index bda56de161b8..954d2acdde5b 100644
--- a/platform/execution-impl/frontend/intellij.platform.execution.impl.frontend.iml
+++ b/platform/execution-impl/frontend/intellij.platform.execution.impl.frontend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/execution-impl/intellij.platform.execution.impl.iml b/platform/execution-impl/intellij.platform.execution.impl.iml
index e7f364dd7126..52399ac19015 100644
--- a/platform/execution-impl/intellij.platform.execution.impl.iml
+++ b/platform/execution-impl/intellij.platform.execution.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/extensions/intellij.platform.extensions.iml b/platform/extensions/intellij.platform.extensions.iml
index 62d9fea609dc..188e284c1720 100644
--- a/platform/extensions/intellij.platform.extensions.iml
+++ b/platform/extensions/intellij.platform.extensions.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
index 5fac37f85772..14a25c9654d9 100644
--- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/feedback/intellij.platform.feedback.iml b/platform/feedback/intellij.platform.feedback.iml
index ae08b9cf44df..6ba91a419593 100644
--- a/platform/feedback/intellij.platform.feedback.iml
+++ b/platform/feedback/intellij.platform.feedback.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/ide-core/intellij.platform.ide.core.iml b/platform/ide-core/intellij.platform.ide.core.iml
index 04c8a823bd32..b07acd35e849 100644
--- a/platform/ide-core/intellij.platform.ide.core.iml
+++ b/platform/ide-core/intellij.platform.ide.core.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/ide-core/plugins/intellij.platform.ide.core.plugins.iml b/platform/ide-core/plugins/intellij.platform.ide.core.plugins.iml
index 655e5e6c3c35..debfc2391bbd 100644
--- a/platform/ide-core/plugins/intellij.platform.ide.core.plugins.iml
+++ b/platform/ide-core/plugins/intellij.platform.ide.core.plugins.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/inspect/intellij.platform.inspect.iml b/platform/inspect/intellij.platform.inspect.iml
index 8ff29f2c2782..34e51063808c 100644
--- a/platform/inspect/intellij.platform.inspect.iml
+++ b/platform/inspect/intellij.platform.inspect.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml b/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml
index ae144c5eb62e..ddd93fc52a7e 100644
--- a/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml
+++ b/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/foundation/intellij.platform.jewel.foundation.iml b/platform/jewel/foundation/intellij.platform.jewel.foundation.iml
index 76e975a3124e..ece7709e52c7 100644
--- a/platform/jewel/foundation/intellij.platform.jewel.foundation.iml
+++ b/platform/jewel/foundation/intellij.platform.jewel.foundation.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml
index 5c76e02c5bf8..84953bd3e63d 100644
--- a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml
+++ b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml b/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml
index 8a5e92526bd6..b46e751310eb 100644
--- a/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml
+++ b/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml b/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml
index 2d4aa4ab91d7..bd8361c3448d 100644
--- a/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml
+++ b/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml b/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml
index 44909e559ffe..fca8bebd81ab 100644
--- a/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml
+++ b/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/markdown/extensions/autolink/intellij.platform.jewel.markdown.extensions.autolink.iml b/platform/jewel/markdown/extensions/autolink/intellij.platform.jewel.markdown.extensions.autolink.iml
index 47793e9512fb..1fd1e7f2a715 100644
--- a/platform/jewel/markdown/extensions/autolink/intellij.platform.jewel.markdown.extensions.autolink.iml
+++ b/platform/jewel/markdown/extensions/autolink/intellij.platform.jewel.markdown.extensions.autolink.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/markdown/extensions/gfm-alerts/intellij.platform.jewel.markdown.extensions.gfmAlerts.iml b/platform/jewel/markdown/extensions/gfm-alerts/intellij.platform.jewel.markdown.extensions.gfmAlerts.iml
index 8b756cc21e9b..bd4e81af9932 100644
--- a/platform/jewel/markdown/extensions/gfm-alerts/intellij.platform.jewel.markdown.extensions.gfmAlerts.iml
+++ b/platform/jewel/markdown/extensions/gfm-alerts/intellij.platform.jewel.markdown.extensions.gfmAlerts.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/markdown/extensions/gfm-strikethrough/intellij.platform.jewel.markdown.extensions.gfmStrikethrough.iml b/platform/jewel/markdown/extensions/gfm-strikethrough/intellij.platform.jewel.markdown.extensions.gfmStrikethrough.iml
index dce97ff8d989..44672a7fb749 100644
--- a/platform/jewel/markdown/extensions/gfm-strikethrough/intellij.platform.jewel.markdown.extensions.gfmStrikethrough.iml
+++ b/platform/jewel/markdown/extensions/gfm-strikethrough/intellij.platform.jewel.markdown.extensions.gfmStrikethrough.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/markdown/extensions/gfm-tables/intellij.platform.jewel.markdown.extensions.gfmTables.iml b/platform/jewel/markdown/extensions/gfm-tables/intellij.platform.jewel.markdown.extensions.gfmTables.iml
index 683df4b7c219..4a6c4308e6a1 100644
--- a/platform/jewel/markdown/extensions/gfm-tables/intellij.platform.jewel.markdown.extensions.gfmTables.iml
+++ b/platform/jewel/markdown/extensions/gfm-tables/intellij.platform.jewel.markdown.extensions.gfmTables.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml b/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml
index 6018a58bcb9f..c0262ff9eb5c 100644
--- a/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml
+++ b/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml b/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml
index 4eb1682f63c7..3bbc7504b8fd 100644
--- a/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml
+++ b/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml b/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml
index 825f13271828..38e93eac0dc1 100644
--- a/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml
+++ b/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/samples/showcase/intellij.platform.jewel.samples.showcase.iml b/platform/jewel/samples/showcase/intellij.platform.jewel.samples.showcase.iml
index 064574339896..b6644eda73ee 100644
--- a/platform/jewel/samples/showcase/intellij.platform.jewel.samples.showcase.iml
+++ b/platform/jewel/samples/showcase/intellij.platform.jewel.samples.showcase.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml b/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml
index 812fe1e3ec5e..de3f7f923890 100644
--- a/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml
+++ b/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml b/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml
index 99cdc18ef27e..667c9329c05e 100644
--- a/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml
+++ b/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/jewel/ui/intellij.platform.jewel.ui.iml b/platform/jewel/ui/intellij.platform.jewel.ui.iml
index 07fe0b77901d..bbd4c16661ef 100644
--- a/platform/jewel/ui/intellij.platform.jewel.ui.iml
+++ b/platform/jewel/ui/intellij.platform.jewel.ui.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/kernel/backend/intellij.platform.kernel.backend.iml b/platform/kernel/backend/intellij.platform.kernel.backend.iml
index 1918cad8da99..9ae6f5b8311f 100644
--- a/platform/kernel/backend/intellij.platform.kernel.backend.iml
+++ b/platform/kernel/backend/intellij.platform.kernel.backend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/kernel/pasta/intellij.platform.pasta.iml b/platform/kernel/pasta/intellij.platform.pasta.iml
index 9e03153e8b77..de20da21f995 100644
--- a/platform/kernel/pasta/intellij.platform.pasta.iml
+++ b/platform/kernel/pasta/intellij.platform.pasta.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/kernel/shared/intellij.platform.kernel.iml b/platform/kernel/shared/intellij.platform.kernel.iml
index db83fb6432b5..9d0692ae1e2e 100644
--- a/platform/kernel/shared/intellij.platform.kernel.iml
+++ b/platform/kernel/shared/intellij.platform.kernel.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index 99361f626cc5..1a830656c323 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/ml-impl/intellij.platform.ml.impl.iml b/platform/ml-impl/intellij.platform.ml.impl.iml
index 783414341d39..5203379ae033 100644
--- a/platform/ml-impl/intellij.platform.ml.impl.iml
+++ b/platform/ml-impl/intellij.platform.ml.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml b/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml
index 6a8e83d78274..984c3accb06a 100644
--- a/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml
+++ b/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml b/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml
index 3fc434b32971..0487adf65d83 100644
--- a/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml
+++ b/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index e840c8e0f08c..ea60c4f041d1 100644
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/platform-impl/rpc/intellij.platform.ide.rpc.iml b/platform/platform-impl/rpc/intellij.platform.ide.rpc.iml
index 7094aaca6f9a..4d1f395d3efc 100644
--- a/platform/platform-impl/rpc/intellij.platform.ide.rpc.iml
+++ b/platform/platform-impl/rpc/intellij.platform.ide.rpc.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/platform-impl/ui/intellij.platform.ide.ui.iml b/platform/platform-impl/ui/intellij.platform.ide.ui.iml
index 2e662f9986d9..3e03932339ba 100644
--- a/platform/platform-impl/ui/intellij.platform.ide.ui.iml
+++ b/platform/platform-impl/ui/intellij.platform.ide.ui.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/platform-tests/durability/intellij.platform.durability.iml b/platform/platform-tests/durability/intellij.platform.durability.iml
index a63c833b73d0..823258d74623 100644
--- a/platform/platform-tests/durability/intellij.platform.durability.iml
+++ b/platform/platform-tests/durability/intellij.platform.durability.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/plugins/parser/impl/intellij.platform.plugins.parser.impl.iml b/platform/plugins/parser/impl/intellij.platform.plugins.parser.impl.iml
index 3d0252657469..b0e18043b578 100644
--- a/platform/plugins/parser/impl/intellij.platform.plugins.parser.impl.iml
+++ b/platform/plugins/parser/impl/intellij.platform.plugins.parser.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/progress/shared/intellij.platform.ide.progress.iml b/platform/progress/shared/intellij.platform.ide.progress.iml
index 6d0b314ed348..592ffd6e245e 100644
--- a/platform/progress/shared/intellij.platform.ide.progress.iml
+++ b/platform/progress/shared/intellij.platform.ide.progress.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/project/shared/intellij.platform.project.iml b/platform/project/shared/intellij.platform.project.iml
index 9ead44734e74..b64fbe1fe95e 100644
--- a/platform/project/shared/intellij.platform.project.iml
+++ b/platform/project/shared/intellij.platform.project.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/recentFiles/backend/intellij.platform.recentFiles.backend.iml b/platform/recentFiles/backend/intellij.platform.recentFiles.backend.iml
index ff4c8b94da12..40dd4be654a0 100644
--- a/platform/recentFiles/backend/intellij.platform.recentFiles.backend.iml
+++ b/platform/recentFiles/backend/intellij.platform.recentFiles.backend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/recentFiles/frontend/intellij.platform.recentFiles.frontend.iml b/platform/recentFiles/frontend/intellij.platform.recentFiles.frontend.iml
index 0f300801b96c..69768776a2d8 100644
--- a/platform/recentFiles/frontend/intellij.platform.recentFiles.frontend.iml
+++ b/platform/recentFiles/frontend/intellij.platform.recentFiles.frontend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/recentFiles/shared/intellij.platform.recentFiles.iml b/platform/recentFiles/shared/intellij.platform.recentFiles.iml
index 4722cbb44369..bb95e19b8d11 100644
--- a/platform/recentFiles/shared/intellij.platform.recentFiles.iml
+++ b/platform/recentFiles/shared/intellij.platform.recentFiles.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/remote-driver/test-sdk/intellij.driver.sdk.iml b/platform/remote-driver/test-sdk/intellij.driver.sdk.iml
index aebb523827fd..71e00ef7931f 100644
--- a/platform/remote-driver/test-sdk/intellij.driver.sdk.iml
+++ b/platform/remote-driver/test-sdk/intellij.driver.sdk.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/remoteDev-util/intellij.remoteDev.util.iml b/platform/remoteDev-util/intellij.remoteDev.util.iml
index 6526cc4105ca..970c4de57594 100644
--- a/platform/remoteDev-util/intellij.remoteDev.util.iml
+++ b/platform/remoteDev-util/intellij.remoteDev.util.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/runtime/product/intellij.platform.runtime.product.iml b/platform/runtime/product/intellij.platform.runtime.product.iml
index 3a774d5ee99b..807110ad0d17 100644
--- a/platform/runtime/product/intellij.platform.runtime.product.iml
+++ b/platform/runtime/product/intellij.platform.runtime.product.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml b/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml
index 6eb1163da69c..0ef3090e3b32 100644
--- a/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml
+++ b/platform/searchEverywhere/backend/intellij.platform.searchEverywhere.backend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/searchEverywhere/frontend/intellij.platform.searchEverywhere.frontend.iml b/platform/searchEverywhere/frontend/intellij.platform.searchEverywhere.frontend.iml
index 365c607a4646..9fd0e07c7e3e 100644
--- a/platform/searchEverywhere/frontend/intellij.platform.searchEverywhere.frontend.iml
+++ b/platform/searchEverywhere/frontend/intellij.platform.searchEverywhere.frontend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml b/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml
index a86634374291..9ab8665669d7 100644
--- a/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml
+++ b/platform/searchEverywhere/shared/intellij.platform.searchEverywhere.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/settings-local/intellij.platform.settings.local.iml b/platform/settings-local/intellij.platform.settings.local.iml
index 9737319a3087..acab048c6c6b 100644
--- a/platform/settings-local/intellij.platform.settings.local.iml
+++ b/platform/settings-local/intellij.platform.settings.local.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/settings-sync-core/intellij.settingsSync.core.iml b/platform/settings-sync-core/intellij.settingsSync.core.iml
index 6233c1fec959..a1ecbf42c46c 100644
--- a/platform/settings-sync-core/intellij.settingsSync.core.iml
+++ b/platform/settings-sync-core/intellij.settingsSync.core.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/syntax/syntax-api/intellij.platform.syntax.iml b/platform/syntax/syntax-api/intellij.platform.syntax.iml
index cc5723269629..493748d1508d 100644
--- a/platform/syntax/syntax-api/intellij.platform.syntax.iml
+++ b/platform/syntax/syntax-api/intellij.platform.syntax.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/syntax/syntax-i18n/intellij.platform.syntax.i18n.iml b/platform/syntax/syntax-i18n/intellij.platform.syntax.i18n.iml
index d09997d44282..ad413bd78770 100644
--- a/platform/syntax/syntax-i18n/intellij.platform.syntax.i18n.iml
+++ b/platform/syntax/syntax-i18n/intellij.platform.syntax.i18n.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/syntax/syntax-multiplatformSupport/intellij.platform.syntax.multiplatformSupport.iml b/platform/syntax/syntax-multiplatformSupport/intellij.platform.syntax.multiplatformSupport.iml
index 5e4c63263a51..7db1c3b616d6 100644
--- a/platform/syntax/syntax-multiplatformSupport/intellij.platform.syntax.multiplatformSupport.iml
+++ b/platform/syntax/syntax-multiplatformSupport/intellij.platform.syntax.multiplatformSupport.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/syntax/syntax-psi/intellij.platform.syntax.psi.iml b/platform/syntax/syntax-psi/intellij.platform.syntax.psi.iml
index 0225d965bf39..3c86f0125620 100644
--- a/platform/syntax/syntax-psi/intellij.platform.syntax.psi.iml
+++ b/platform/syntax/syntax-psi/intellij.platform.syntax.psi.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/syntax/syntax-util/intellij.platform.syntax.util.iml b/platform/syntax/syntax-util/intellij.platform.syntax.util.iml
index bb4376afd154..7190a186d46e 100644
--- a/platform/syntax/syntax-util/intellij.platform.syntax.util.iml
+++ b/platform/syntax/syntax-util/intellij.platform.syntax.util.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/tips-of-the-day/intellij.platform.tips.iml b/platform/tips-of-the-day/intellij.platform.tips.iml
index 718da32cdba8..308f016a245e 100644
--- a/platform/tips-of-the-day/intellij.platform.tips.iml
+++ b/platform/tips-of-the-day/intellij.platform.tips.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/util/base/intellij.platform.util.base.iml b/platform/util/base/intellij.platform.util.base.iml
index 6a27e3f2de31..cd1db1e24ede 100644
--- a/platform/util/base/intellij.platform.util.base.iml
+++ b/platform/util/base/intellij.platform.util.base.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/util/base/multiplatform/intellij.platform.util.base.multiplatform.iml b/platform/util/base/multiplatform/intellij.platform.util.base.multiplatform.iml
index 3de303723c0b..a2e827314f77 100644
--- a/platform/util/base/multiplatform/intellij.platform.util.base.multiplatform.iml
+++ b/platform/util/base/multiplatform/intellij.platform.util.base.multiplatform.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/util/coroutines/intellij.platform.util.coroutines.iml b/platform/util/coroutines/intellij.platform.util.coroutines.iml
index 745045dc2908..a53d22653116 100644
--- a/platform/util/coroutines/intellij.platform.util.coroutines.iml
+++ b/platform/util/coroutines/intellij.platform.util.coroutines.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/util/diff/intellij.platform.util.diff.iml b/platform/util/diff/intellij.platform.util.diff.iml
index ff78346b399a..0109679edab9 100644
--- a/platform/util/diff/intellij.platform.util.diff.iml
+++ b/platform/util/diff/intellij.platform.util.diff.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/util/http/intellij.platform.util.http.iml b/platform/util/http/intellij.platform.util.http.iml
index 18e5a83fcbf7..00c026ceba40 100644
--- a/platform/util/http/intellij.platform.util.http.iml
+++ b/platform/util/http/intellij.platform.util.http.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/util/intellij.platform.util.iml b/platform/util/intellij.platform.util.iml
index 7fc3e8703a77..04cc73f9299c 100644
--- a/platform/util/intellij.platform.util.iml
+++ b/platform/util/intellij.platform.util.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/util/intellij.platform.util.ui.iml b/platform/util/intellij.platform.util.ui.iml
index 786995bc860e..7e42ce36a5a9 100644
--- a/platform/util/intellij.platform.util.ui.iml
+++ b/platform/util/intellij.platform.util.ui.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/util/multiplatform/intellij.platform.util.multiplatform.iml b/platform/util/multiplatform/intellij.platform.util.multiplatform.iml
index cc09f3b892e0..77c184c70f90 100644
--- a/platform/util/multiplatform/intellij.platform.util.multiplatform.iml
+++ b/platform/util/multiplatform/intellij.platform.util.multiplatform.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/util/progress/intellij.platform.util.progress.iml b/platform/util/progress/intellij.platform.util.progress.iml
index 76b8d246ea7b..5707b1d9a560 100644
--- a/platform/util/progress/intellij.platform.util.progress.iml
+++ b/platform/util/progress/intellij.platform.util.progress.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/util/rt-java8/intellij.platform.util.rt.java8.iml b/platform/util/rt-java8/intellij.platform.util.rt.java8.iml
index 7bf8bc9e38d5..d45a18edafd9 100644
--- a/platform/util/rt-java8/intellij.platform.util.rt.java8.iml
+++ b/platform/util/rt-java8/intellij.platform.util.rt.java8.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/util/xmlDom/intellij.platform.util.xmlDom.iml b/platform/util/xmlDom/intellij.platform.util.xmlDom.iml
index 5ee020d87be4..4de9c7abffb6 100644
--- a/platform/util/xmlDom/intellij.platform.util.xmlDom.iml
+++ b/platform/util/xmlDom/intellij.platform.util.xmlDom.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/vcs-impl/backend/intellij.platform.vcs.impl.backend.iml b/platform/vcs-impl/backend/intellij.platform.vcs.impl.backend.iml
index c2fd079ca061..17ec5d35851d 100644
--- a/platform/vcs-impl/backend/intellij.platform.vcs.impl.backend.iml
+++ b/platform/vcs-impl/backend/intellij.platform.vcs.impl.backend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.iml b/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.iml
index 17e83c65cf2c..d8f5f36f7022 100644
--- a/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.iml
+++ b/platform/vcs-impl/frontend/intellij.platform.vcs.impl.frontend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.iml b/platform/vcs-impl/intellij.platform.vcs.impl.iml
index b05a54b2e5f4..c9b54cf257d5 100644
--- a/platform/vcs-impl/intellij.platform.vcs.impl.iml
+++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml b/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml
index 3a34dfe05903..d74063db619f 100644
--- a/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml
+++ b/platform/vcs-impl/shared/intellij.platform.vcs.impl.shared.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/whatsNew/intellij.platform.whatsNew.iml b/platform/whatsNew/intellij.platform.whatsNew.iml
index 6ea64b251534..1a20fe15bb11 100644
--- a/platform/whatsNew/intellij.platform.whatsNew.iml
+++ b/platform/whatsNew/intellij.platform.whatsNew.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/workspace/jps/intellij.platform.workspace.jps.iml b/platform/workspace/jps/intellij.platform.workspace.jps.iml
index b37e44926c40..8fe7570d6a27 100644
--- a/platform/workspace/jps/intellij.platform.workspace.jps.iml
+++ b/platform/workspace/jps/intellij.platform.workspace.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/workspace/storage/intellij.platform.workspace.storage.iml b/platform/workspace/storage/intellij.platform.workspace.storage.iml
index df0ccdf78b95..bff26d41d13f 100644
--- a/platform/workspace/storage/intellij.platform.workspace.storage.iml
+++ b/platform/workspace/storage/intellij.platform.workspace.storage.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml b/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml
index 186d9620315c..18d71161320f 100644
--- a/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml
+++ b/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/platform/xdebugger-api/intellij.platform.debugger.iml b/platform/xdebugger-api/intellij.platform.debugger.iml
index 47cf787d545a..2a7773c8c1f5 100644
--- a/platform/xdebugger-api/intellij.platform.debugger.iml
+++ b/platform/xdebugger-api/intellij.platform.debugger.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml b/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml
index 86dc58b653b6..7cd02ead0615 100644
--- a/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml
+++ b/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml b/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml
index 6e67f5ecd182..544defba57f9 100644
--- a/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml
+++ b/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
index 17ec8d4d8a23..8d7bdac8b79b 100644
--- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
+++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml b/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml
index 3bb03114c1d3..6e34bce9a404 100644
--- a/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml
+++ b/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/ant/jps-plugin/intellij.ant.jps.iml b/plugins/ant/jps-plugin/intellij.ant.jps.iml
index e735ca02eacd..6167f27b2064 100644
--- a/plugins/ant/jps-plugin/intellij.ant.jps.iml
+++ b/plugins/ant/jps-plugin/intellij.ant.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/compilation-charts/jps-plugin/intellij.compilation.charts.jps.iml b/plugins/compilation-charts/jps-plugin/intellij.compilation.charts.jps.iml
index 2cc6e486ba50..746a30a724df 100644
--- a/plugins/compilation-charts/jps-plugin/intellij.compilation.charts.jps.iml
+++ b/plugins/compilation-charts/jps-plugin/intellij.compilation.charts.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/completion-ml-ranking/intellij.completionMlRanking.iml b/plugins/completion-ml-ranking/intellij.completionMlRanking.iml
index 2cae3c451192..e28bf45d8837 100644
--- a/plugins/completion-ml-ranking/intellij.completionMlRanking.iml
+++ b/plugins/completion-ml-ranking/intellij.completionMlRanking.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/compose/intellij.compose.ide.plugin.k1/intellij.compose.ide.plugin.k1.iml b/plugins/compose/intellij.compose.ide.plugin.k1/intellij.compose.ide.plugin.k1.iml
index 183b7cb7c7d1..0fa6cbbb6016 100644
--- a/plugins/compose/intellij.compose.ide.plugin.k1/intellij.compose.ide.plugin.k1.iml
+++ b/plugins/compose/intellij.compose.ide.plugin.k1/intellij.compose.ide.plugin.k1.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.iml b/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.iml
index 9f573aabe958..f99ed6c26a28 100644
--- a/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.iml
+++ b/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.tests.iml b/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.tests.iml
index da41b97c01c3..7d988828dab6 100644
--- a/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.tests.iml
+++ b/plugins/compose/intellij.compose.ide.plugin.k2/intellij.compose.ide.plugin.k2.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml
index 08c3d74027d5..47ab9402cab4 100644
--- a/plugins/devkit/devkit-core/intellij.devkit.core.iml
+++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/devkit/intellij.devkit.workspaceModel/intellij.devkit.workspaceModel.iml b/plugins/devkit/intellij.devkit.workspaceModel/intellij.devkit.workspaceModel.iml
index cef7f54d19a8..3a37d26a63d1 100644
--- a/plugins/devkit/intellij.devkit.workspaceModel/intellij.devkit.workspaceModel.iml
+++ b/plugins/devkit/intellij.devkit.workspaceModel/intellij.devkit.workspaceModel.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/devkit/intellij.devkit.workspaceModel/k1/intellij.devkit.workspaceModel.k1.iml b/plugins/devkit/intellij.devkit.workspaceModel/k1/intellij.devkit.workspaceModel.k1.iml
index 3e4d21e02d06..fae2d990ca27 100644
--- a/plugins/devkit/intellij.devkit.workspaceModel/k1/intellij.devkit.workspaceModel.k1.iml
+++ b/plugins/devkit/intellij.devkit.workspaceModel/k1/intellij.devkit.workspaceModel.k1.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/devkit/intellij.devkit.workspaceModel/k2/intellij.devkit.workspaceModel.k2.iml b/plugins/devkit/intellij.devkit.workspaceModel/k2/intellij.devkit.workspaceModel.k2.iml
index bbe5544218e0..c100cbeb4b85 100644
--- a/plugins/devkit/intellij.devkit.workspaceModel/k2/intellij.devkit.workspaceModel.k2.iml
+++ b/plugins/devkit/intellij.devkit.workspaceModel/k2/intellij.devkit.workspaceModel.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml b/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml
index 21053081044b..6954fdd2000f 100644
--- a/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml
+++ b/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/devkit/intellij.kotlin.devkit/k2/intellij.kotlin.devkit.k2.iml b/plugins/devkit/intellij.kotlin.devkit/k2/intellij.kotlin.devkit.k2.iml
index a7fc6896eaa5..28fb9cbf7d4b 100644
--- a/plugins/devkit/intellij.kotlin.devkit/k2/intellij.kotlin.devkit.k2.iml
+++ b/plugins/devkit/intellij.kotlin.devkit/k2/intellij.kotlin.devkit.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/devkit/jps-plugin/intellij.devkit.jps.iml b/plugins/devkit/jps-plugin/intellij.devkit.jps.iml
index 84d07a8d6e81..09b0d6bc7abc 100644
--- a/plugins/devkit/jps-plugin/intellij.devkit.jps.iml
+++ b/plugins/devkit/jps-plugin/intellij.devkit.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/devkit/runtimeModuleRepository/jps/intellij.devkit.runtimeModuleRepository.jps.iml b/plugins/devkit/runtimeModuleRepository/jps/intellij.devkit.runtimeModuleRepository.jps.iml
index 2f56215f1e8d..e1de8bea149e 100644
--- a/plugins/devkit/runtimeModuleRepository/jps/intellij.devkit.runtimeModuleRepository.jps.iml
+++ b/plugins/devkit/runtimeModuleRepository/jps/intellij.devkit.runtimeModuleRepository.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml b/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml
index 40b7017e29dc..2ac65fbceb77 100644
--- a/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml
+++ b/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/eclipse/jps-plugin/intellij.eclipse.jps.iml b/plugins/eclipse/jps-plugin/intellij.eclipse.jps.iml
index 2953506ab4d2..697d0acee6f5 100644
--- a/plugins/eclipse/jps-plugin/intellij.eclipse.jps.iml
+++ b/plugins/eclipse/jps-plugin/intellij.eclipse.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/editorconfig/intellij.editorconfig.backend.iml b/plugins/editorconfig/intellij.editorconfig.backend.iml
index 41c9c6eb212f..598cbf088621 100644
--- a/plugins/editorconfig/intellij.editorconfig.backend.iml
+++ b/plugins/editorconfig/intellij.editorconfig.backend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/git4idea/frontend/intellij.vcs.git.frontend.iml b/plugins/git4idea/frontend/intellij.vcs.git.frontend.iml
index 9b9bc5667e3d..0e0a7acc63de 100644
--- a/plugins/git4idea/frontend/intellij.vcs.git.frontend.iml
+++ b/plugins/git4idea/frontend/intellij.vcs.git.frontend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml
index b209df7271f2..833d787ceb70 100644
--- a/plugins/git4idea/intellij.vcs.git.iml
+++ b/plugins/git4idea/intellij.vcs.git.iml
@@ -10,8 +10,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/git4idea/shared/intellij.vcs.git.shared.iml b/plugins/git4idea/shared/intellij.vcs.git.shared.iml
index ef2a8acd8161..03215a4504d5 100644
--- a/plugins/git4idea/shared/intellij.vcs.git.shared.iml
+++ b/plugins/git4idea/shared/intellij.vcs.git.shared.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/github/github-core/intellij.vcs.github.iml b/plugins/github/github-core/intellij.vcs.github.iml
index 15a527da3ad1..4dd38f8e00a4 100644
--- a/plugins/github/github-core/intellij.vcs.github.iml
+++ b/plugins/github/github-core/intellij.vcs.github.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml b/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml
index fe99528aef1f..290d373c4b97 100644
--- a/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml
+++ b/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/gradle/jps-plugin/intellij.gradle.jps.iml b/plugins/gradle/jps-plugin/intellij.gradle.jps.iml
index 8016238eb297..3269d923fed4 100644
--- a/plugins/gradle/jps-plugin/intellij.gradle.jps.iml
+++ b/plugins/gradle/jps-plugin/intellij.gradle.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/gradle/native/tooling/intellij.gradle.native.tooling.iml b/plugins/gradle/native/tooling/intellij.gradle.native.tooling.iml
index f2df6579c91e..ee429b619967 100644
--- a/plugins/gradle/native/tooling/intellij.gradle.native.tooling.iml
+++ b/plugins/gradle/native/tooling/intellij.gradle.native.tooling.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
index 0a14ab58ae32..218910999f74 100644
--- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
+++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml
index 2c899a09664b..dda88502358b 100644
--- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml
+++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml b/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml
index 20c3d1d05e36..0e543cb94416 100644
--- a/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml
+++ b/plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/groovy/jps-plugin/intellij.groovy.jps.iml b/plugins/groovy/jps-plugin/intellij.groovy.jps.iml
index c05c46466c05..c7116d8ca9a2 100644
--- a/plugins/groovy/jps-plugin/intellij.groovy.jps.iml
+++ b/plugins/groovy/jps-plugin/intellij.groovy.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/ide-features-trainer/intellij.featuresTrainer.iml b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
index 5929f2cddcab..3d6f090d6251 100644
--- a/plugins/ide-features-trainer/intellij.featuresTrainer.iml
+++ b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml b/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml
index cc6148e1149e..0127ad00f0a5 100644
--- a/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml
+++ b/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/javaFX/common/intellij.javaFX.common.iml b/plugins/javaFX/common/intellij.javaFX.common.iml
index f3321fa909d1..64df4a22edfb 100644
--- a/plugins/javaFX/common/intellij.javaFX.common.iml
+++ b/plugins/javaFX/common/intellij.javaFX.common.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/javaFX/jps/intellij.javaFX.jps.iml b/plugins/javaFX/jps/intellij.javaFX.jps.iml
index 178df35af7b0..19fb5b7c4c63 100644
--- a/plugins/javaFX/jps/intellij.javaFX.jps.iml
+++ b/plugins/javaFX/jps/intellij.javaFX.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/analysis-api-platform/kotlin.base.analysis-api-platform.iml b/plugins/kotlin/base/analysis-api-platform/kotlin.base.analysis-api-platform.iml
index 7520d7cda6a9..c9f47060587c 100644
--- a/plugins/kotlin/base/analysis-api-platform/kotlin.base.analysis-api-platform.iml
+++ b/plugins/kotlin/base/analysis-api-platform/kotlin.base.analysis-api-platform.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/analysis-api/analysis-api-utils/kotlin.base.analysis-api.utils.iml b/plugins/kotlin/base/analysis-api/analysis-api-utils/kotlin.base.analysis-api.utils.iml
index b7919d52d241..bdc9ded6b6bf 100644
--- a/plugins/kotlin/base/analysis-api/analysis-api-utils/kotlin.base.analysis-api.utils.iml
+++ b/plugins/kotlin/base/analysis-api/analysis-api-utils/kotlin.base.analysis-api.utils.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/analysis/kotlin.base.analysis.iml b/plugins/kotlin/base/analysis/kotlin.base.analysis.iml
index f7831ebd1296..b22afc06a4f8 100644
--- a/plugins/kotlin/base/analysis/kotlin.base.analysis.iml
+++ b/plugins/kotlin/base/analysis/kotlin.base.analysis.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/code-insight/kotlin.base.code-insight.iml b/plugins/kotlin/base/code-insight/kotlin.base.code-insight.iml
index 1a53b7bc40e5..97469a98daea 100644
--- a/plugins/kotlin/base/code-insight/kotlin.base.code-insight.iml
+++ b/plugins/kotlin/base/code-insight/kotlin.base.code-insight.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/fe10/analysis-api-platform/kotlin.base.fe10.analysis-api-platform.iml b/plugins/kotlin/base/fe10/analysis-api-platform/kotlin.base.fe10.analysis-api-platform.iml
index 6726b031ea2e..f4faaa5bb052 100644
--- a/plugins/kotlin/base/fe10/analysis-api-platform/kotlin.base.fe10.analysis-api-platform.iml
+++ b/plugins/kotlin/base/fe10/analysis-api-platform/kotlin.base.fe10.analysis-api-platform.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/fe10/analysis/kotlin.base.fe10.analysis.iml b/plugins/kotlin/base/fe10/analysis/kotlin.base.fe10.analysis.iml
index 49821f23055f..962d35c5f883 100644
--- a/plugins/kotlin/base/fe10/analysis/kotlin.base.fe10.analysis.iml
+++ b/plugins/kotlin/base/fe10/analysis/kotlin.base.fe10.analysis.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml b/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml
index ce4293b38b33..164be41b1059 100644
--- a/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml
+++ b/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/fe10/obsolete-compat/kotlin.base.fe10.obsolete-compat.iml b/plugins/kotlin/base/fe10/obsolete-compat/kotlin.base.fe10.obsolete-compat.iml
index 01ce43eb4bdc..3e5751f21680 100644
--- a/plugins/kotlin/base/fe10/obsolete-compat/kotlin.base.fe10.obsolete-compat.iml
+++ b/plugins/kotlin/base/fe10/obsolete-compat/kotlin.base.fe10.obsolete-compat.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml b/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml
index f71931699c0b..55b4dd48691a 100644
--- a/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml
+++ b/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/fir/analysis-api-platform/kotlin.base.fir.analysis-api-platform.iml b/plugins/kotlin/base/fir/analysis-api-platform/kotlin.base.fir.analysis-api-platform.iml
index b8a8ea4bd362..5fdce85cf8ac 100644
--- a/plugins/kotlin/base/fir/analysis-api-platform/kotlin.base.fir.analysis-api-platform.iml
+++ b/plugins/kotlin/base/fir/analysis-api-platform/kotlin.base.fir.analysis-api-platform.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/fir/code-insight/kotlin.base.fir.code-insight.iml b/plugins/kotlin/base/fir/code-insight/kotlin.base.fir.code-insight.iml
index b046207c4b64..9e0e268f09d6 100644
--- a/plugins/kotlin/base/fir/code-insight/kotlin.base.fir.code-insight.iml
+++ b/plugins/kotlin/base/fir/code-insight/kotlin.base.fir.code-insight.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/fir/project-structure/kotlin.base.fir.project-structure.iml b/plugins/kotlin/base/fir/project-structure/kotlin.base.fir.project-structure.iml
index ff0e654ff794..6ca082697524 100644
--- a/plugins/kotlin/base/fir/project-structure/kotlin.base.fir.project-structure.iml
+++ b/plugins/kotlin/base/fir/project-structure/kotlin.base.fir.project-structure.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/fir/scripting/kotlin.base.fir.scripting.iml b/plugins/kotlin/base/fir/scripting/kotlin.base.fir.scripting.iml
index 7bd0d72494bb..38363cad732b 100644
--- a/plugins/kotlin/base/fir/scripting/kotlin.base.fir.scripting.iml
+++ b/plugins/kotlin/base/fir/scripting/kotlin.base.fir.scripting.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/project-model/kotlin.base.project-model.iml b/plugins/kotlin/base/project-model/kotlin.base.project-model.iml
index b7907dce663d..09a0d6567b38 100644
--- a/plugins/kotlin/base/project-model/kotlin.base.project-model.iml
+++ b/plugins/kotlin/base/project-model/kotlin.base.project-model.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml b/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml
index 9c78b0e148a7..24681d806084 100644
--- a/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml
+++ b/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/resources/kotlin.base.resources.iml b/plugins/kotlin/base/resources/kotlin.base.resources.iml
index 3cf0765ed735..9062b5e411c0 100644
--- a/plugins/kotlin/base/resources/kotlin.base.resources.iml
+++ b/plugins/kotlin/base/resources/kotlin.base.resources.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/scripting/kotlin.base.scripting.iml b/plugins/kotlin/base/scripting/kotlin.base.scripting.iml
index 138d6ededbbd..ee21a05c3df8 100644
--- a/plugins/kotlin/base/scripting/kotlin.base.scripting.iml
+++ b/plugins/kotlin/base/scripting/kotlin.base.scripting.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/base/statistics/kotlin.base.statistics.iml b/plugins/kotlin/base/statistics/kotlin.base.statistics.iml
index 0e9aca22c7d9..dc33df5f09b5 100644
--- a/plugins/kotlin/base/statistics/kotlin.base.statistics.iml
+++ b/plugins/kotlin/base/statistics/kotlin.base.statistics.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/kotlin/code-insight/api/kotlin.code-insight.api.iml b/plugins/kotlin/code-insight/api/kotlin.code-insight.api.iml
index 7e0dc727ac72..e721f4df2970 100644
--- a/plugins/kotlin/code-insight/api/kotlin.code-insight.api.iml
+++ b/plugins/kotlin/code-insight/api/kotlin.code-insight.api.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/fixes-k2/kotlin.code-insight.fixes.k2.iml b/plugins/kotlin/code-insight/fixes-k2/kotlin.code-insight.fixes.k2.iml
index 0ee26f7cdc01..38e58d9cb815 100644
--- a/plugins/kotlin/code-insight/fixes-k2/kotlin.code-insight.fixes.k2.iml
+++ b/plugins/kotlin/code-insight/fixes-k2/kotlin.code-insight.fixes.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/impl-base/kotlin.code-insight.impl-base.iml b/plugins/kotlin/code-insight/impl-base/kotlin.code-insight.impl-base.iml
index 780d91e2a831..80b5c74fdc9a 100644
--- a/plugins/kotlin/code-insight/impl-base/kotlin.code-insight.impl-base.iml
+++ b/plugins/kotlin/code-insight/impl-base/kotlin.code-insight.impl-base.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/inspections-k2/kotlin.code-insight.inspections.k2.iml b/plugins/kotlin/code-insight/inspections-k2/kotlin.code-insight.inspections.k2.iml
index b87fb3580841..b3a41f462257 100644
--- a/plugins/kotlin/code-insight/inspections-k2/kotlin.code-insight.inspections.k2.iml
+++ b/plugins/kotlin/code-insight/inspections-k2/kotlin.code-insight.inspections.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/kotlin.code-insight.inspections.k2.tests.iml b/plugins/kotlin/code-insight/inspections-k2/tests/kotlin.code-insight.inspections.k2.tests.iml
index d577715624cb..275ee07ed9df 100644
--- a/plugins/kotlin/code-insight/inspections-k2/tests/kotlin.code-insight.inspections.k2.tests.iml
+++ b/plugins/kotlin/code-insight/inspections-k2/tests/kotlin.code-insight.inspections.k2.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml b/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml
index 8f0c7c307ccb..0cbe9ce038ef 100644
--- a/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml
+++ b/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml b/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml
index 96fc02dd54dd..680ee5f365e3 100644
--- a/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml
+++ b/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/intentions-k2/tests/kotlin.code-insight.intentions.k2.tests.iml b/plugins/kotlin/code-insight/intentions-k2/tests/kotlin.code-insight.intentions.k2.tests.iml
index 9219029ae23e..9a3a908fff80 100644
--- a/plugins/kotlin/code-insight/intentions-k2/tests/kotlin.code-insight.intentions.k2.tests.iml
+++ b/plugins/kotlin/code-insight/intentions-k2/tests/kotlin.code-insight.intentions.k2.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/intentions-shared/kotlin.code-insight.intentions.shared.iml b/plugins/kotlin/code-insight/intentions-shared/kotlin.code-insight.intentions.shared.iml
index 7d1350d60e1c..21260d29c1f0 100644
--- a/plugins/kotlin/code-insight/intentions-shared/kotlin.code-insight.intentions.shared.iml
+++ b/plugins/kotlin/code-insight/intentions-shared/kotlin.code-insight.intentions.shared.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml b/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml
index ad332e55ad1f..a37706d7f054 100644
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/line-markers/kotlin.code-insight.line-markers.k2.iml b/plugins/kotlin/code-insight/line-markers/kotlin.code-insight.line-markers.k2.iml
index c64ab834c59d..b4bef4bbdc96 100644
--- a/plugins/kotlin/code-insight/line-markers/kotlin.code-insight.line-markers.k2.iml
+++ b/plugins/kotlin/code-insight/line-markers/kotlin.code-insight.line-markers.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/live-templates-k2/kotlin.code-insight.live-templates.k2.iml b/plugins/kotlin/code-insight/live-templates-k2/kotlin.code-insight.live-templates.k2.iml
index 4fc336bd5c21..c36936d6cb17 100644
--- a/plugins/kotlin/code-insight/live-templates-k2/kotlin.code-insight.live-templates.k2.iml
+++ b/plugins/kotlin/code-insight/live-templates-k2/kotlin.code-insight.live-templates.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml b/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml
index 9451dc4fb340..5b093fd5966b 100644
--- a/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml
+++ b/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/override-implement-k2/kotlin.code-insight.override-implement.k2.iml b/plugins/kotlin/code-insight/override-implement-k2/kotlin.code-insight.override-implement.k2.iml
index 64d6c8f6c5cb..ef0507be6799 100644
--- a/plugins/kotlin/code-insight/override-implement-k2/kotlin.code-insight.override-implement.k2.iml
+++ b/plugins/kotlin/code-insight/override-implement-k2/kotlin.code-insight.override-implement.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/postfix-templates/kotlin.code-insight.postfix-templates.k2.iml b/plugins/kotlin/code-insight/postfix-templates/kotlin.code-insight.postfix-templates.k2.iml
index b9e604809f73..ee4d434a067d 100644
--- a/plugins/kotlin/code-insight/postfix-templates/kotlin.code-insight.postfix-templates.k2.iml
+++ b/plugins/kotlin/code-insight/postfix-templates/kotlin.code-insight.postfix-templates.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml b/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml
index a88c8fb1fba8..305ef16f73ed 100644
--- a/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml
+++ b/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/code-insight/utils/kotlin.code-insight.utils.iml b/plugins/kotlin/code-insight/utils/kotlin.code-insight.utils.iml
index 45c6d7522a4d..77ec6e1d98e7 100644
--- a/plugins/kotlin/code-insight/utils/kotlin.code-insight.utils.iml
+++ b/plugins/kotlin/code-insight/utils/kotlin.code-insight.utils.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/compiler-plugins/assignment/common-k1/kotlin.compiler-plugins.assignment.common.k1.iml b/plugins/kotlin/compiler-plugins/assignment/common-k1/kotlin.compiler-plugins.assignment.common.k1.iml
index 48ed7b871fdc..a3ed0253c2c3 100644
--- a/plugins/kotlin/compiler-plugins/assignment/common-k1/kotlin.compiler-plugins.assignment.common.k1.iml
+++ b/plugins/kotlin/compiler-plugins/assignment/common-k1/kotlin.compiler-plugins.assignment.common.k1.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/compiler-plugins/assignment/common/kotlin.compiler-plugins.assignment.common.k2.iml b/plugins/kotlin/compiler-plugins/assignment/common/kotlin.compiler-plugins.assignment.common.k2.iml
index bf31139d9fdf..cbf1e565ff4b 100644
--- a/plugins/kotlin/compiler-plugins/assignment/common/kotlin.compiler-plugins.assignment.common.k2.iml
+++ b/plugins/kotlin/compiler-plugins/assignment/common/kotlin.compiler-plugins.assignment.common.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/compiler-plugins/kotlinx-serialization/k2/kotlin.compiler-plugins.kotlinx-serialization.k2.iml b/plugins/kotlin/compiler-plugins/kotlinx-serialization/k2/kotlin.compiler-plugins.kotlinx-serialization.k2.iml
index e794c384fc16..48e44d7c279e 100644
--- a/plugins/kotlin/compiler-plugins/kotlinx-serialization/k2/kotlin.compiler-plugins.kotlinx-serialization.k2.iml
+++ b/plugins/kotlin/compiler-plugins/kotlinx-serialization/k2/kotlin.compiler-plugins.kotlinx-serialization.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml b/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml
index 92c8107ca15a..ef8381683c9d 100644
--- a/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml
+++ b/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml b/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml
index 4a565470f0e8..938006895fa9 100644
--- a/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml
+++ b/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/compiler-plugins/parcelize/k2/kotlin.compiler-plugins.parcelize.k2.iml b/plugins/kotlin/compiler-plugins/parcelize/k2/kotlin.compiler-plugins.parcelize.k2.iml
index a5325c6b9932..e3dcf646b52b 100644
--- a/plugins/kotlin/compiler-plugins/parcelize/k2/kotlin.compiler-plugins.parcelize.k2.iml
+++ b/plugins/kotlin/compiler-plugins/parcelize/k2/kotlin.compiler-plugins.parcelize.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/compiler-plugins/sam-with-receiver/common/kotlin.compiler-plugins.sam-with-receiver.common.iml b/plugins/kotlin/compiler-plugins/sam-with-receiver/common/kotlin.compiler-plugins.sam-with-receiver.common.iml
index 5ecf7b9ef268..ae8d57a1f8f3 100644
--- a/plugins/kotlin/compiler-plugins/sam-with-receiver/common/kotlin.compiler-plugins.sam-with-receiver.common.iml
+++ b/plugins/kotlin/compiler-plugins/sam-with-receiver/common/kotlin.compiler-plugins.sam-with-receiver.common.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml b/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml
index 6888d75d2429..6083fa33bf25 100644
--- a/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml
+++ b/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/completion/impl-k2/kotlin.completion.impl.k2.iml b/plugins/kotlin/completion/impl-k2/kotlin.completion.impl.k2.iml
index 77a3b8fd775e..ee98ed7f63ca 100644
--- a/plugins/kotlin/completion/impl-k2/kotlin.completion.impl.k2.iml
+++ b/plugins/kotlin/completion/impl-k2/kotlin.completion.impl.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml b/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml
index 89de8caa973f..ed1cab514791 100644
--- a/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml
+++ b/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/core/tests/kotlin.core.tests.iml b/plugins/kotlin/core/tests/kotlin.core.tests.iml
index a9f2e7f813a3..a6da255e2e2e 100644
--- a/plugins/kotlin/core/tests/kotlin.core.tests.iml
+++ b/plugins/kotlin/core/tests/kotlin.core.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/fir/kotlin.fir.iml b/plugins/kotlin/fir/kotlin.fir.iml
index f3b4c0ad2045..4e923e198063 100644
--- a/plugins/kotlin/fir/kotlin.fir.iml
+++ b/plugins/kotlin/fir/kotlin.fir.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
index 2cfc3ce823f3..fd7aa736ea4b 100644
--- a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
+++ b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
index 3c56658bc91c..6c7ac73a0e07 100644
--- a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
+++ b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/gradle/gradle-tooling/impl/kotlin.gradle.gradle-tooling.impl.iml b/plugins/kotlin/gradle/gradle-tooling/impl/kotlin.gradle.gradle-tooling.impl.iml
index ff96da2d5240..952c42257117 100644
--- a/plugins/kotlin/gradle/gradle-tooling/impl/kotlin.gradle.gradle-tooling.impl.iml
+++ b/plugins/kotlin/gradle/gradle-tooling/impl/kotlin.gradle.gradle-tooling.impl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="1.8" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/gradle/gradle/kotlin.gradle.gradle.iml b/plugins/kotlin/gradle/gradle/kotlin.gradle.gradle.iml
index 53cae360f817..b43d140625e9 100644
--- a/plugins/kotlin/gradle/gradle/kotlin.gradle.gradle.iml
+++ b/plugins/kotlin/gradle/gradle/kotlin.gradle.gradle.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/kotlin.gradle.scripting.k2.iml b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/kotlin.gradle.scripting.k2.iml
index 186789e3f4a2..8613c6986b00 100644
--- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/kotlin.gradle.scripting.k2.iml
+++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/kotlin.gradle.scripting.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/highlighting/highlighting-k1/kotlin.highlighting.k1.iml b/plugins/kotlin/highlighting/highlighting-k1/kotlin.highlighting.k1.iml
index 6d2aa0a52c63..6fabce87732e 100644
--- a/plugins/kotlin/highlighting/highlighting-k1/kotlin.highlighting.k1.iml
+++ b/plugins/kotlin/highlighting/highlighting-k1/kotlin.highlighting.k1.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml b/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml
index 882736838ade..aa7c1edeb6e5 100644
--- a/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml
+++ b/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml
index 371ee5e8ac94..05f4463718bb 100644
--- a/plugins/kotlin/idea/kotlin.idea.iml
+++ b/plugins/kotlin/idea/kotlin.idea.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
index 1fe1ba16f1bb..090d25bb8dea 100644
--- a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
+++ b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/injection/base/kotlin.base.injection.iml b/plugins/kotlin/injection/base/kotlin.base.injection.iml
index a43d51d00a01..4fa4b23f45a0 100644
--- a/plugins/kotlin/injection/base/kotlin.base.injection.iml
+++ b/plugins/kotlin/injection/base/kotlin.base.injection.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml b/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml
index f1f48f53bd0f..97ecfd33f524 100644
--- a/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml
+++ b/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/injection/k1/kotlin.injection.k1.iml b/plugins/kotlin/injection/k1/kotlin.injection.k1.iml
index bcb38e64f106..e3856bc9efb2 100644
--- a/plugins/kotlin/injection/k1/kotlin.injection.k1.iml
+++ b/plugins/kotlin/injection/k1/kotlin.injection.k1.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/injection/k1/tests/kotlin.injection.tests.iml b/plugins/kotlin/injection/k1/tests/kotlin.injection.tests.iml
index 3c80020d5853..518b6f206ab7 100644
--- a/plugins/kotlin/injection/k1/tests/kotlin.injection.tests.iml
+++ b/plugins/kotlin/injection/k1/tests/kotlin.injection.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/injection/k2/kotlin.injection.k2.iml b/plugins/kotlin/injection/k2/kotlin.injection.k2.iml
index 172f5d1ef96f..16d2b43dfa38 100644
--- a/plugins/kotlin/injection/k2/kotlin.injection.k2.iml
+++ b/plugins/kotlin/injection/k2/kotlin.injection.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/injection/k2/tests/kotlin.injection.k2.tests.iml b/plugins/kotlin/injection/k2/tests/kotlin.injection.k2.tests.iml
index 86ee2604ac58..e1eb34ca6b14 100644
--- a/plugins/kotlin/injection/k2/tests/kotlin.injection.k2.tests.iml
+++ b/plugins/kotlin/injection/k2/tests/kotlin.injection.k2.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/j2k/k1.new.post-processing/kotlin.j2k.k1.new.post-processing.iml b/plugins/kotlin/j2k/k1.new.post-processing/kotlin.j2k.k1.new.post-processing.iml
index a7dfaa00dd69..f832f363b443 100644
--- a/plugins/kotlin/j2k/k1.new.post-processing/kotlin.j2k.k1.new.post-processing.iml
+++ b/plugins/kotlin/j2k/k1.new.post-processing/kotlin.j2k.k1.new.post-processing.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml b/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml
index 9d8ff2546af0..006662c93d47 100644
--- a/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml
+++ b/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml b/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml
index e51e40dd4fe0..ec626e6e9490 100644
--- a/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml
+++ b/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/j2k/k1.old.post-processing/kotlin.j2k.k1.old.post-processing.iml b/plugins/kotlin/j2k/k1.old.post-processing/kotlin.j2k.k1.old.post-processing.iml
index f2fbe205cf18..a7e8000194dc 100644
--- a/plugins/kotlin/j2k/k1.old.post-processing/kotlin.j2k.k1.old.post-processing.iml
+++ b/plugins/kotlin/j2k/k1.old.post-processing/kotlin.j2k.k1.old.post-processing.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml b/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml
index 9897503ea533..664cea0f3c7a 100644
--- a/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml
+++ b/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/j2k/k2/kotlin.j2k.k2.iml b/plugins/kotlin/j2k/k2/kotlin.j2k.k2.iml
index 8373f6318ab0..a07d6e4cebe0 100644
--- a/plugins/kotlin/j2k/k2/kotlin.j2k.k2.iml
+++ b/plugins/kotlin/j2k/k2/kotlin.j2k.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/j2k/k2/tests/kotlin.j2k.k2.tests.iml b/plugins/kotlin/j2k/k2/tests/kotlin.j2k.k2.tests.iml
index 9008cb45a813..b895b217578a 100644
--- a/plugins/kotlin/j2k/k2/tests/kotlin.j2k.k2.tests.iml
+++ b/plugins/kotlin/j2k/k2/tests/kotlin.j2k.k2.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml b/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml
index ce3752ad7b22..12583a372604 100644
--- a/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml
+++ b/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml b/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml
index ceb782f5fedb..9b7cb6e1bcc6 100644
--- a/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml
+++ b/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml b/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml
index 8cdeb1640fa7..69436e94c981 100644
--- a/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml
+++ b/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml b/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml
index 4e5d9779e779..e5e6223ba21a 100644
--- a/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml
+++ b/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml b/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml
index 6edfbdecb1c7..a0955e6bef4b 100644
--- a/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml
+++ b/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml b/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml
index ab4f4b19f259..c5f217464c58 100644
--- a/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml
+++ b/plugins/kotlin/jvm-debugger/evaluation/k1/kotlin.jvm-debugger.evaluation.k1.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml b/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml
index 74f18274b8e6..44c35355dfec 100644
--- a/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml
+++ b/plugins/kotlin/jvm/shared/kotlin.jvm.shared.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/kotlin.searching/base/kotlin.searching.base.iml b/plugins/kotlin/kotlin.searching/base/kotlin.searching.base.iml
index 65eb96582187..68f0d393840e 100644
--- a/plugins/kotlin/kotlin.searching/base/kotlin.searching.base.iml
+++ b/plugins/kotlin/kotlin.searching/base/kotlin.searching.base.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/kotlin.searching/kotlin.searching.k2.iml b/plugins/kotlin/kotlin.searching/kotlin.searching.k2.iml
index fe580f3ce2ab..75d2d897859c 100644
--- a/plugins/kotlin/kotlin.searching/kotlin.searching.k2.iml
+++ b/plugins/kotlin/kotlin.searching/kotlin.searching.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/navigation/kotlin.navigation.iml b/plugins/kotlin/navigation/kotlin.navigation.iml
index d396d72bd8fd..fb8d6d854ea5 100644
--- a/plugins/kotlin/navigation/kotlin.navigation.iml
+++ b/plugins/kotlin/navigation/kotlin.navigation.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml b/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml
index 6877f5bb282a..e1aadd28b862 100644
--- a/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml
+++ b/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/onboarding-gradle/kotlin.onboarding.gradle.iml b/plugins/kotlin/onboarding-gradle/kotlin.onboarding.gradle.iml
index 51eb9bf36b83..5db2b6d53b0d 100644
--- a/plugins/kotlin/onboarding-gradle/kotlin.onboarding.gradle.iml
+++ b/plugins/kotlin/onboarding-gradle/kotlin.onboarding.gradle.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/kotlin/onboarding/kotlin.onboarding.iml b/plugins/kotlin/onboarding/kotlin.onboarding.iml
index 1abad65a9e66..040223880c5e 100644
--- a/plugins/kotlin/onboarding/kotlin.onboarding.iml
+++ b/plugins/kotlin/onboarding/kotlin.onboarding.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml b/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml
index 377c558752cf..fee2d2fbf645 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml b/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml
index 1455ed3e69f3..20ada9be05cf 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml
index 8858e8c09bda..cc0d0e7bc17a 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/kotlin.refactorings.tests.k2.iml b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/kotlin.refactorings.tests.k2.iml
index a7ab1d4fc775..8d4babc148aa 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/kotlin.refactorings.tests.k2.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/kotlin.refactorings.tests.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/refactorings/rename.k2/kotlin.refactorings.rename.k2.iml b/plugins/kotlin/refactorings/rename.k2/kotlin.refactorings.rename.k2.iml
index fa428c9844ec..7738abd9f58e 100644
--- a/plugins/kotlin/refactorings/rename.k2/kotlin.refactorings.rename.k2.iml
+++ b/plugins/kotlin/refactorings/rename.k2/kotlin.refactorings.rename.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/repl/kotlin.repl.iml b/plugins/kotlin/repl/kotlin.repl.iml
index b324b36ad421..c3612a407000 100644
--- a/plugins/kotlin/repl/kotlin.repl.iml
+++ b/plugins/kotlin/repl/kotlin.repl.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/scripting/kotlin.scripting.iml b/plugins/kotlin/scripting/kotlin.scripting.iml
index 3a4bb26389fe..ac03a434e35c 100644
--- a/plugins/kotlin/scripting/kotlin.scripting.iml
+++ b/plugins/kotlin/scripting/kotlin.scripting.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml b/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml
index 43ebdf042d30..f1eac013ff8d 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml
+++ b/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml b/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml
index e21ba0fd4746..ea75acfa0d3f 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml
+++ b/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/uast/uast-kotlin-idea-fir/kotlin.uast.uast-kotlin-idea.k2.iml b/plugins/kotlin/uast/uast-kotlin-idea-fir/kotlin.uast.uast-kotlin-idea.k2.iml
index 17a317591845..0d1a21092444 100644
--- a/plugins/kotlin/uast/uast-kotlin-idea-fir/kotlin.uast.uast-kotlin-idea.k2.iml
+++ b/plugins/kotlin/uast/uast-kotlin-idea-fir/kotlin.uast.uast-kotlin-idea.k2.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml b/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml
index 762f67837dd6..338f673f471e 100644
--- a/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml
+++ b/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml b/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml
index 463c9fa49e16..118eae7084c8 100644
--- a/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml
+++ b/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/markdown/compose/intellij.markdown.compose.preview.iml b/plugins/markdown/compose/intellij.markdown.compose.preview.iml
index e0fdf8803db6..22221c521256 100644
--- a/plugins/markdown/compose/intellij.markdown.compose.preview.iml
+++ b/plugins/markdown/compose/intellij.markdown.compose.preview.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/maven/jps-plugin/intellij.maven.jps.iml b/plugins/maven/jps-plugin/intellij.maven.jps.iml
index 645b35f62578..c728ee0fe23b 100644
--- a/plugins/maven/jps-plugin/intellij.maven.jps.iml
+++ b/plugins/maven/jps-plugin/intellij.maven.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/repository-search/intellij.repository.search.iml b/plugins/repository-search/intellij.repository.search.iml
index dd68a599eb5a..aac9b9663ad8 100644
--- a/plugins/repository-search/intellij.repository.search.iml
+++ b/plugins/repository-search/intellij.repository.search.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/space/jps-plugin/intellij.space.java.jps.iml b/plugins/space/jps-plugin/intellij.space.java.jps.iml
index c4619657a9f3..24b2dacc25bd 100644
--- a/plugins/space/jps-plugin/intellij.space.java.jps.iml
+++ b/plugins/space/jps-plugin/intellij.space.java.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/terminal/backend/intellij.terminal.backend.iml b/plugins/terminal/backend/intellij.terminal.backend.iml
index e376ab5e22bd..1f11d71db611 100644
--- a/plugins/terminal/backend/intellij.terminal.backend.iml
+++ b/plugins/terminal/backend/intellij.terminal.backend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/terminal/frontend/intellij.terminal.frontend.iml b/plugins/terminal/frontend/intellij.terminal.frontend.iml
index f567d18ecd5e..4337dfec4d05 100644
--- a/plugins/terminal/frontend/intellij.terminal.frontend.iml
+++ b/plugins/terminal/frontend/intellij.terminal.frontend.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/terminal/intellij.terminal.iml b/plugins/terminal/intellij.terminal.iml
index 35df701c21c1..b7a9c5e47bf1 100644
--- a/plugins/terminal/intellij.terminal.iml
+++ b/plugins/terminal/intellij.terminal.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/terminal/sh/intellij.terminal.sh.iml b/plugins/terminal/sh/intellij.terminal.sh.iml
index 551a41c6d99a..80cfbb465281 100644
--- a/plugins/terminal/sh/intellij.terminal.sh.iml
+++ b/plugins/terminal/sh/intellij.terminal.sh.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/textmate/core/intellij.textmate.core.iml b/plugins/textmate/core/intellij.textmate.core.iml
index f7e3173a764c..a288c5ffe72b 100644
--- a/plugins/textmate/core/intellij.textmate.core.iml
+++ b/plugins/textmate/core/intellij.textmate.core.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/textmate/intellij.textmate.iml b/plugins/textmate/intellij.textmate.iml
index eb365658ff69..0cddf9d932f0 100644
--- a/plugins/textmate/intellij.textmate.iml
+++ b/plugins/textmate/intellij.textmate.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml b/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml
index 99b37c58aa89..e871ba484a51 100644
--- a/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml
+++ b/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/plugins/yaml/intellij.yaml.iml b/plugins/yaml/intellij.yaml.iml
index 64f6b2702d8c..5b2f934366b3 100644
--- a/plugins/yaml/intellij.yaml.iml
+++ b/plugins/yaml/intellij.yaml.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/python/python-hatch/intellij.python.hatch.iml b/python/python-hatch/intellij.python.hatch.iml
index bffcd7841394..10caa396a0d1 100644
--- a/python/python-hatch/intellij.python.hatch.iml
+++ b/python/python-hatch/intellij.python.hatch.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml b/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml
index b23dd043f8ee..3eeb45359c48 100644
--- a/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml
+++ b/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
diff --git a/tools/intellij.tools.ide.util.common/intellij.tools.ide.util.common.iml b/tools/intellij.tools.ide.util.common/intellij.tools.ide.util.common.iml
index d1042d99f818..71db553d1816 100644
--- a/tools/intellij.tools.ide.util.common/intellij.tools.ide.util.common.iml
+++ b/tools/intellij.tools.ide.util.common/intellij.tools.ide.util.common.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/uast/uast-common/intellij.platform.uast.iml b/uast/uast-common/intellij.platform.uast.iml
index 1edd364a896d..fe9240669203 100644
--- a/uast/uast-common/intellij.platform.uast.iml
+++ b/uast/uast-common/intellij.platform.uast.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>
diff --git a/uast/uast-java/intellij.java.uast.iml b/uast/uast-java/intellij.java.uast.iml
index d5583af00dfe..34be29987767 100644
--- a/uast/uast-java/intellij.java.uast.iml
+++ b/uast/uast-java/intellij.java.uast.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="11" />
-            <stringArg name="apiVersion" arg="2.0" />
-            <stringArg name="languageVersion" arg="2.0" />
+            <stringArg name="apiVersion" arg="2.1" />
+            <stringArg name="languageVersion" arg="2.1" />
           </stringArguments>
         </compilerArguments>
       </configuration>