Skip to content

Commit fbe6353

Browse files
mustard-mhroboquat
andauthored
[JetBrains] Upgrade IDEs to 2025.1 (#20763)
* [JetBrains] Update IDE images to new build version * Make it build * Update Platform Version of JetBrains Gateway Plugin (Stable) to * Upgrade setup-java to v4 --------- Co-authored-by: Robo Quat <[email protected]>
1 parent d3348ed commit fbe6353

File tree

10 files changed

+85
-38
lines changed

10 files changed

+85
-38
lines changed

.github/workflows/jetbrains-integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/setup-go@v2
5454
with:
5555
go-version: "1.19"
56-
- uses: actions/setup-java@v2
56+
- uses: actions/setup-java@v4
5757
with:
5858
distribution: zulu
5959
java-version: "11"

WORKSPACE.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ defaultArgs:
1313
codeWebExtensionCommit: 3953e8160fffa97dd4a4509542b4bf7ff9b704cd
1414
xtermCommit: d547d4ff4590b66c3ea24342fc62e3afcf6b77bc
1515
noVerifyJBPlugin: false
16-
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.3.3.tar.gz"
17-
golandDownloadUrl: "https://download.jetbrains.com/go/goland-2024.3.3.tar.gz"
18-
pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2024.3.3.tar.gz"
19-
phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2024.3.3.tar.gz"
20-
rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2024.3.3.tar.gz"
21-
webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2024.3.3.tar.gz"
16+
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2025.1.tar.gz"
17+
golandDownloadUrl: "https://download.jetbrains.com/go/goland-2025.1.tar.gz"
18+
pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-2025.1.tar.gz"
19+
phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2025.1.tar.gz"
20+
rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2025.1.tar.gz"
21+
webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2025.1.tar.gz"
2222
riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.tar.gz"
23-
clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.3.3.tar.gz"
24-
rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.3.4.tar.gz"
23+
clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2025.1.tar.gz"
24+
rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2025.1.tar.gz"
2525
jbBackendVersion: "latest"
2626
dockerVersion: "27.5.1"
2727
dockerComposeVersion: "2.34.0-gitpod.1"

components/ide/jetbrains/backend-plugin/gradle-stable.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
33
# for insight into build numbers and IntelliJ Platform versions.
44
# revert pluginSinceBuild if it's unnecessary
5-
pluginSinceBuild=243.21565
6-
pluginUntilBuild=243.*
5+
pluginSinceBuild=251.23774
6+
pluginUntilBuild=251.*
77
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
88
# See https://jb.gg/intellij-platform-builds-list for available build versions.
9-
pluginVerifierIdeVersions=2024.3
9+
pluginVerifierIdeVersions=2025.1
1010
# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
11-
platformVersion=243.23654-EAP-CANDIDATE-SNAPSHOT
11+
platformVersion=251.23774-EAP-CANDIDATE-SNAPSHOT
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the GNU Affero General Public License (AGPL).
33
// See License.AGPL.txt in the project root for license information.
44

5-
package io.gitpod.jetbrains.remote.latest
5+
package io.gitpod.jetbrains.remote.internal
66

77
import com.intellij.codeWithMe.ClientId
88
import com.intellij.openapi.client.ClientProjectSession

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodClientProjectSessionTracker.kt

Lines changed: 0 additions & 15 deletions
This file was deleted.

components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@
66
<!--suppress PluginXmlValidity -->
77
<idea-plugin>
88
<extensions defaultExtensionNs="com.intellij">
9-
<projectService serviceImplementation="io.gitpod.jetbrains.remote.latest.GitpodClientProjectSessionTracker"
10-
client="controller" preload="true"/>
119
</extensions>
1210
</idea-plugin>

components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@
66
<!--suppress PluginXmlValidity -->
77
<idea-plugin>
88
<extensions defaultExtensionNs="com.intellij">
9-
<projectService serviceImplementation="io.gitpod.jetbrains.remote.stable.GitpodClientProjectSessionTracker"
10-
client="controller" preload="true"/>
119
</extensions>
1210
</idea-plugin>

components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<projectService serviceImplementation="io.gitpod.jetbrains.remote.internal.GitpodTerminalServiceImpl" client="controller"
3535
preload="true"/>
3636

37+
<projectService serviceImplementation="io.gitpod.jetbrains.remote.internal.GitpodClientProjectSessionTracker"
38+
client="controller" preload="true"/>
39+
3740
<notificationGroup id="Gitpod Notifications" displayType="BALLOON" isLogByDefault="false"/>
3841

3942
<httpRequestHandler implementation="io.gitpod.jetbrains.remote.GitpodCLIService"/>
@@ -47,7 +50,6 @@
4750
description="Disable the forced update of Maven projects when IDE opens."
4851
restartRequired="true"/>
4952

50-
5153
<applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService"
5254
serviceImplementation="io.gitpod.jetbrains.remote.internal.GitpodIgnoredPortsForNotificationServiceImpl"
5355
preload="true"/>

components/ide/jetbrains/gateway-plugin/gradle-stable.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
33
# for insight into build numbers and IntelliJ Platform versions.
44
# revert pluginSinceBuild if it's unnecessary
5-
pluginSinceBuild=243.21565
6-
pluginUntilBuild=243.*
5+
pluginSinceBuild=251.23774
6+
pluginUntilBuild=251.*
77
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
88
# See https://jb.gg/intellij-platform-builds-list for available build versions.
9-
pluginVerifierIdeVersions=2024.3
9+
pluginVerifierIdeVersions=2025.1
1010
# Version from "com.jetbrains.gateway" which can be found at https://www.jetbrains.com/updates/updates.xml or exec `./gradlew printProductsReleases`
11-
platformVersion=2024.3
11+
platformVersion=2025.1

install/installer/pkg/components/ide-service/ide-configmap.json

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,14 @@
246246
],
247247
"allowPin": true,
248248
"versions": [
249+
{
250+
"version": "2024.3.3",
251+
"image": "{{.Repository}}/ide/intellij:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
252+
"imageLayers": [
253+
"{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
254+
"{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
255+
]
256+
},
249257
{
250258
"version": "2024.3.2",
251259
"image": "{{.Repository}}/ide/intellij:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -379,6 +387,14 @@
379387
],
380388
"allowPin": true,
381389
"versions": [
390+
{
391+
"version": "2024.3.3",
392+
"image": "{{.Repository}}/ide/goland:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
393+
"imageLayers": [
394+
"{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
395+
"{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
396+
]
397+
},
382398
{
383399
"version": "2024.3.2",
384400
"image": "{{.Repository}}/ide/goland:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -505,6 +521,14 @@
505521
],
506522
"allowPin": true,
507523
"versions": [
524+
{
525+
"version": "2024.3.3",
526+
"image": "{{.Repository}}/ide/pycharm:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
527+
"imageLayers": [
528+
"{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
529+
"{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
530+
]
531+
},
508532
{
509533
"version": "2024.3.1.1",
510534
"image": "{{.Repository}}/ide/pycharm:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -622,6 +646,14 @@
622646
],
623647
"allowPin": true,
624648
"versions": [
649+
{
650+
"version": "2024.3.3",
651+
"image": "{{.Repository}}/ide/phpstorm:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
652+
"imageLayers": [
653+
"{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
654+
"{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
655+
]
656+
},
625657
{
626658
"version": "2024.3.2",
627659
"image": "{{.Repository}}/ide/phpstorm:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -739,6 +771,14 @@
739771
],
740772
"allowPin": true,
741773
"versions": [
774+
{
775+
"version": "2024.3.3",
776+
"image": "{{.Repository}}/ide/rubymine:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
777+
"imageLayers": [
778+
"{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
779+
"{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
780+
]
781+
},
742782
{
743783
"version": "2024.3.1.1",
744784
"image": "{{.Repository}}/ide/rubymine:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -856,6 +896,14 @@
856896
],
857897
"allowPin": true,
858898
"versions": [
899+
{
900+
"version": "2024.3.3",
901+
"image": "{{.Repository}}/ide/webstorm:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
902+
"imageLayers": [
903+
"{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
904+
"{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
905+
]
906+
},
859907
{
860908
"version": "2024.3.1.1",
861909
"image": "{{.Repository}}/ide/webstorm:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -1034,6 +1082,14 @@
10341082
],
10351083
"allowPin": true,
10361084
"versions": [
1085+
{
1086+
"version": "2024.3.3",
1087+
"image": "{{.Repository}}/ide/clion:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
1088+
"imageLayers": [
1089+
"{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
1090+
"{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
1091+
]
1092+
},
10371093
{
10381094
"version": "2024.3.2",
10391095
"image": "{{.Repository}}/ide/clion:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",
@@ -1143,6 +1199,14 @@
11431199
],
11441200
"allowPin": true,
11451201
"versions": [
1202+
{
1203+
"version": "2024.3.4",
1204+
"image": "{{.Repository}}/ide/rustrover:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
1205+
"imageLayers": [
1206+
"{{.Repository}}/ide/jb-backend-plugin:commit-cbc17ce62a85256bc24731b29f571808062e0b51",
1207+
"{{.Repository}}/ide/jb-launcher:commit-e5b9a3c59f65a36d28498cd3379b066336e87b0f"
1208+
]
1209+
},
11461210
{
11471211
"version": "2024.3.3",
11481212
"image": "{{.Repository}}/ide/rustrover:commit-fff49d65dc347847a404ec1ea3cd6684de4ea2f7",

0 commit comments

Comments
 (0)