Skip to content

Commit c87ad60

Browse files
mustard-mhmustard-mh
committed
Migrate to 2.6.0.35616 
1 parent 86a3acf commit c87ad60

29 files changed

+287
-126
lines changed

‎components/ide/jetbrains/toolbox/BUILD.yaml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
packages:
2+
- name: plugin-stable
3+
type: generic
4+
deps:
5+
- components/supervisor-api/java:lib
6+
- components/public-api/java:lib
7+
srcs:
8+
- "**/*.kt"
9+
- "**/*.kts"
10+
- src/main/resources/*
11+
- gradle.properties
12+
- gradlew
13+
- gradle/*
14+
- build.sh
15+
env:
16+
- JB_QUALIFIER=stable
17+
- SDKMAN_DIR=/home/gitpod/.sdkman
18+
config:
19+
commands:
20+
- - "bash"
21+
- "-c"
22+
- >
23+
echo java=21.0.3.fx-zulu > .sdkmanrc
24+
&& source "$SDKMAN_DIR/bin/sdkman-init.sh"
25+
&& sdk env install
26+
&& ./build.sh "0.0.1-${version}"
27+
&& mv ./build/distributions/io.gitpod.toolbox.gateway.zip .toolbox.zip
28+
&& rm -rf *
29+
&& rm -rf .gradle .kotlin .sdkmanrc
30+
&& mv .toolbox.zip toolbox.zip

‎components/ide/jetbrains/toolbox/build.gradle.kts

+24-5
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@ import com.github.jk1.license.render.JsonReportRenderer
77
import org.jetbrains.kotlin.com.intellij.openapi.util.SystemInfoRt
88
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
99
import java.nio.file.Path
10+
import java.time.LocalDateTime
11+
import java.time.format.DateTimeFormatter
1012
import kotlin.io.path.div
1113

14+
1215
plugins {
1316
alias(libs.plugins.kotlin)
1417
alias(libs.plugins.serialization)
1518
`java-library`
1619
alias(libs.plugins.dependency.license.report)
1720
id("com.github.johnrengelman.shadow") version "8.1.1"
21+
alias(libs.plugins.gradle.wrapper)
1822
}
1923

2024
buildscript {
@@ -25,7 +29,17 @@ buildscript {
2529

2630
repositories {
2731
mavenCentral()
28-
maven("https://packages.jetbrains.team/maven/p/tbx/gateway")
32+
maven("https://packages.jetbrains.team/maven/p/tbx/toolbox-api")
33+
}
34+
35+
jvmWrapper {
36+
unixJvmInstallDir = "jvm"
37+
winJvmInstallDir = "jvm"
38+
linuxAarch64JvmUrl = "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-21.0.5-linux-aarch64-b631.28.tar.gz"
39+
linuxX64JvmUrl = "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-21.0.5-linux-x64-b631.28.tar.gz"
40+
macAarch64JvmUrl = "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-21.0.5-osx-aarch64-b631.28.tar.gz"
41+
macX64JvmUrl = "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-21.0.5-osx-x64-b631.28.tar.gz"
42+
windowsX64JvmUrl = "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-21.0.5-windows-x64-b631.28.tar.gz"
2943
}
3044

3145
dependencies {
@@ -47,16 +61,19 @@ dependencies {
4761
// RD-Core https://mvnrepository.com/artifact/com.jetbrains.rd/rd-core
4862
implementation("com.jetbrains.rd:rd-core:2024.1.1")
4963

50-
implementation(libs.gateway.api)
64+
compileOnly(libs.bundles.toolbox.plugin.api)
65+
// implementation(libs.gateway.api)
5166
implementation(libs.slf4j)
5267
implementation(libs.bundles.serialization)
5368
implementation(libs.coroutines.core)
5469
implementation(libs.okhttp)
5570
}
5671

57-
5872
val pluginId = "io.gitpod.toolbox.gateway"
59-
val pluginVersion = "0.0.1-dev"
73+
val defaultVersion = "0.0.1-local-${LocalDateTime.now().format(DateTimeFormatter.ofPattern("MMddHHmm"))}"
74+
val pluginVersion = providers.gradleProperty("pluginVersion").map { it.ifBlank { defaultVersion } }.getOrElse(defaultVersion)
75+
76+
println("Plugin version: $pluginVersion")
6077

6178
tasks.shadowJar {
6279
archiveBaseName.set(pluginId)
@@ -156,6 +173,7 @@ val copyPlugin by tasks.creating(Sync::class.java) {
156173
include("extension.json")
157174
include("dependencies.json")
158175
include("icon.svg")
176+
include("icon-gray.svg")
159177
}
160178

161179
into(targetDir)
@@ -173,9 +191,10 @@ val pluginZip by tasks.creating(Zip::class) {
173191
}
174192
from("src/main/resources") {
175193
include("icon.svg")
194+
include("icon-gray.svg")
176195
rename("icon.svg", "pluginIcon.svg")
177196
}
178-
archiveBaseName.set("$pluginId-$pluginVersion")
197+
archiveBaseName.set(pluginId)
179198
}
180199

181200
val uploadPlugin by tasks.creating {

‎components/ide/jetbrains/toolbox/build.sh

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
# Copyright (c) 2024 Gitpod GmbH. All rights reserved.
3+
# Licensed under the GNU Affero General Public License (AGPL).
4+
# See License.AGPL.txt in the project root for license information.
5+
6+
set -e
7+
8+
JB_GP_VERSION=${1}
9+
10+
./gradlew -PsupervisorApiProjectPath=components-supervisor-api-java--lib/ -PgitpodPublicApiProjectPath=components-public-api-java--lib/ -PenvironmentName="$JB_QUALIFIER" -Dgradle.user.home="/workspace/.gradle-tb-$JB_QUALIFIER" -Dplugin.verifier.home.dir="$HOME/.cache/pluginVerifier-tb-$JB_QUALIFIER" -PpluginVersion="$JB_GP_VERSION" pluginZip
11+
12+
# # TODO(hw): Improve me
13+
# tarDir="/tmp/tb-build"
14+
# mkdir -p "$tarDir"
15+
# mv ./build/distributions/io.gitpod.toolbox.gateway-0.0.1-dev.zip "$tarDir/io.gitpod.toolbox.gateway-0.0.1-dev.zip"
16+
# echo "GITPOD_PLUGIN_ZIP=$tarDir/io.gitpod.toolbox.gateway-0.0.1-dev.zip" >> /tmp/__gh_output.txt
17+
# # unzip ./build/distributions/io.gitpod.toolbox.gateway-0.0.1-dev.zip -d ./build

‎components/ide/jetbrains/toolbox/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pluginVersion=0.0.1
1+
pluginVersion=
22
environmentName=latest
33
supervisorApiProjectPath=../../../supervisor-api/java
44
gitpodPublicApiProjectPath=../../../public-api/java

‎components/ide/jetbrains/toolbox/gradle/libs.versions.toml

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
[versions]
2-
gateway = "2.6.0.34606"
2+
toolbox-plugin-api = "0.2"
33
kotlin = "2.0.10"
44
coroutines = "1.7.3"
55
serialization = "1.5.0"
66
okhttp = "4.10.0"
77
slf4j = "2.0.3"
88
dependency-license-report = "2.5"
99
marketplace-client = "2.0.38"
10+
gradle-wrapper = "0.14.0"
1011

1112
[libraries]
12-
kotlin-stdlib = { module = "com.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
13-
gateway-api = { module = "com.jetbrains.toolbox.gateway:gateway-api", version.ref = "gateway" }
13+
toolbox-core-api = { module = "com.jetbrains.toolbox:core-api", version.ref = "toolbox-plugin-api" }
14+
toolbox-ui-api = { module = "com.jetbrains.toolbox:ui-api", version.ref = "toolbox-plugin-api" }
15+
toolbox-remote-dev-api = { module = "com.jetbrains.toolbox:remote-dev-api", version.ref = "toolbox-plugin-api" }
1416
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
1517
serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
1618
serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
@@ -21,9 +23,11 @@ slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
2123
marketplace-client = { module = "org.jetbrains.intellij:plugin-repository-rest-client", version.ref = "marketplace-client" }
2224

2325
[bundles]
24-
serialization = [ "serialization-core", "serialization-json", "serialization-json-okio" ]
26+
serialization = [ "serialization-core", "serialization-json" ]
27+
toolbox-plugin-api = [ "toolbox-core-api", "toolbox-ui-api", "toolbox-remote-dev-api" ]
2528

2629
[plugins]
2730
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
2831
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
2932
dependency-license-report = { id = "com.github.jk1.dependency-license-report", version.ref = "dependency-license-report" }
33+
gradle-wrapper = { id = "me.filippov.gradle.jvm.wrapper", version.ref = "gradle-wrapper" }

‎components/ide/jetbrains/toolbox/gradle/wrapper/gradle-wrapper.properties

+1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

‎components/ide/jetbrains/toolbox/settings.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Copyright (c) 2024 Gitpod GmbH. All rights reserved.
2+
// Licensed under the GNU Affero General Public License (AGPL).
3+
// See License.AGPL.txt in the project root for license information.
4+
15
rootProject.name = "gitpod-toolbox-gateway"
26

37
include(":supervisor-api")

‎components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/auth/GitpodAuthManager.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package io.gitpod.toolbox.auth
66

77
import com.connectrpc.Code
88
import com.connectrpc.ConnectException
9-
import com.jetbrains.toolbox.gateway.auth.*
9+
import com.jetbrains.toolbox.api.core.auth.*
1010
import io.gitpod.publicapi.experimental.v1.UserServiceClient
1111
import io.gitpod.toolbox.service.GitpodPublicApiManager
1212
import io.gitpod.toolbox.service.Utils

‎components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/auth/GitpodLoginPage.kt

+12-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44

55
package io.gitpod.toolbox.auth
66

7-
import com.jetbrains.toolbox.gateway.ui.*
7+
import com.jetbrains.toolbox.api.core.ui.icons.SvgIcon
8+
import com.jetbrains.toolbox.api.ui.actions.ActionDescription
9+
import com.jetbrains.toolbox.api.ui.components.LinkField
10+
import com.jetbrains.toolbox.api.ui.components.TextField
11+
import com.jetbrains.toolbox.api.ui.components.UiField
12+
import com.jetbrains.toolbox.api.ui.components.ValidationResult
813
import io.gitpod.toolbox.components.AbstractUiPage
9-
import io.gitpod.toolbox.components.GitpodIconColored
14+
import io.gitpod.toolbox.components.GitpodIcon
1015
import io.gitpod.toolbox.components.SimpleButton
1116
import io.gitpod.toolbox.service.Utils
1217

@@ -25,8 +30,9 @@ class GitpodLoginPage(private val authManager: GitpodAuthManager) : AbstractUiPa
2530
return mutableListOf(hostField, LinkField("Learn more", "https://gitpod.io/docs"))
2631
}
2732

28-
override fun getActionButtons(): MutableList<ActionDescription> {
29-
return mutableListOf(SimpleButton("Login") action@{
33+
34+
override fun getActionButtons(): List<ActionDescription> {
35+
return listOf(SimpleButton("Login") action@{
3036
val host = getFieldValue<String>(hostField) ?: return@action
3137
val url = authManager.getOAuthLoginUrl(host)
3238
Utils.openUrl(url)
@@ -37,7 +43,7 @@ class GitpodLoginPage(private val authManager: GitpodAuthManager) : AbstractUiPa
3743

3844
override fun getDescription() = "Always ready to code."
3945

40-
override fun getSvgIcon(): ByteArray {
41-
return GitpodIconColored()
46+
override fun getSvgIcon(): SvgIcon {
47+
return GitpodIcon()
4248
}
4349
}

‎components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/components/AbstractUiPage.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
package io.gitpod.toolbox.components
66

7-
import com.jetbrains.toolbox.gateway.ui.UiField
8-
import com.jetbrains.toolbox.gateway.ui.UiPage
7+
import com.jetbrains.toolbox.api.ui.components.UiField
8+
import com.jetbrains.toolbox.api.ui.components.UiPage
99

1010
abstract class AbstractUiPage : UiPage {
1111
private var stateAccessor: UiPage.UiFieldStateAccessor? = null

‎components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/components/Button.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package io.gitpod.toolbox.components
66

7-
import com.jetbrains.toolbox.gateway.ui.RunnableActionDescription
7+
import com.jetbrains.toolbox.api.ui.actions.RunnableActionDescription
88

99
open class SimpleButton(private val title: String, private val action: () -> Unit = {}): RunnableActionDescription {
1010
override fun getLabel(): String {

‎components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/components/Icon.kt

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44

55
package io.gitpod.toolbox.components
66

7+
import com.jetbrains.toolbox.api.core.ui.icons.SvgIcon
78
import io.gitpod.toolbox.gateway.GitpodGatewayExtension
89

910
@Suppress("FunctionName")
10-
fun GitpodIcon(): ByteArray {
11-
return GitpodGatewayExtension::class.java.getResourceAsStream("/icon.svg")?.readAllBytes() ?: byteArrayOf()
11+
fun GitpodIconGray(): SvgIcon {
12+
return SvgIcon(GitpodGatewayExtension::class.java.getResourceAsStream("/icon-gray.svg")?.readAllBytes() ?: byteArrayOf())
1213
}
1314

1415
@Suppress("FunctionName")
15-
fun GitpodIconColored(): ByteArray {
16-
return GitpodGatewayExtension::class.java.getResourceAsStream("/icon-colored.svg")?.readAllBytes() ?: byteArrayOf()
16+
fun GitpodIcon(): SvgIcon {
17+
return SvgIcon(GitpodGatewayExtension::class.java.getResourceAsStream("/icon.svg")?.readAllBytes() ?: byteArrayOf())
1718
}
19+

‎components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/gateway/GitpodGatewayExtension.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
package io.gitpod.toolbox.gateway
66

7-
import com.jetbrains.toolbox.gateway.GatewayExtension
8-
import com.jetbrains.toolbox.gateway.RemoteEnvironmentConsumer
9-
import com.jetbrains.toolbox.gateway.RemoteProvider
10-
import com.jetbrains.toolbox.gateway.ToolboxServiceLocator
7+
import com.jetbrains.toolbox.api.core.ServiceLocator
8+
import com.jetbrains.toolbox.api.remoteDev.RemoteDevExtension
9+
import com.jetbrains.toolbox.api.remoteDev.RemoteEnvironmentConsumer
10+
import com.jetbrains.toolbox.api.remoteDev.RemoteProvider
1111
import io.gitpod.toolbox.service.Utils
1212

13-
class GitpodGatewayExtension : GatewayExtension {
14-
override fun createRemoteProviderPluginInstance(serviceLocator: ToolboxServiceLocator): RemoteProvider {
13+
class GitpodGatewayExtension : RemoteDevExtension {
14+
override fun createRemoteProviderPluginInstance(serviceLocator: ServiceLocator): RemoteProvider {
1515
Utils.initialize(serviceLocator)
1616
return GitpodRemoteProvider(serviceLocator.getService(RemoteEnvironmentConsumer::class.java))
1717
}

‎components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/gateway/GitpodRemoteEnvironment.kt

+20-19
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44

55
package io.gitpod.toolbox.gateway
66

7-
import com.jetbrains.toolbox.gateway.AbstractRemoteProviderEnvironment
8-
import com.jetbrains.toolbox.gateway.EnvironmentVisibilityState
9-
import com.jetbrains.toolbox.gateway.environments.EnvironmentContentsView
10-
import com.jetbrains.toolbox.gateway.states.EnvironmentStateConsumer
11-
import com.jetbrains.toolbox.gateway.states.StandardRemoteEnvironmentState
12-
import com.jetbrains.toolbox.gateway.ui.ActionDescription
13-
import com.jetbrains.toolbox.gateway.ui.ObservableList
14-
import com.jetbrains.toolbox.gateway.ui.ObservablePropertiesFactory
7+
import com.jetbrains.toolbox.api.remoteDev.AbstractRemoteProviderEnvironment
8+
import com.jetbrains.toolbox.api.remoteDev.EnvironmentVisibilityState
9+
import com.jetbrains.toolbox.api.remoteDev.environments.EnvironmentContentsView
10+
import com.jetbrains.toolbox.api.remoteDev.states.CustomRemoteEnvironmentState
11+
import com.jetbrains.toolbox.api.remoteDev.states.EnvironmentStateConsumer
12+
import com.jetbrains.toolbox.api.remoteDev.states.EnvironmentStateIcons
13+
import com.jetbrains.toolbox.api.remoteDev.states.StandardRemoteEnvironmentState
14+
import com.jetbrains.toolbox.api.ui.actions.ActionDescription
15+
import com.jetbrains.toolbox.api.ui.observables.ObservableList
16+
import com.jetbrains.toolbox.api.ui.observables.ObservablePropertiesFactory
1517
import io.gitpod.publicapi.experimental.v1.Workspaces.WorkspaceInstanceStatus
1618
import io.gitpod.toolbox.auth.GitpodAuthManager
1719
import io.gitpod.toolbox.service.ConnectParams
@@ -100,17 +102,16 @@ private class WorkspaceEnvState(val phase: WorkspaceInstanceStatus.Phase) {
100102

101103
companion object {
102104
val phaseToStateMap = mapOf(
103-
WorkspaceInstanceStatus.Phase.PHASE_UNSPECIFIED to StandardRemoteEnvironmentState.Unreachable,
104-
WorkspaceInstanceStatus.Phase.PHASE_PREPARING to StandardRemoteEnvironmentState.Initializing,
105-
WorkspaceInstanceStatus.Phase.PHASE_IMAGEBUILD to StandardRemoteEnvironmentState.Initializing,
106-
WorkspaceInstanceStatus.Phase.PHASE_PENDING to StandardRemoteEnvironmentState.Initializing,
107-
WorkspaceInstanceStatus.Phase.PHASE_CREATING to StandardRemoteEnvironmentState.Initializing,
108-
WorkspaceInstanceStatus.Phase.PHASE_INITIALIZING to StandardRemoteEnvironmentState.Initializing,
109-
WorkspaceInstanceStatus.Phase.PHASE_RUNNING to StandardRemoteEnvironmentState.Active,
105+
WorkspaceInstanceStatus.Phase.PHASE_UNSPECIFIED to CustomRemoteEnvironmentState("Unknown", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Inactive), false, EnvironmentStateIcons.Error),
106+
WorkspaceInstanceStatus.Phase.PHASE_PREPARING to CustomRemoteEnvironmentState("Preparing", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Initializing), false, EnvironmentStateIcons.Connecting),
107+
WorkspaceInstanceStatus.Phase.PHASE_IMAGEBUILD to CustomRemoteEnvironmentState("Building", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Initializing), false, EnvironmentStateIcons.Connecting),
108+
WorkspaceInstanceStatus.Phase.PHASE_PENDING to CustomRemoteEnvironmentState("Initializing", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Initializing), false, EnvironmentStateIcons.Connecting),
109+
WorkspaceInstanceStatus.Phase.PHASE_CREATING to CustomRemoteEnvironmentState("Creating", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Initializing), false, EnvironmentStateIcons.Connecting),
110+
WorkspaceInstanceStatus.Phase.PHASE_INITIALIZING to CustomRemoteEnvironmentState("Initializing", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Initializing), false, EnvironmentStateIcons.Connecting),
111+
WorkspaceInstanceStatus.Phase.PHASE_RUNNING to CustomRemoteEnvironmentState("Running", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Active), true, EnvironmentStateIcons.Active),
110112
WorkspaceInstanceStatus.Phase.PHASE_INTERRUPTED to StandardRemoteEnvironmentState.Error,
111-
WorkspaceInstanceStatus.Phase.PHASE_STOPPING to StandardRemoteEnvironmentState.Unreachable,
112-
WorkspaceInstanceStatus.Phase.PHASE_STOPPED to StandardRemoteEnvironmentState.Hibernated,
113+
WorkspaceInstanceStatus.Phase.PHASE_STOPPING to CustomRemoteEnvironmentState("Stopping", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Hibernating), false, EnvironmentStateIcons.Connecting),
114+
WorkspaceInstanceStatus.Phase.PHASE_STOPPED to CustomRemoteEnvironmentState("Stopped", Utils.environmentStateColorPalette.getColor(StandardRemoteEnvironmentState.Hibernated), false, EnvironmentStateIcons.Hibernated),
113115
)
114116
}
115-
// TODO(hw): add customized state
116-
}
117+
}

‎components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/gateway/GitpodRemoteEnvironmentContentsView.kt

+5-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44

55
package io.gitpod.toolbox.gateway
66

7-
import com.jetbrains.toolbox.gateway.environments.CachedIdeStub
8-
import com.jetbrains.toolbox.gateway.environments.CachedProjectStub
9-
import com.jetbrains.toolbox.gateway.environments.ManualEnvironmentContentsView
10-
import com.jetbrains.toolbox.gateway.environments.SshEnvironmentContentsView
11-
import com.jetbrains.toolbox.gateway.ssh.SshConnectionInfo
7+
import com.jetbrains.toolbox.api.remoteDev.environments.CachedIdeStub
8+
import com.jetbrains.toolbox.api.remoteDev.environments.CachedProjectStub
9+
import com.jetbrains.toolbox.api.remoteDev.environments.ManualEnvironmentContentsView
10+
import com.jetbrains.toolbox.api.remoteDev.environments.SshEnvironmentContentsView
11+
import com.jetbrains.toolbox.api.remoteDev.ssh.SshConnectionInfo
1212
import io.gitpod.publicapi.experimental.v1.Workspaces.WorkspaceInstanceStatus
1313
import io.gitpod.toolbox.service.*
14-
import io.gitpod.toolbox.utils.GitpodLogger
1514
import java.util.concurrent.CompletableFuture
1615

1716
class GitpodRemoteEnvironmentContentsView(
@@ -34,7 +33,6 @@ class GitpodRemoteEnvironmentContentsView(
3433
})
3534

3635
private val connectionInfo = CompletableFuture.supplyAsync {
37-
GitpodLogger.info("===============connectionInfo ${connectParams.uniqueID}")
3836
val (connInfo, cancel) = provider.connect()
3937
this.cancel = cancel
4038
connInfo

0 commit comments

Comments
 (0)