Skip to content

Commit 9622ed1

Browse files
committed
Make stable Gateway compatible
1 parent 1221cd9 commit 9622ed1

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

components/ide/jetbrains/gateway-plugin/gradle-stable.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
33
# for insight into build numbers and IntelliJ Platform versions.
44
# revert pluginSinceBuild if it's unnecessary
5-
pluginSinceBuild=242.20224
6-
pluginUntilBuild=242.*
5+
pluginSinceBuild=243.21565
6+
pluginUntilBuild=243.*
77
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
88
# See https://jb.gg/intellij-platform-builds-list for available build versions.
9-
pluginVerifierIdeVersions=2024.2
9+
pluginVerifierIdeVersions=2024.3
1010
# Version from "com.jetbrains.gateway" which can be found at https://www.jetbrains.com/updates/updates.xml or exec `./gradlew printProductsReleases`
11-
platformVersion=2024.2.3
11+
platformVersion=2024.3
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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.stable
5+
package io.gitpod.jetbrains.gateway
66

77
import com.intellij.openapi.components.Service
88
import com.jetbrains.gateway.api.GatewayConnectionHandle
@@ -17,7 +17,7 @@ import java.net.URI
1717
import javax.swing.JComponent
1818

1919
@Suppress("UnstableApiUsage")
20-
class StableGitpodConnectionHandleFactory: GitpodConnectionHandleFactory {
20+
class GitpodConnectionHandleFactoryImpl: GitpodConnectionHandleFactory {
2121
override fun createGitpodConnectionHandle(
2222
lifetime: Lifetime,
2323
component: JComponent,
@@ -30,6 +30,6 @@ class StableGitpodConnectionHandleFactory: GitpodConnectionHandleFactory {
3030
return ClientOverSshTunnelConnector(
3131
lifetime,
3232
connector
33-
).connect(tcpJoinLink)
33+
).connect(tcpJoinLink, null)
3434
}
3535
}

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>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
<applicationConfigurable parentId="tools" instance="io.gitpod.jetbrains.gateway.GitpodSettingsConfigurable"
2727
id="io.gitpod.jetbrains.gateway.GitpodSettingsConfigurable"
2828
displayName="Gitpod"/>
29+
<applicationService serviceInterface="io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory"
30+
serviceImplementation="io.gitpod.jetbrains.gateway.GitpodConnectionHandleFactoryImpl"/>
2931
</extensions>
3032

3133
<extensions defaultExtensionNs="com.jetbrains">

0 commit comments

Comments
 (0)