JetBrains IDEs 2024.3 stable release (#20370)

mustard-mh · web-flow · commit 21f546d4c172 · 2024-11-16T01:19:54.000-05:00
* Auto script

* Point cline and rider to old backend plugin version

* Make stable plugin build

* Make rider build

* Update patch for rr and cl

* Make stable Gateway compatible
diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml
@@ -13,12 +13,12 @@ defaultArgs:
   codeWebExtensionCommit: 7ff72a2938a7a06cbdf3964590f7e9b7525958f3
   xtermCommit: d547d4ff4590b66c3ea24342fc62e3afcf6b77bc
   noVerifyJBPlugin: false
-  intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.2.4.tar.gz"
-  golandDownloadUrl: "https://download.jetbrains.com/go/goland-2024.2.3.tar.gz"
-  pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2024.2.4.tar.gz"
-  phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2024.2.4.tar.gz"
-  rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2024.2.4.tar.gz"
-  webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2024.2.4.tar.gz"
+  intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.3.tar.gz"
+  golandDownloadUrl: "https://download.jetbrains.com/go/goland-2024.3.tar.gz"
+  pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2024.3.tar.gz"
+  phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2024.3.tar.gz"
+  rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2024.3.tar.gz"
+  webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2024.3.tar.gz"
   riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.tar.gz"
   clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.2.3.tar.gz"
   rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.2.5.tar.gz"
diff --git a/components/ide/jetbrains/backend-plugin/BUILD.yaml b/components/ide/jetbrains/backend-plugin/BUILD.yaml
@@ -151,6 +151,7 @@ packages:
       - NO_VERIFY_JB_PLUGIN=true
     config:
       commands:
+        - ["rm", "-rf", "src/main/kotlin/io/gitpod/jetbrains/remote/GitpodMetricControlProvider.kt"]
         - ["mv", "build.gradle-stable.kts", "build.gradle.kts"]
         - ["./build.sh", "${__git_commit}"]
   - name: plugin-latest-rider
@@ -182,6 +183,7 @@ packages:
       - SDKMAN_DIR=/home/gitpod/.sdkman
     config:
       commands:
+        - ["rm", "-rf", "src/main/kotlin/io/gitpod/jetbrains/remote/GitpodMetricControlProvider.kt"]
         # TODO(hw): remove after 2024.2.* is stable
         - ["mv", "build.gradle-latest.kts", "build.gradle.kts"]
         - - "bash"
diff --git a/components/ide/jetbrains/backend-plugin/gradle-stable.properties b/components/ide/jetbrains/backend-plugin/gradle-stable.properties
@@ -2,10 +2,10 @@
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 # revert pluginSinceBuild if it's unnecessary
-pluginSinceBuild=242.22855
-pluginUntilBuild=242.*
+pluginSinceBuild=243.21565
+pluginUntilBuild=243.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
-pluginVerifierIdeVersions=2024.2
+pluginVerifierIdeVersions=2024.3
 # Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
-platformVersion=242.22855-EAP-CANDIDATE-SNAPSHOT
+platformVersion=243.21565-EAP-CANDIDATE-SNAPSHOT
diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodMetricControlProvider.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodMetricControlProvider.kt
@@ -2,7 +2,7 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License.AGPL.txt in the project root for license information.
 
-package io.gitpod.jetbrains.remote.latest
+package io.gitpod.jetbrains.remote
 
 import com.jetbrains.ide.model.uiautomation.BeControl
 import com.jetbrains.ide.model.uiautomation.DefiniteProgress
diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodPortForwardingServiceImpl.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodPortForwardingServiceImpl.kt
@@ -2,7 +2,7 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License.AGPL.txt in the project root for license information.
 
-package io.gitpod.jetbrains.remote.latest
+package io.gitpod.jetbrains.remote
 
 import com.jetbrains.rd.util.lifetime.Lifetime
 import com.jetbrains.rd.util.threading.coroutines.launch
diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodMetricControlProvider.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodMetricControlProvider.kt
diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodPortForwardingServiceImpl.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodPortForwardingServiceImpl.kt
diff --git a/components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml b/components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml
@@ -6,10 +6,5 @@
 <!--suppress PluginXmlValidity -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
-        <applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodPortForwardingService"
-                            serviceImplementation="io.gitpod.jetbrains.remote.latest.GitpodPortForwardingServiceImpl"
-                            client="controller" preload="true"/>
-        <gateway.customization.performance id="gitpodMetricsControl" order="before cpuControl"
-                                           implementation="io.gitpod.jetbrains.remote.latest.GitpodMetricControlProvider"/>
     </extensions>
 </idea-plugin>
diff --git a/components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml b/components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml
@@ -6,10 +6,5 @@
 <!--suppress PluginXmlValidity -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
-        <applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodPortForwardingService"
-                            serviceImplementation="io.gitpod.jetbrains.remote.stable.GitpodPortForwardingServiceImpl"
-                            client="controller" preload="true"/>
-        <gateway.customization.performance id="gitpodMetricsControl" order="before cpuControl"
-                                           implementation="io.gitpod.jetbrains.remote.stable.GitpodMetricControlProvider"/>
     </extensions>
 </idea-plugin>
diff --git a/components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml b/components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml
@@ -54,6 +54,13 @@
         <applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService"
                             serviceImplementation="io.gitpod.jetbrains.remote.internal.GitpodIgnoredPortsForNotificationServiceImpl"
                             preload="true"/>
+
+
+        <applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodPortForwardingService"
+                            serviceImplementation="io.gitpod.jetbrains.remote.GitpodPortForwardingServiceImpl"
+                            client="controller" preload="true"/>
+        <gateway.customization.performance id="gitpodMetricsControl" order="before cpuControl"
+                                           implementation="io.gitpod.jetbrains.remote.GitpodMetricControlProvider"/>
     </extensions>
 
     <actions>
diff --git a/components/ide/jetbrains/gateway-plugin/gradle-stable.properties b/components/ide/jetbrains/gateway-plugin/gradle-stable.properties
@@ -2,10 +2,10 @@
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 # revert pluginSinceBuild if it's unnecessary
-pluginSinceBuild=242.20224
-pluginUntilBuild=242.*
+pluginSinceBuild=243.21565
+pluginUntilBuild=243.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
-pluginVerifierIdeVersions=2024.2
+pluginVerifierIdeVersions=2024.3
 # Version from "com.jetbrains.gateway" which can be found at https://www.jetbrains.com/updates/updates.xml or exec `./gradlew printProductsReleases`
-platformVersion=2024.2.3
+platformVersion=2024.3
diff --git a/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionHandleFactoryImpl.kt b/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionHandleFactoryImpl.kt
@@ -2,7 +2,7 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License.AGPL.txt in the project root for license information.
 
-package io.gitpod.jetbrains.gateway.stable
+package io.gitpod.jetbrains.gateway
 
 import com.intellij.openapi.components.Service
 import com.jetbrains.gateway.api.GatewayConnectionHandle
@@ -17,7 +17,7 @@ import java.net.URI
 import javax.swing.JComponent
 
 @Suppress("UnstableApiUsage")
-class StableGitpodConnectionHandleFactory: GitpodConnectionHandleFactory {
+class GitpodConnectionHandleFactoryImpl: GitpodConnectionHandleFactory {
     override fun createGitpodConnectionHandle(
         lifetime: Lifetime,
         component: JComponent,
@@ -30,6 +30,6 @@ class StableGitpodConnectionHandleFactory: GitpodConnectionHandleFactory {
         return ClientOverSshTunnelConnector(
             lifetime,
             connector
-        ).connect(tcpJoinLink)
+        ).connect(tcpJoinLink, null)
     }
 }
diff --git a/components/ide/jetbrains/gateway-plugin/src/main/resources-latest/META-INF/extensions.xml b/components/ide/jetbrains/gateway-plugin/src/main/resources-latest/META-INF/extensions.xml
@@ -5,8 +5,6 @@
 -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
-        <applicationService serviceInterface="io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory"
-                            serviceImplementation="io.gitpod.jetbrains.gateway.latest.LatestGitpodConnectionHandleFactory"/>
     </extensions>
     <extensions defaultExtensionNs="com.jetbrains">
     </extensions>
diff --git a/components/ide/jetbrains/gateway-plugin/src/main/resources-stable/META-INF/extensions.xml b/components/ide/jetbrains/gateway-plugin/src/main/resources-stable/META-INF/extensions.xml
@@ -5,8 +5,6 @@
 -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
-        <applicationService serviceInterface="io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory"
-                            serviceImplementation="io.gitpod.jetbrains.gateway.stable.StableGitpodConnectionHandleFactory"/>
     </extensions>
     <extensions defaultExtensionNs="com.jetbrains">
     </extensions>
diff --git a/components/ide/jetbrains/gateway-plugin/src/main/resources/META-INF/plugin.xml b/components/ide/jetbrains/gateway-plugin/src/main/resources/META-INF/plugin.xml
@@ -26,6 +26,8 @@
         <applicationConfigurable parentId="tools" instance="io.gitpod.jetbrains.gateway.GitpodSettingsConfigurable"
                                  id="io.gitpod.jetbrains.gateway.GitpodSettingsConfigurable"
                                  displayName="Gitpod"/>
+        <applicationService serviceInterface="io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory"
+                            serviceImplementation="io.gitpod.jetbrains.gateway.GitpodConnectionHandleFactoryImpl"/>
     </extensions>
 
     <extensions defaultExtensionNs="com.jetbrains">
diff --git a/dev/preview/workflow/preview/patch-ide-configmap.js b/dev/preview/workflow/preview/patch-ide-configmap.js
@@ -9,10 +9,17 @@ function replaceImage(image) {
     return image.replace("gitpod-dev-artifact", "gitpod-core-dev");
 }
 
+const imagesBuildFromMain = [
+    "jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest",
+    "jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+];
+
 // TODO(hw): remove me
 function replaceImage2(image) {
-    if (image.includes("jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest")) {
-        return image.replace("gitpod-dev-artifact", "gitpod-core-dev");
+    for (const imgFromMain of imagesBuildFromMain) {
+        if (image.includes(imgFromMain)) {
+            return image.replace("gitpod-dev-artifact", "gitpod-core-dev");
+        }
     }
     return image;
 }
@@ -31,7 +38,7 @@ for (let ide in json.ideOptions.options) {
     }
 
     // TODO(hw): remove me
-    if (["intellij"].includes(ide)) {
+    if (["intellij", "clion", "rustrover"].includes(ide)) {
         json.ideOptions.options[ide].pluginImage = replaceImage2(json.ideOptions.options[ide].pluginImage);
         json.ideOptions.options[ide].imageLayers = json.ideOptions.options[ide].imageLayers.map(replaceImage2);
     }
diff --git a/install/installer/pkg/components/ide-service/ide-configmap.json b/install/installer/pkg/components/ide-service/ide-configmap.json
@@ -214,6 +214,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.2.4",
+            "image": "{{.Repository}}/ide/intellij:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+              "{{.Repository}}/ide/jb-launcher:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6"
+            ]
+          },
           {
             "version": "2024.2.3",
             "image": "{{.Repository}}/ide/intellij:commit-c0c9b747905872fcade355a5347e4de98711a0a0",
@@ -315,6 +323,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.2.3",
+            "image": "{{.Repository}}/ide/goland:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+              "{{.Repository}}/ide/jb-launcher:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6"
+            ]
+          },
           {
             "version": "2024.2.2",
             "image": "{{.Repository}}/ide/goland:commit-2aba460a50c43e830b015a6ff4e52e6491a3ed36",
@@ -409,6 +425,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.2.4",
+            "image": "{{.Repository}}/ide/pycharm:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+              "{{.Repository}}/ide/jb-launcher:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6"
+            ]
+          },
           {
             "version": "2024.2.3",
             "image": "{{.Repository}}/ide/pycharm:commit-c0c9b747905872fcade355a5347e4de98711a0a0",
@@ -502,6 +526,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.2.4",
+            "image": "{{.Repository}}/ide/phpstorm:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+              "{{.Repository}}/ide/jb-launcher:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6"
+            ]
+          },
           {
             "version": "2024.2.3",
             "image": "{{.Repository}}/ide/phpstorm:commit-c0c9b747905872fcade355a5347e4de98711a0a0",
@@ -587,6 +619,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.2.4",
+            "image": "{{.Repository}}/ide/rubymine:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+              "{{.Repository}}/ide/jb-launcher:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6"
+            ]
+          },
           {
             "version": "2024.2.3",
             "image": "{{.Repository}}/ide/rubymine:commit-c0c9b747905872fcade355a5347e4de98711a0a0",
@@ -680,6 +720,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.2.4",
+            "image": "{{.Repository}}/ide/webstorm:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
+              "{{.Repository}}/ide/jb-launcher:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6"
+            ]
+          },
           {
             "version": "2024.2.3",
             "image": "{{.Repository}}/ide/webstorm:commit-c0c9b747905872fcade355a5347e4de98711a0a0",
@@ -822,10 +870,10 @@
         "logo": "{{.IdeLogoBase}}/clionLogo.svg",
         "image": "{{.Repository}}/ide/clion:{{.WorkspaceVersions.Workspace.DesktopIdeImages.CLionImage.Version}}",
         "latestImage": "{{.ResolvedJBImageLatest.CLion}}",
-        "pluginImage": "{{.JetBrainsPluginImage}}",
+        "pluginImage": "{{.JetBrainsPluginImagePrevious}}",
         "pluginLatestImage": "{{.JetBrainsPluginLatestImage}}",
         "imageLayers": [
-          "{{.JetBrainsPluginImage}}",
+          "{{.JetBrainsPluginImagePrevious}}",
           "{{.JetBrainsLauncherImage}}"
         ],
         "latestImageLayers": [
@@ -899,10 +947,10 @@
         "logo": "{{.IdeLogoBase}}/rustroverLogo.svg",
         "image": "{{.Repository}}/ide/rustrover:{{.WorkspaceVersions.Workspace.DesktopIdeImages.RustRoverImage.Version}}",
         "latestImage": "{{.ResolvedJBImageLatest.RustRover}}",
-        "pluginImage": "{{.JetBrainsPluginImage}}",
+        "pluginImage": "{{.JetBrainsPluginImagePrevious}}",
         "pluginLatestImage": "{{.JetBrainsPluginLatestImage}}",
         "imageLayers": [
-          "{{.JetBrainsPluginImage}}",
+          "{{.JetBrainsPluginImagePrevious}}",
           "{{.JetBrainsLauncherImage}}"
         ],
         "latestImageLayers": [
diff --git a/install/installer/pkg/components/ide-service/ide_config_configmap.go b/install/installer/pkg/components/ide-service/ide_config_configmap.go
