Merge branch 'main' into fix/update-ui

Author: kshmidt-digma

build.gradle.kts

@@ -1,3 +1,5 @@
+import common.BuildProfiles
+import common.BuildProfiles.greaterThan
 import common.buildVersion
 import common.currentProfile
 import common.dynamicPlatformType
@@ -85,6 +87,13 @@ dependencies {
 
         pluginVerifier()
         zipSigner()
+
+        //todo: this is a workaround for plugin 2.1.0, this module should be bundled.
+        // check in next version if it is still necessary.
+        // https://jetbrains-platform.slack.com/archives/C05C80200LS/p1730794028550679
+        if (project.currentProfile().profile.greaterThan(BuildProfiles.Profile.p241)) {
+            bundledModule("intellij.platform.collaborationTools")
+        }
     }
 }
 

common-build-logic/build.gradle.kts

@@ -13,7 +13,7 @@ repositories {
 dependencies {
     //when updating intellij-platform-gradle-plugin update also org.jetbrains.intellij.platform.settings plugin
     // in settings file to the same version. we need to maintain it in two places, unfortunately.
-    implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.0.1") // Update also org.jetbrains.intellij.platform.settings in settings.gradle.kts
+    implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.1.0") // Update also org.jetbrains.intellij.platform.settings in settings.gradle.kts
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20")
     implementation("com.glovoapp.gradle:versioning:1.1.10")
     implementation("de.undercouch:gradle-download-task:5.6.0")

ide-common/build.gradle.kts

@@ -1,3 +1,6 @@
+import common.BuildProfiles
+import common.BuildProfiles.greaterThan
+import common.currentProfile
 import common.dynamicPlatformType
 import common.platformVersion
 import common.useBinaryInstaller
@@ -39,6 +42,13 @@ dependencies {
         //this module uses create because it may be Idea,Rider,Pycharm etc.
         create(platformType, project.platformVersion(), project.useBinaryInstaller())
         bundledPlugin("Git4Idea")
+        //todo: this is a workaround for plugin 2.1.0, this module should come as transitive dependency of Git4Idea.
+        // check in next version if it is still necessary. discussed here:
+        // https://jetbrains-platform.slack.com/archives/C05C80200LS/p1727279837850189
+        // https://jetbrains-platform.slack.com/archives/C05C80200LS/p1730794028550679
+        if (project.currentProfile().profile.greaterThan(BuildProfiles.Profile.p241)) {
+            bundledModule("intellij.platform.vcs.dvcs.impl")
+        }
     }
 }