Update stable JetBrains IDEs (#20180)

* [JetBrains] Update IDE images to new build version * Update how backend-plugin build --------- Co-authored-by: Robo Quat <[email protected]>
gitpod-io · Sep 6, 2024 · ee9bda6 · ee9bda6
1 parent 8e8a5db
commit ee9bda6
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 21 deletions.
diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml
@@ -13,15 +13,16 @@ defaultArgs:
   codeWebExtensionCommit: 7ff72a2938a7a06cbdf3964590f7e9b7525958f3
   xtermCommit: 8f10c5febf0162a3c2309076302f770fbad38fde
   noVerifyJBPlugin: false
-  intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.2.tar.gz"
-  golandDownloadUrl: "https://download.jetbrains.com/go/goland-2024.1.4.tar.gz"
-  pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2024.1.4.tar.gz"
-  phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.tar.gz"
-  rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2024.1.4.tar.gz"
-  webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5.tar.gz"
+  intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.2.1.tar.gz"
+  golandDownloadUrl: "https://download.jetbrains.com/go/goland-2024.2.1.tar.gz"
+  pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2024.2.1.tar.gz"
+  phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2024.2.1.tar.gz"
+  rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2024.2.1.tar.gz"
+  webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1.tar.gz"
   riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.tar.gz"
-  clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.1.4.tar.gz"
-  rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.1.6.tar.gz"
+  # riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.3.tar.gz"
+  clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.2.1.tar.gz"
+  rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.2.tar.gz"
   jbBackendVersion: "latest"
   dockerVersion: "20.10.24"
   dockerComposeVersion: "2.27.0-gitpod.0"

diff --git a/components/ide/jetbrains/backend-plugin/BUILD.yaml b/components/ide/jetbrains/backend-plugin/BUILD.yaml
@@ -71,7 +71,7 @@ packages:
       - components/gitpod-protocol/java:lib
     srcs:
       - "**/*.kt"
-      - "build.gradle-stable.kts"
+      - "build.gradle.kts"
       - "gradle.properties"
       - "gradle-stable.properties"
       - "gradle/wrapper/*"
@@ -83,10 +83,17 @@ packages:
     env:
       - JB_QUALIFIER=stable
       - NO_VERIFY_JB_PLUGIN=${noVerifyJBPlugin}
+      # TODO(hw): remove me after java 21 is default version in dev image
+      - SDKMAN_DIR=/home/gitpod/.sdkman
     config:
       commands:
-        - ["mv", "build.gradle-stable.kts", "build.gradle.kts"]
-        - ["./build.sh", "${__git_commit}"]
+        - - "bash"
+          - "-c"
+          - >
+            echo java=21.0.3.fx-zulu > .sdkmanrc
+            && source "$SDKMAN_DIR/bin/sdkman-init.sh"
+            && sdk env install
+            && ./build.sh ${__git_commit}
   - name: plugin-latest
     type: generic
     argdeps:
@@ -96,7 +103,7 @@ packages:
       - components/gitpod-protocol/java:lib
     srcs:
       - "**/*.kt"
-      - "build.gradle-latest.kts"
+      - "build.gradle.kts"
       - "gradle.properties"
       - "gradle-latest.properties"
       - "gradle/wrapper/*"
@@ -108,12 +115,10 @@ packages:
     env:
       - JB_QUALIFIER=latest
       - NO_VERIFY_JB_PLUGIN=${noVerifyJBPlugin}
-      # TODO(hw): remove after `2024.2.*` is stable
+      # TODO(hw): remove me after java 21 is default version in dev image
       - SDKMAN_DIR=/home/gitpod/.sdkman
     config:
       commands:
-        # TODO(hw): remove after 2024.2.* is stable
-        - ["mv", "build.gradle-latest.kts", "build.gradle.kts"]
         - - "bash"
           - "-c"
           - >

diff --git a/components/ide/jetbrains/backend-plugin/gradle-stable.properties b/components/ide/jetbrains/backend-plugin/gradle-stable.properties
@@ -1,10 +1,11 @@
 # this file is auto generated by components/ide/gha-update-image/index-jb.ts
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild=241.17890
-pluginUntilBuild=241.*
+# revert pluginSinceBuild if it's unnecessary
+pluginSinceBuild=242.19533
+pluginUntilBuild=242.*
 # 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.1
+pluginVerifierIdeVersions=2024.2
 # Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
-platformVersion=241.17890-EAP-CANDIDATE-SNAPSHOT
+platformVersion=242.21829-EAP-CANDIDATE-SNAPSHOT
diff --git a/install/installer/pkg/components/ide-service/ide-configmap.json b/install/installer/pkg/components/ide-service/ide-configmap.json
@@ -154,10 +154,10 @@
         "label": "Ultimate",
         "image": "{{.Repository}}/ide/intellij:{{.WorkspaceVersions.Workspace.DesktopIdeImages.IntelliJImage.Version}}",
         "latestImage": "{{.ResolvedJBImageLatest.IntelliJ}}",
-        "pluginImage": "{{.Repository}}/ide/jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest",
+        "pluginImage": "{{.JetBrainsPluginImage}}",
         "pluginLatestImage": "{{.JetBrainsPluginLatestImage}}",
         "imageLayers": [
-          "{{.Repository}}/ide/jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest",
+          "{{.JetBrainsPluginImage}}",
           "{{.JetBrainsLauncherImage}}"
         ],
         "latestImageLayers": [
@@ -166,6 +166,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.2",
+            "image": "{{.Repository}}/ide/intellij:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest",
+              "{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
+            ]
+          },
           {
             "version": "2024.1.4",
             "image": "{{.Repository}}/ide/intellij:commit-80f3b3e47fc065d521be745b5795841d5e883667",
@@ -235,6 +243,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.1.4",
+            "image": "{{.Repository}}/ide/goland:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
+              "{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
+            ]
+          },
           {
             "version": "2024.1.3",
             "image": "{{.Repository}}/ide/goland:commit-294b37ad7b93bcc347bf970a11e269e2b477f603",
@@ -297,6 +313,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.1.4",
+            "image": "{{.Repository}}/ide/pycharm:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
+              "{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
+            ]
+          },
           {
             "version": "2024.1.3",
             "image": "{{.Repository}}/ide/pycharm:commit-c295f8299fd17f99913512ec5db5d8a60a1e5d98",
@@ -358,6 +382,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.1.4",
+            "image": "{{.Repository}}/ide/phpstorm:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
+              "{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
+            ]
+          },
           {
             "version": "2024.1.3",
             "image": "{{.Repository}}/ide/phpstorm:commit-c295f8299fd17f99913512ec5db5d8a60a1e5d98",
@@ -419,6 +451,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.1.4",
+            "image": "{{.Repository}}/ide/rubymine:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
+              "{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
+            ]
+          },
           {
             "version": "2024.1.3",
             "image": "{{.Repository}}/ide/rubymine:commit-c295f8299fd17f99913512ec5db5d8a60a1e5d98",
@@ -480,6 +520,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.1.5",
+            "image": "{{.Repository}}/ide/webstorm:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
+              "{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
+            ]
+          },
           {
             "version": "2024.1.4",
             "image": "{{.Repository}}/ide/webstorm:commit-294b37ad7b93bcc347bf970a11e269e2b477f603",
@@ -602,6 +650,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.1.4",
+            "image": "{{.Repository}}/ide/clion:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
+              "{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
+            ]
+          },
           {
             "version": "2024.1.3",
             "image": "{{.Repository}}/ide/clion:commit-294b37ad7b93bcc347bf970a11e269e2b477f603",
@@ -655,6 +711,14 @@
         ],
         "allowPin": true,
         "versions": [
+          {
+            "version": "2024.1.6",
+            "image": "{{.Repository}}/ide/rustrover:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
+            "imageLayers": [
+              "{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
+              "{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
+            ]
+          },
           {
             "version": "2024.1.5",
             "image": "{{.Repository}}/ide/rustrover:commit-519b67858f8be8fc52a3a836b334400e4363c0c6",