diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml index 1a998366a2fbc8..bc02151e63142f 100644 --- a/WORKSPACE.yaml +++ b/WORKSPACE.yaml @@ -11,14 +11,14 @@ defaultArgs: codeVersion: 1.77.3 codeQuality: stable noVerifyJBPlugin: false - intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2022.3.3.tar.gz" - golandDownloadUrl: "https://download.jetbrains.com/go/goland-2022.3.4.tar.gz" - pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2022.3.3.tar.gz" - phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2022.3.3.tar.gz" - rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2022.3.3.tar.gz" - webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2022.3.4.tar.gz" - riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3.tar.gz" - clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2022.3.3.tar.gz" + intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2023.1.tar.gz" + golandDownloadUrl: "https://download.jetbrains.com/go/goland-2023.1.tar.gz" + pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2023.1.tar.gz" + phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2023.1.tar.gz" + rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2023.1.tar.gz" + webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2023.1.tar.gz" + riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.tar.gz" + clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2023.1.1.tar.gz" jbBackendVersion: "latest" REPLICATED_API_TOKEN: "" REPLICATED_APP: "" diff --git a/components/ide/jetbrains/backend-plugin/gradle-stable.properties b/components/ide/jetbrains/backend-plugin/gradle-stable.properties index de645218c3053d..4ce42cb4af0356 100644 --- a/components/ide/jetbrains/backend-plugin/gradle-stable.properties +++ b/components/ide/jetbrains/backend-plugin/gradle-stable.properties @@ -1,10 +1,10 @@ # this file is auto generated by components/ide/jetbrains/image/gha-update-image/index.js # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. -pluginSinceBuild=223.8836 -pluginUntilBuild=223.* +pluginSinceBuild=231.8109 +pluginUntilBuild=231.* # 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.3 +pluginVerifierIdeVersions=2023.1 # Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots -platformVersion=223.8836-EAP-CANDIDATE-SNAPSHOT +platformVersion=231.8109-EAP-CANDIDATE-SNAPSHOT diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodIgnoredPortsForNotificationServiceImpl.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodIgnoredPortsForNotificationServiceImpl.kt similarity index 85% rename from components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodIgnoredPortsForNotificationServiceImpl.kt rename to components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodIgnoredPortsForNotificationServiceImpl.kt index 0d604188eed387..2458e0234ae9ce 100644 --- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodIgnoredPortsForNotificationServiceImpl.kt +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodIgnoredPortsForNotificationServiceImpl.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.internal import io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService import kotlinx.coroutines.GlobalScope @@ -10,7 +10,7 @@ import kotlinx.coroutines.launch import org.jetbrains.ide.BuiltInServerManager @Suppress("OPT_IN_USAGE") -class LatestGitpodIgnoredPortsForNotificationServiceImpl : GitpodIgnoredPortsForNotificationService { +class GitpodIgnoredPortsForNotificationServiceImpl : GitpodIgnoredPortsForNotificationService { private val ignoredPortsForNotification = mutableSetOf(5990) init { diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodMetricControlProvider.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodMetricControlProvider.kt similarity index 89% rename from components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodMetricControlProvider.kt rename to components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodMetricControlProvider.kt index a3ce3f8d57c8e1..a9c767b5043b57 100644 --- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodMetricControlProvider.kt +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/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.internal import com.jetbrains.ide.model.uiautomation.DefiniteProgress import com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.Metric @@ -12,7 +12,7 @@ import com.jetbrains.rd.util.reactive.Property import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.createProgressRow import io.gitpod.jetbrains.remote.AbstractGitpodMetricControlProvider -class LatestGitpodMetricControlProvider: AbstractGitpodMetricControlProvider() { +class GitpodMetricControlProvider: AbstractGitpodMetricControlProvider() { override fun createProgressControl(ctx: VerticalGridBuilder, lifetime: Lifetime, label: String, cpuPercentage: Metric, labelProperty: Property, cpuPercentageProperty: Property, progressBar: DefiniteProgress) { createProgressRow(ctx, id, lifetime, label, cpuPercentage.statusProperty, labelProperty, cpuPercentageProperty, progressBar) diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodTerminalService.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodTerminalService.kt similarity index 88% rename from components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodTerminalService.kt rename to components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodTerminalService.kt index c63b55e3351056..209e3ad3590937 100644 --- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodTerminalService.kt +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodTerminalService.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.internal import com.intellij.openapi.project.Project import com.jetbrains.rdserver.terminal.BackendTerminalManager @@ -12,7 +12,7 @@ import org.jetbrains.plugins.terminal.TerminalToolWindowManager import java.util.* @Suppress("UnstableApiUsage") -class LatestGitpodTerminalService(project: Project): AbstractGitpodTerminalService(project) { +class GitpodTerminalService(project: Project): AbstractGitpodTerminalService(project) { private val terminalToolWindowManager = TerminalToolWindowManager.getInstance(project) private val backendTerminalManager = BackendTerminalManager.getInstance(project) diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodIgnoredPortsForNotificationServiceImpl.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodIgnoredPortsForNotificationServiceImpl.kt deleted file mode 100644 index 7af0733166e7e8..00000000000000 --- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodIgnoredPortsForNotificationServiceImpl.kt +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 2022 Gitpod GmbH. All rights reserved. -// 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.stable - -import com.intellij.idea.getServerFutureAsync -import io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch -import org.jetbrains.ide.BuiltInServerManager - -@Suppress("OPT_IN_USAGE") -class StableGitpodIgnoredPortsForNotificationServiceImpl : GitpodIgnoredPortsForNotificationService { - private val ignoredPortsForNotification = mutableSetOf(5990) - - init { - GlobalScope.launch { - BuiltInServerManager.getInstance().waitForStart().port.let { ignorePort(it) } - getServerFutureAsync().await()?.port?.let { ignorePort(it) } - } - } - - override fun ignorePort(portNumber: Int) { - ignoredPortsForNotification.add(portNumber) - } - - override fun getIgnoredPorts(): Set { - return ignoredPortsForNotification.toSet() - } -} diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodMetricControlProvider.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodMetricControlProvider.kt deleted file mode 100644 index b88ba1966c6f1d..00000000000000 --- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodMetricControlProvider.kt +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2022 Gitpod GmbH. All rights reserved. -// 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.stable - -import com.jetbrains.ide.model.uiautomation.DefiniteProgress -import com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.Metric -import com.jetbrains.rd.ui.bedsl.dsl.* -import com.jetbrains.rd.util.lifetime.Lifetime -import com.jetbrains.rd.util.reactive.Property -import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.createProgressRow -import io.gitpod.jetbrains.remote.AbstractGitpodMetricControlProvider - -class StableGitpodMetricControlProvider: AbstractGitpodMetricControlProvider() { - - override fun createProgressControl(ctx: VerticalGridBuilder, lifetime: Lifetime, label: String, cpuPercentage: Metric, labelProperty: Property, cpuPercentageProperty: Property, progressBar: DefiniteProgress) { - createProgressRow(ctx, lifetime, label, cpuPercentage.statusProperty, labelProperty, cpuPercentageProperty, progressBar) - } -} diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodTerminalService.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodTerminalService.kt deleted file mode 100644 index a6b81bc848b11b..00000000000000 --- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodTerminalService.kt +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2022 Gitpod GmbH. All rights reserved. -// 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.stable - -import com.intellij.openapi.project.Project -import com.jetbrains.rdserver.terminal.BackendTerminalManager -import io.gitpod.jetbrains.remote.AbstractGitpodTerminalService -import org.jetbrains.plugins.terminal.ShellTerminalWidget -import org.jetbrains.plugins.terminal.TerminalView -import java.util.* - -@Suppress("UnstableApiUsage") -class StableGitpodTerminalService(project: Project): AbstractGitpodTerminalService(project) { - - private val terminalView = TerminalView.getInstance(project) - private val backendTerminalManager = BackendTerminalManager.getInstance(project) - - override fun createSharedTerminal(title: String): ShellTerminalWidget { - val shellTerminalWidget = terminalView.createLocalShellWidget(null, title, true, false) - backendTerminalManager.shareTerminal(shellTerminalWidget, UUID.randomUUID().toString()) - return shellTerminalWidget - } - -} 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 index 6312db0c18f530..9d4b9661deb26b 100644 --- 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,14 +6,5 @@ - - - - - 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 index 4a58f29c9a3c89..9d4b9661deb26b 100644 --- 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,14 +6,5 @@ - - - - - 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 index 62df284afa1012..001ecb9f5bee6b 100644 --- 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 @@ -45,6 +45,17 @@ + + + + + + +