Skip to content

[JetBrains] Update Platform Version from JetBrains Gateway Plugin (Stable) #18368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2023
Merged

[JetBrains] Update Platform Version from JetBrains Gateway Plugin (Stable) #18368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions components/ide/jetbrains/gateway-plugin/gradle-stable.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=231.9161
pluginUntilBuild=231.*
pluginSinceBuild=232.8660
pluginUntilBuild=232.*
# 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.1
pluginVerifierIdeVersions=2023.2
# Version from "com.jetbrains.gateway" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
platformVersion=231.9161-EAP-CANDIDATE-SNAPSHOT
platformVersion=232.8660-EAP-CANDIDATE-SNAPSHOT
11 changes: 6 additions & 5 deletions .../gateway/latest/GitpodConnectionHandle.kt → ...tbrains/gateway/GitpodConnectionHandle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
// 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.latest
package io.gitpod.jetbrains.gateway

import com.intellij.openapi.components.Service
import com.jetbrains.gateway.api.CustomConnectionFrameComponentProvider
import com.jetbrains.gateway.api.CustomConnectionFrameContext
import com.jetbrains.gateway.api.GatewayConnectionHandle
Expand All @@ -12,7 +13,6 @@ 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

Expand All @@ -35,16 +35,17 @@ class GitpodConnectionHandle(
}
}
@Suppress("UnstableApiUsage")
class LatestGitpodConnectionHandleFactory : GitpodConnectionHandleFactory {
override fun createGitpodConnectionHandle(
@Service
class GitpodConnectionHandleFactory {
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 {
suspend fun connect(lifetime: Lifetime, connector: HostTunnelConnector, tcpJoinLink: URI): ThinClientHandle {
return ClientOverSshTunnelConnector(
lifetime,
connector
Expand Down
1 change: 0 additions & 1 deletion ...ns/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ 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 kotlinx.coroutines.future.await
Expand Down
25 changes: 0 additions & 25 deletions ...lugin/src/main/kotlin/io/gitpod/jetbrains/gateway/common/GitpodConnectionHandleFactory.kt
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions ...teway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/stable/GitpodConnectionHandle.kt
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions components/ide/jetbrains/gateway-plugin/src/main/resources-latest/META-INF/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
-->
<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>
Expand Down
2 changes: 0 additions & 2 deletions components/ide/jetbrains/gateway-plugin/src/main/resources-stable/META-INF/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
-->
<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>
Expand Down