From 5dda6dfe11226c718d8df7c461fa88aa165c4eff Mon Sep 17 00:00:00 2001 From: Anton Kosyakov Date: Sun, 19 Mar 2023 14:59:38 +0000 Subject: [PATCH] [jb] bump up major platform version of backend plugin --- .../backend-plugin/gradle-latest.properties | 8 ++-- ...=> AbstractGitpodMetricControlProvider.kt} | 11 +++-- ...ce.kt => AbstractGitpodTerminalService.kt} | 46 +++---------------- ...dIgnoredPortsForNotificationServiceImpl.kt | 29 ++++++++++++ .../LatestGitpodMetricControlProvider.kt | 21 +++++++++ .../latest/LatestGitpodTerminalService.kt | 26 +++++++++++ ...IgnoredPortsForNotificationServiceImpl.kt} | 4 +- .../StableGitpodMetricControlProvider.kt | 20 ++++++++ .../stable/StableGitpodTerminalService.kt | 26 +++++++++++ .../resources-latest/META-INF/extensions.xml | 9 ++++ .../resources-stable/META-INF/extensions.xml | 9 ++++ .../src/main/resources/META-INF/plugin.xml | 7 --- components/supervisor-api/java/build.gradle | 16 +++---- 13 files changed, 167 insertions(+), 65 deletions(-) rename components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/{GitpodMetricControlProvider.kt => AbstractGitpodMetricControlProvider.kt} (87%) rename components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/{GitpodTerminalService.kt => AbstractGitpodTerminalService.kt} (86%) create mode 100644 components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodIgnoredPortsForNotificationServiceImpl.kt create mode 100644 components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodMetricControlProvider.kt create mode 100644 components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodTerminalService.kt rename components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/{internal/GitpodIgnoredPortsForNotificationServiceImpl.kt => stable/StableGitpodIgnoredPortsForNotificationServiceImpl.kt} (86%) create mode 100644 components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodMetricControlProvider.kt create mode 100644 components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodTerminalService.kt diff --git a/components/ide/jetbrains/backend-plugin/gradle-latest.properties b/components/ide/jetbrains/backend-plugin/gradle-latest.properties index 23b98a9a6cb2af..12f95dd0994541 100644 --- a/components/ide/jetbrains/backend-plugin/gradle-latest.properties +++ b/components/ide/jetbrains/backend-plugin/gradle-latest.properties @@ -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=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/GitpodMetricControlProvider.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/AbstractGitpodMetricControlProvider.kt similarity index 87% rename from components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodMetricControlProvider.kt rename to components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/AbstractGitpodMetricControlProvider.kt index bbb09ee1488be8..780fde8356148f 100644 --- 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/AbstractGitpodMetricControlProvider.kt @@ -5,15 +5,16 @@ package io.gitpod.jetbrains.remote import com.jetbrains.ide.model.uiautomation.BeControl +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.diagnostics.BackendDiagnosticsService import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.MetricControlProvider import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.createProgressBar -import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.createProgressRow -class GitpodMetricControlProvider : MetricControlProvider { +abstract class AbstractGitpodMetricControlProvider : MetricControlProvider { override val id: String = "gitpodMetricsControl" override fun getControl(lifetime: Lifetime): BeControl { val backendDiagnosticsService = BackendDiagnosticsService.Companion.getInstance() @@ -92,7 +93,7 @@ class GitpodMetricControlProvider : MetricControlProvider { cpuTotal.valueProperty.change.advise(lifetime) { updateLabel() } - createProgressRow(ctx, lifetime, label, cpuPercentage.statusProperty, labelProperty, cpuPercentageProperty, progressBar) + createProgressControl(ctx, lifetime, label, cpuPercentage, labelProperty, cpuPercentageProperty, progressBar) } private fun createMemoryControl(ctx: VerticalGridBuilder, backendDiagnosticsService: BackendDiagnosticsService, lifetime: Lifetime) { @@ -115,6 +116,8 @@ class GitpodMetricControlProvider : MetricControlProvider { updateLabel() } - createProgressRow(ctx, lifetime, label, memoryPercentage.statusProperty, labelProperty, memoryPercentageProperty, progressBar) + createProgressControl(ctx, lifetime, label, memoryPercentage, labelProperty, memoryPercentageProperty, progressBar) } + + protected abstract fun createProgressControl(ctx: VerticalGridBuilder, lifetime: Lifetime, label: String, cpuPercentage: Metric, labelProperty: Property, cpuPercentageProperty: Property, progressBar: DefiniteProgress) } diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodTerminalService.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/AbstractGitpodTerminalService.kt similarity index 86% rename from components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodTerminalService.kt rename to components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/AbstractGitpodTerminalService.kt index 2058b8d7959e99..b5d8a67de4f1a7 100644 --- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodTerminalService.kt +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/AbstractGitpodTerminalService.kt @@ -13,7 +13,6 @@ import com.intellij.util.application import com.jediterm.terminal.ui.TerminalWidget import com.jediterm.terminal.ui.TerminalWidgetListener import com.jetbrains.rd.framework.util.launch -import com.jetbrains.rdserver.terminal.BackendTerminalManager import io.gitpod.supervisor.api.Status import io.gitpod.supervisor.api.StatusServiceGrpc import io.gitpod.supervisor.api.TerminalOuterClass @@ -25,16 +24,12 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.future.await import kotlinx.coroutines.guava.await import org.jetbrains.plugins.terminal.ShellTerminalWidget -import org.jetbrains.plugins.terminal.TerminalView import java.util.* import java.util.concurrent.CompletableFuture import java.util.concurrent.ExecutionException -@Suppress("UnstableApiUsage") -class GitpodTerminalService(project: Project): Disposable { +abstract class AbstractGitpodTerminalService(project: Project) : Disposable { private val lifetime = defineNestedLifetime() - private val terminalView = TerminalView.getInstance(project) - private val backendTerminalManager = BackendTerminalManager.getInstance(project) private val terminalServiceFutureStub = TerminalServiceGrpc.newFutureStub(GitpodManager.supervisorChannel) private val terminalServiceStub = TerminalServiceGrpc.newStub(GitpodManager.supervisorChannel) private val statusServiceStub = StatusServiceGrpc.newStub(GitpodManager.supervisorChannel) @@ -44,8 +39,7 @@ class GitpodTerminalService(project: Project): Disposable { } override fun dispose() = Unit - - private fun start() { + protected fun start() { if (application.isHeadlessEnvironment) return lifetime.launch { @@ -58,25 +52,7 @@ class GitpodTerminalService(project: Project): Disposable { } } - private fun createSharedTerminalAndExecuteCommand(title: String, command: String): ShellTerminalWidget? { - val registeredTerminals = terminalView.widgets.toMutableList() - - backendTerminalManager.createNewSharedTerminal(UUID.randomUUID().toString(), title) - - for (widget in terminalView.widgets) { - if (registeredTerminals.contains(widget)) continue - - widget.terminalTitle.change { applicationTitle = title } - - val shellTerminalWidget = widget as ShellTerminalWidget - - shellTerminalWidget.executeCommand(command) - - return shellTerminalWidget - } - - return null - } + protected abstract fun createSharedTerminal(title: String): ShellTerminalWidget private fun createTerminalsAttachedToTasks( terminals: List, @@ -181,15 +157,10 @@ class GitpodTerminalService(project: Project): Disposable { } private fun createAttachedSharedTerminal(supervisorTerminal: TerminalOuterClass.Terminal) { - val shellTerminalWidget = createSharedTerminalAndExecuteCommand( - supervisorTerminal.title, - "gp tasks attach ${supervisorTerminal.alias}" - ) ?: return - + val shellTerminalWidget = createSharedTerminal(supervisorTerminal.title) + shellTerminalWidget.executeCommand("gp tasks attach ${supervisorTerminal.alias}") closeTerminalWidgetWhenClientGetsClosed(shellTerminalWidget) - exitTaskWhenTerminalWidgetGetsClosed(supervisorTerminal, shellTerminalWidget) - listenForTaskTerminationAndTitleChanges(supervisorTerminal, shellTerminalWidget) } @@ -207,10 +178,7 @@ class GitpodTerminalService(project: Project): Disposable { .build() val listenTerminalResponseObserver = - object : ClientResponseObserver< - TerminalOuterClass.ListenTerminalRequest, - TerminalOuterClass.ListenTerminalResponse - > { + object : ClientResponseObserver { override fun beforeStart( request: ClientCallStreamObserver ) { @@ -286,7 +254,7 @@ class GitpodTerminalService(project: Project): Disposable { ) } catch (throwable: Throwable) { thisLogger().error("gitpod: Got an error while shutting down " + - "'${supervisorTerminal.title}' terminal.", throwable) + "'${supervisorTerminal.title}' terminal.", throwable) } } } 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/latest/LatestGitpodIgnoredPortsForNotificationServiceImpl.kt new file mode 100644 index 00000000000000..0d604188eed387 --- /dev/null +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodIgnoredPortsForNotificationServiceImpl.kt @@ -0,0 +1,29 @@ +// 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.latest + +import io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch +import org.jetbrains.ide.BuiltInServerManager + +@Suppress("OPT_IN_USAGE") +class LatestGitpodIgnoredPortsForNotificationServiceImpl : GitpodIgnoredPortsForNotificationService { + private val ignoredPortsForNotification = mutableSetOf(5990) + + init { + GlobalScope.launch { + BuiltInServerManager.getInstance().waitForStart().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/latest/LatestGitpodMetricControlProvider.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodMetricControlProvider.kt new file mode 100644 index 00000000000000..a3ce3f8d57c8e1 --- /dev/null +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodMetricControlProvider.kt @@ -0,0 +1,21 @@ +// 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.latest + +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 LatestGitpodMetricControlProvider: 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/latest/LatestGitpodTerminalService.kt new file mode 100644 index 00000000000000..c63b55e3351056 --- /dev/null +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/LatestGitpodTerminalService.kt @@ -0,0 +1,26 @@ +// 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.latest + +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.TerminalToolWindowManager +import java.util.* + +@Suppress("UnstableApiUsage") +class LatestGitpodTerminalService(project: Project): AbstractGitpodTerminalService(project) { + + private val terminalToolWindowManager = TerminalToolWindowManager.getInstance(project) + private val backendTerminalManager = BackendTerminalManager.getInstance(project) + + override fun createSharedTerminal(title: String): ShellTerminalWidget { + val shellTerminalWidget = terminalToolWindowManager.createLocalShellWidget(null, title, true, false) + backendTerminalManager.shareTerminal(shellTerminalWidget.asNewWidget(), UUID.randomUUID().toString()) + return shellTerminalWidget + } + +} diff --git a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodIgnoredPortsForNotificationServiceImpl.kt b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodIgnoredPortsForNotificationServiceImpl.kt similarity index 86% rename from components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodIgnoredPortsForNotificationServiceImpl.kt rename to components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodIgnoredPortsForNotificationServiceImpl.kt index 27d7319ee3df31..7af0733166e7e8 100644 --- a/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/internal/GitpodIgnoredPortsForNotificationServiceImpl.kt +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodIgnoredPortsForNotificationServiceImpl.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.internal +package io.gitpod.jetbrains.remote.stable import com.intellij.idea.getServerFutureAsync import io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService @@ -11,7 +11,7 @@ import kotlinx.coroutines.launch import org.jetbrains.ide.BuiltInServerManager @Suppress("OPT_IN_USAGE") -class GitpodIgnoredPortsForNotificationServiceImpl : GitpodIgnoredPortsForNotificationService { +class StableGitpodIgnoredPortsForNotificationServiceImpl : GitpodIgnoredPortsForNotificationService { private val ignoredPortsForNotification = mutableSetOf(5990) init { 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 new file mode 100644 index 00000000000000..b88ba1966c6f1d --- /dev/null +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodMetricControlProvider.kt @@ -0,0 +1,20 @@ +// 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 new file mode 100644 index 00000000000000..a6b81bc848b11b --- /dev/null +++ b/components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/StableGitpodTerminalService.kt @@ -0,0 +1,26 @@ +// 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 9d4b9661deb26b..6312db0c18f530 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,5 +6,14 @@ + + + + + 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 9d4b9661deb26b..4a58f29c9a3c89 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,5 +6,14 @@ + + + + + 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 41430d159b5a4b..62df284afa1012 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 @@ -26,9 +26,6 @@ - @@ -39,13 +36,9 @@ - - diff --git a/components/supervisor-api/java/build.gradle b/components/supervisor-api/java/build.gradle index 4bf8cf37866cf8..656c01e875bdfa 100644 --- a/components/supervisor-api/java/build.gradle +++ b/components/supervisor-api/java/build.gradle @@ -12,15 +12,13 @@ repositories { group 'io.gitpod.api' dependencies { - implementation 'com.google.protobuf:protobuf-java:3.19.1' - implementation 'com.google.protobuf:protobuf-java-util:3.19.1' - implementation 'com.google.api.grpc:proto-google-common-protos:2.2.2' - implementation 'io.grpc:grpc-core:1.49.0' - implementation 'io.grpc:grpc-protobuf:1.49.0' - implementation 'io.grpc:grpc-stub:1.49.0' - implementation 'javax.annotation:javax.annotation-api:1.3.2' - - runtimeOnly 'io.grpc:grpc-netty-shaded:1.41.0' + compileOnly 'com.google.protobuf:protobuf-java:3.19.1' + compileOnly 'com.google.protobuf:protobuf-java-util:3.19.1' + compileOnly 'com.google.api.grpc:proto-google-common-protos:2.2.2' + compileOnly 'io.grpc:grpc-core:1.49.0' + compileOnly 'io.grpc:grpc-protobuf:1.49.0' + compileOnly 'io.grpc:grpc-stub:1.49.0' + compileOnly 'javax.annotation:javax.annotation-api:1.3.2' } application {