Revert "Update Platform Version of JetBrains Gateway Plugin (Stable) to 232.8660-EAP-CANDIDATE-SNAPSHOT (#18368)"

This reverts commit fb7784f.

Author: akosyakov

components/ide/jetbrains/gateway-plugin/gradle-stable.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=232.8660
-pluginUntilBuild=232.*
+pluginSinceBuild=231.9161
+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=2023.2
+pluginVerifierIdeVersions=2023.1
 # Version from "com.jetbrains.gateway" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
-platformVersion=232.8660-EAP-CANDIDATE-SNAPSHOT
+platformVersion=231.9161-EAP-CANDIDATE-SNAPSHOT

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionProvider.kt

@@ -43,6 +43,7 @@ import com.jetbrains.rd.util.URI
 import com.jetbrains.rd.util.lifetime.Lifetime
 import com.jetbrains.rd.util.lifetime.LifetimeDefinition
 import io.gitpod.gitpodprotocol.api.entities.WorkspaceInstance
+import io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory
 import io.gitpod.jetbrains.icons.GitpodIcons
 import kotlinx.coroutines.*
 import java.net.URL

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/common/GitpodConnectionHandleFactory.kt

@@ -0,0 +1,25 @@
+// Copyright (c) 2023 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.gateway.common
+
+import com.jetbrains.gateway.api.GatewayConnectionHandle
+import com.jetbrains.rd.util.lifetime.Lifetime
+import io.gitpod.jetbrains.gateway.GitpodConnectionProvider
+import javax.swing.JComponent
+
+@Suppress("UnstableApiUsage")
+interface GitpodConnectionHandleFactory {
+    fun createGitpodConnectionHandle(
+            lifetime: Lifetime,
+            component: JComponent,
+            params: GitpodConnectionProvider.ConnectParams
+    ): GatewayConnectionHandle
+
+    suspend fun connect(
+        lifetime: Lifetime,
+        connector: com.jetbrains.gateway.ssh.HostTunnelConnector,
+        tcpJoinLink: java.net.URI
+    ): com.jetbrains.gateway.thinClientLink.ThinClientHandle
+}

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionHandle.kt renamed to components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/latest/GitpodConnectionHandle.kt

@@ -2,9 +2,8 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License.AGPL.txt in the project root for license information.
 
-package io.gitpod.jetbrains.gateway
+package io.gitpod.jetbrains.gateway.latest
 
-import com.intellij.openapi.components.Service
 import com.jetbrains.gateway.api.CustomConnectionFrameComponentProvider
 import com.jetbrains.gateway.api.CustomConnectionFrameContext
 import com.jetbrains.gateway.api.GatewayConnectionHandle
@@ -13,6 +12,7 @@ import com.jetbrains.gateway.ssh.HostTunnelConnector
 import com.jetbrains.gateway.thinClientLink.ThinClientHandle
 import com.jetbrains.rd.util.lifetime.Lifetime
 import io.gitpod.jetbrains.gateway.GitpodConnectionProvider.ConnectParams
+import io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory
 import java.net.URI
 import javax.swing.JComponent
 
@@ -35,17 +35,16 @@ class GitpodConnectionHandle(
     }
 }
 @Suppress("UnstableApiUsage")
-@Service
-class GitpodConnectionHandleFactory {
-    fun createGitpodConnectionHandle(
+class LatestGitpodConnectionHandleFactory : GitpodConnectionHandleFactory {
+    override fun createGitpodConnectionHandle(
             lifetime: Lifetime,
             component: JComponent,
             params: ConnectParams
     ): GatewayConnectionHandle {
         return GitpodConnectionHandle(lifetime, component, params)
     }
 
-    suspend fun connect(lifetime: Lifetime, connector: HostTunnelConnector, tcpJoinLink: URI): ThinClientHandle {
+    override suspend fun connect(lifetime: Lifetime, connector: HostTunnelConnector, tcpJoinLink: URI): ThinClientHandle {
         return ClientOverSshTunnelConnector(
             lifetime,
             connector

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/stable/GitpodConnectionHandle.kt

@@ -0,0 +1,55 @@
+// Copyright (c) 2023 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.gateway.stable
+
+import com.jetbrains.gateway.api.CustomConnectionFrameComponentProvider
+import com.jetbrains.gateway.api.CustomConnectionFrameContext
+import com.jetbrains.gateway.api.GatewayConnectionHandle
+import com.jetbrains.gateway.ssh.ClientOverSshTunnelConnector
+import com.jetbrains.gateway.ssh.HostTunnelConnector
+import com.jetbrains.gateway.thinClientLink.ThinClientHandle
+import com.jetbrains.rd.util.lifetime.Lifetime
+import io.gitpod.jetbrains.gateway.GitpodConnectionProvider.ConnectParams
+import io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory
+import java.net.URI
+import javax.swing.JComponent
+
+class GitpodConnectionHandle(
+        lifetime: Lifetime,
+        private val component: JComponent,
+        private val params: ConnectParams
+) : GatewayConnectionHandle(lifetime) {
+    override fun customComponentProvider() = object : CustomConnectionFrameComponentProvider {
+        override val closeConfirmationText = "Disconnect from ${getTitle()}?"
+        override fun createComponent(context: CustomConnectionFrameContext) = component
+    }
+
+    override fun getTitle(): String {
+        return params.title
+    }
+
+    override fun hideToTrayOnStart(): Boolean {
+        return false
+    }
+}
+
+@Suppress("UnstableApiUsage")
+class StableGitpodConnectionHandleFactory : GitpodConnectionHandleFactory {
+    override fun createGitpodConnectionHandle(
+            lifetime: Lifetime,
+            component: JComponent,
+            params: ConnectParams
+    ): GatewayConnectionHandle {
+        return GitpodConnectionHandle(lifetime, component, params)
+    }
+
+    override suspend fun connect(lifetime: Lifetime, connector: HostTunnelConnector, tcpJoinLink: URI): ThinClientHandle {
+        return ClientOverSshTunnelConnector(
+            lifetime,
+            connector,
+            tcpJoinLink
+        ).connect()
+    }
+}

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

@@ -5,6 +5,8 @@
 -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
+        <applicationService serviceInterface="io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory"
+                            serviceImplementation="io.gitpod.jetbrains.gateway.latest.LatestGitpodConnectionHandleFactory"/>
     </extensions>
     <extensions defaultExtensionNs="com.jetbrains">
     </extensions>

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

@@ -5,6 +5,8 @@
 -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
+        <applicationService serviceInterface="io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory"
+                            serviceImplementation="io.gitpod.jetbrains.gateway.stable.StableGitpodConnectionHandleFactory"/>
     </extensions>
     <extensions defaultExtensionNs="com.jetbrains">
     </extensions>