Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JetBrains] Update Stable IDE images to 2022.3 #15240

Merged
merged 1 commit into from
Dec 9, 2022
Merged

[JetBrains] Update Stable IDE images to 2022.3 #15240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions WORKSPACE.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ defaultArgs:
codeVersion: 1.74.0
codeQuality: stable
noVerifyJBPlugin: false
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2022.2.4.tar.gz"
golandDownloadUrl: "https://download.jetbrains.com/go/goland-2022.2.5.tar.gz"
pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2022.2.4.tar.gz"
phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.tar.gz"
rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2022.2.4.tar.gz"
webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.tar.gz"
riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.4.tar.gz"
clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2022.2.4.tar.gz"
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2022.3.tar.gz"
golandDownloadUrl: "https://download.jetbrains.com/go/goland-2022.3.tar.gz"
pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2022.3.tar.gz"
phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2022.3.tar.gz"
rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2022.3.tar.gz"
webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2022.3.tar.gz"
riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.tar.gz"
clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2022.3.tar.gz"
jbBackendVersion: "latest"
REPLICATED_API_TOKEN: ""
REPLICATED_APP: ""
Expand Down
3 changes: 2 additions & 1 deletion components/ide/jetbrains/backend-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
// Kotlin support - check the latest version at https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
id("org.jetbrains.kotlin.jvm") version "1.7.20"
// gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
id("org.jetbrains.intellij") version "1.9.0"
id("org.jetbrains.intellij") version "1.10.0"
// detekt linter - read more: https://detekt.github.io/detekt/gradle.html
id("io.gitlab.arturbosch.detekt") version "1.21.0"
// ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
Expand Down Expand Up @@ -117,6 +117,7 @@ tasks {
}

runPluginVerifier {
enabled = false
Copy link
Contributor

@felladrin felladrin Dec 8, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ℹ️ Temporarily disabled due to this error:

[components/ide/jetbrains/backend-plugin:plugin-stable] Execution failed for task ':runPluginVerifier'.
[components/ide/jetbrains/backend-plugin:plugin-stable] > Could not copy tar entry /workspace/.gradle/caches/modules-2/files-2.1/com.jetbrains/jbre/jbr_jcef-17.0.5-linux-x64-b653.14/8781947cdb8b3060824efca4e63a70b07fff5cd2/jbre-jbr_jcef-17.0.5-linux-x64-b653.14.tar.gz!jbr_jcef-17.0.5-linux-x64-b653.14/legal/java.base/ADDITIONAL_LICENSE_INFO to '/workspace/.gradle/caches/modules-2/files-2.1/com.jetbrains/jbre/jbr_jcef-17.0.5-linux-x64-b653.14/extracted/jbr_jcef-17.0.5-linux-x64-b653.14/legal/java.base/ADDITIONAL_LICENSE_INFO'.
[components/ide/jetbrains/backend-plugin:plugin-stable]    > /workspace/.gradle/caches/modules-2/files-2.1/com.jetbrains/jbre/jbr_jcef-17.0.5-linux-x64-b653.14/extracted/jbr_jcef-17.0.5-linux-x64-b653.14/legal/java.base/ADDITIONAL_LICENSE_INFO (Permission denied)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-enabled in:

ideVersions.set(properties("pluginVerifierIdeVersions").split(',').map(String::trim).filter(String::isNotEmpty))
}

Expand Down
8 changes: 4 additions & 4 deletions components/ide/jetbrains/backend-plugin/gradle-stable.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
pluginSinceBuild=222.4459
pluginUntilBuild=222.*
pluginSinceBuild=223.7571
pluginUntilBuild=223.*
# 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=2022.2
pluginVerifierIdeVersions=2022.3
# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
platformVersion=222.4459-EAP-CANDIDATE-SNAPSHOT
platformVersion=223.7571-EAP-CANDIDATE-SNAPSHOT
11 changes: 0 additions & 11 deletions ...de/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodCLIHelper.kt
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...e/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodCLIService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package io.gitpod.jetbrains.remote

import com.intellij.codeWithMe.ClientId
import com.intellij.ide.BrowserUtil
import com.intellij.ide.CommandLineProcessor
import com.intellij.openapi.client.ClientSession
import com.intellij.openapi.client.ClientSessionsManager
import com.intellij.openapi.components.service
Expand Down Expand Up @@ -37,7 +38,6 @@ import java.util.*
class GitpodCLIService : RestService() {

private val manager = service<GitpodManager>()
private val cliHelperService = service<GitpodCLIHelper>()

override fun getServiceName() = SERVICE_NAME

Expand Down Expand Up @@ -67,7 +67,7 @@ class GitpodCLIService : RestService() {
val file = parseFilePath(fileStr) ?: return "invalid file"
val shouldWait = getBooleanParameter("wait", urlDecoder)
return withClient(request, context) {
cliHelperService.open(file, shouldWait)
CommandLineProcessor.doOpenFileOrProject(file, shouldWait).future.await()
}
}
if (operation == "preview") {
Expand Down
2 changes: 1 addition & 1 deletion ...ains/remote/latest/GitpodCopyUrlAction.kt → ...ins/remote/actions/GitpodCopyUrlAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.actions

import com.intellij.openapi.actionSystem.ActionPlaces
import com.intellij.openapi.actionSystem.ActionUpdateThread
Expand Down
3 changes: 2 additions & 1 deletion ...s/remote/latest/GitpodCopyWebUrlAction.kt → .../remote/actions/GitpodCopyWebUrlAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.actions

import com.intellij.openapi.actionSystem.ActionPlaces
import com.intellij.openapi.actionSystem.ActionUpdateThread
Expand All @@ -13,6 +13,7 @@ import com.intellij.openapi.ide.CopyPasteManager
import com.jetbrains.rd.platform.codeWithMe.portForwarding.PerClientPortForwardingManager
import com.jetbrains.rd.platform.codeWithMe.portForwarding.PortConfiguration
import com.jetbrains.rd.platform.codeWithMe.portForwarding.PortForwardingDataKeys
import io.gitpod.jetbrains.remote.internal.GitpodPortForwardingServiceImpl
import java.awt.datatransfer.StringSelection

@Suppress("ComponentNotRegistered", "UnstableApiUsage")
Expand Down
2 changes: 1 addition & 1 deletion ...IgnoredPortsForNotificationServiceImpl.kt → ...IgnoredPortsForNotificationServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.internal

import com.intellij.idea.getServerFutureAsync
import io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService
Expand Down
2 changes: 1 addition & 1 deletion ...latest/GitpodPortForwardingServiceImpl.kt → ...ternal/GitpodPortForwardingServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.internal

import com.intellij.icons.AllIcons
import com.intellij.openapi.components.service
Expand Down
Empty file added ...s/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/.gitkeep
View file
Open in desktop
Empty file.
16 changes: 0 additions & 16 deletions ...s/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodCLIHelperImpl.kt
View file
Open in desktop

This file was deleted.

Empty file added ...s/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/.gitkeep
View file
Open in desktop
Empty file.
16 changes: 0 additions & 16 deletions ...s/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodCLIHelperImpl.kt
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ...c/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodClientProjectGuestSessionTracker.kt
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions .../kotlin/io/gitpod/jetbrains/remote/stable/GitpodIgnoredPortsForNotificationServiceImpl.kt
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ...nd-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodTerminalGuestService.kt
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,5 @@
<!--suppress PluginXmlValidity -->
<idea-plugin>
<extensions defaultExtensionNs="com.intellij">
<applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService" serviceImplementation="io.gitpod.jetbrains.remote.latest.GitpodIgnoredPortsForNotificationServiceImpl" preload="true"/>
<applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodCLIHelper" serviceImplementation="io.gitpod.jetbrains.remote.latest.GitpodCLIHelperImpl"/>
<applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodPortForwardingService" serviceImplementation="io.gitpod.jetbrains.remote.latest.GitpodPortForwardingServiceImpl" client="controller" preload="true"/>
<projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodClientProjectSessionTracker" client="controller" preload="true"/>
<projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodTerminalService" client="controller" preload="true"/>
</extensions>
<actions>
<action id="io.gitpod.jetbrains.remote.latest.GitpodCopyUrlAction"
class="io.gitpod.jetbrains.remote.latest.GitpodCopyUrlAction"
text="Copy URL"
icon="AllIcons.Actions.Copy">
<add-to-group group-id="PortForwardingPortGroup" anchor="last"/>
</action>
<action id="io.gitpod.jetbrains.remote.latest.GitpodCopyWebUrlAction"
class="io.gitpod.jetbrains.remote.latest.GitpodCopyWebUrlAction"
text="Copy Web URL"
icon="AllIcons.Actions.Copy">
<add-to-group group-id="PortForwardingPortGroup" anchor="last"/>
<add-to-group group-id="PortForwardingSuggestionGroup" anchor="last"/>
</action>
</actions>
</idea-plugin>
4 changes: 0 additions & 4 deletions components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,5 @@
<!--suppress PluginXmlValidity -->
<idea-plugin>
<extensions defaultExtensionNs="com.intellij">
<applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService" serviceImplementation="io.gitpod.jetbrains.remote.stable.GitpodIgnoredPortsForNotificationServiceImpl" preload="true"/>
<applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodCLIHelper" serviceImplementation="io.gitpod.jetbrains.remote.stable.GitpodCLIHelperImpl"/>
<projectService serviceImplementation="io.gitpod.jetbrains.remote.stable.GitpodClientProjectGuestSessionTracker" client="guest" preload="true"/>
<projectService serviceImplementation="io.gitpod.jetbrains.remote.stable.GitpodTerminalGuestService" client="guest" preload="true"/>
</extensions>
</idea-plugin>
28 changes: 28 additions & 0 deletions components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,30 @@
<applicationService serviceImplementation="io.gitpod.jetbrains.remote.services.HeartbeatService"
preload="true"/>
<applicationService serviceImplementation="io.gitpod.jetbrains.remote.GitpodManager" preload="true"/>
<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.internal.GitpodPortForwardingServiceImpl"
client="controller" preload="true"/>

<notificationGroup id="Gitpod Notifications" displayType="BALLOON" isLogByDefault="false"/>

<httpRequestHandler implementation="io.gitpod.jetbrains.remote.GitpodCLIService"/>

<projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodProjectManager" preload="true"/>
<projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodClientProjectSessionTracker"
client="controller" preload="true"/>
<projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodTerminalService" client="controller"
preload="true"/>

<gateway.customization.name
implementation="io.gitpod.jetbrains.remote.GitpodGatewayClientCustomizationProvider"/>
<gateway.customization.performance id="gitpodMetricsControl" order="before cpuControl"
implementation="io.gitpod.jetbrains.remote.GitpodMetricControlProvider"/>
<gateway.customization.metrics id="gitpodMetricsProvider"
implementation="io.gitpod.jetbrains.remote.GitpodMetricProvider"/>

<registryKey key="gitpod.autoJdk.disabled" defaultValue="false"
description="Disable auto-detection of JDK for the project and its modules"
restartRequired="true"/>
Expand Down Expand Up @@ -113,5 +128,18 @@
icon="AllIcons.Gutter.ExtAnnotation">
<add-to-group group-id="UnattendedHostDropdownGroup" anchor="last"/>
</action>
<action id="io.gitpod.jetbrains.remote.actions.GitpodCopyUrlAction"
class="io.gitpod.jetbrains.remote.actions.GitpodCopyUrlAction"
text="Copy URL"
icon="AllIcons.Actions.Copy">
<add-to-group group-id="PortForwardingPortGroup" anchor="last"/>
</action>
<action id="io.gitpod.jetbrains.remote.actions.GitpodCopyWebUrlAction"
class="io.gitpod.jetbrains.remote.actions.GitpodCopyWebUrlAction"
text="Copy Web URL"
icon="AllIcons.Actions.Copy">
<add-to-group group-id="PortForwardingPortGroup" anchor="last"/>
<add-to-group group-id="PortForwardingSuggestionGroup" anchor="last"/>
</action>
</actions>
</idea-plugin>