Skip to content

Commit fb7784f

Browse files
authored
Update Platform Version of JetBrains Gateway Plugin (Stable) to 232.8660-EAP-CANDIDATE-SNAPSHOT (#18368)
1 parent 0b5a71a commit fb7784f

File tree

7 files changed

+10
-94
lines changed

7 files changed

+10
-94
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
22
# for insight into build numbers and IntelliJ Platform versions.
3-
pluginSinceBuild=231.9161
4-
pluginUntilBuild=231.*
3+
pluginSinceBuild=232.8660
4+
pluginUntilBuild=232.*
55
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
66
# See https://jb.gg/intellij-platform-builds-list for available build versions.
7-
pluginVerifierIdeVersions=2023.1
7+
pluginVerifierIdeVersions=2023.2
88
# Version from "com.jetbrains.gateway" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
9-
platformVersion=231.9161-EAP-CANDIDATE-SNAPSHOT
9+
platformVersion=232.8660-EAP-CANDIDATE-SNAPSHOT
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
// Licensed under the GNU Affero General Public License (AGPL).
33
// See License.AGPL.txt in the project root for license information.
44

5-
package io.gitpod.jetbrains.gateway.latest
5+
package io.gitpod.jetbrains.gateway
66

7+
import com.intellij.openapi.components.Service
78
import com.jetbrains.gateway.api.CustomConnectionFrameComponentProvider
89
import com.jetbrains.gateway.api.CustomConnectionFrameContext
910
import com.jetbrains.gateway.api.GatewayConnectionHandle
@@ -12,7 +13,6 @@ import com.jetbrains.gateway.ssh.HostTunnelConnector
1213
import com.jetbrains.gateway.thinClientLink.ThinClientHandle
1314
import com.jetbrains.rd.util.lifetime.Lifetime
1415
import io.gitpod.jetbrains.gateway.GitpodConnectionProvider.ConnectParams
15-
import io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory
1616
import java.net.URI
1717
import javax.swing.JComponent
1818

@@ -35,16 +35,17 @@ class GitpodConnectionHandle(
3535
}
3636
}
3737
@Suppress("UnstableApiUsage")
38-
class LatestGitpodConnectionHandleFactory : GitpodConnectionHandleFactory {
39-
override fun createGitpodConnectionHandle(
38+
@Service
39+
class GitpodConnectionHandleFactory {
40+
fun createGitpodConnectionHandle(
4041
lifetime: Lifetime,
4142
component: JComponent,
4243
params: ConnectParams
4344
): GatewayConnectionHandle {
4445
return GitpodConnectionHandle(lifetime, component, params)
4546
}
4647

47-
override suspend fun connect(lifetime: Lifetime, connector: HostTunnelConnector, tcpJoinLink: URI): ThinClientHandle {
48+
suspend fun connect(lifetime: Lifetime, connector: HostTunnelConnector, tcpJoinLink: URI): ThinClientHandle {
4849
return ClientOverSshTunnelConnector(
4950
lifetime,
5051
connector

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import com.jetbrains.rd.util.URI
3737
import com.jetbrains.rd.util.lifetime.Lifetime
3838
import com.jetbrains.rd.util.lifetime.LifetimeDefinition
3939
import io.gitpod.gitpodprotocol.api.entities.WorkspaceInstance
40-
import io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory
4140
import io.gitpod.jetbrains.icons.GitpodIcons
4241
import kotlinx.coroutines.*
4342
import kotlinx.coroutines.future.await

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 55 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
-->
66
<idea-plugin>
77
<extensions defaultExtensionNs="com.intellij">
8-
<applicationService serviceInterface="io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory"
9-
serviceImplementation="io.gitpod.jetbrains.gateway.latest.LatestGitpodConnectionHandleFactory"/>
108
</extensions>
119
<extensions defaultExtensionNs="com.jetbrains">
1210
</extensions>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
-->
66
<idea-plugin>
77
<extensions defaultExtensionNs="com.intellij">
8-
<applicationService serviceInterface="io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory"
9-
serviceImplementation="io.gitpod.jetbrains.gateway.stable.StableGitpodConnectionHandleFactory"/>
108
</extensions>
119
<extensions defaultExtensionNs="com.jetbrains">
1210
</extensions>

0 commit comments

Comments
 (0)