Skip to content

Commit 79a496c

Browse files
mustard-mhmustard-mh
committed
before migrate
1 parent 77db700 commit 79a496c

File tree

17 files changed

+103
-72
lines changed

17 files changed

+103
-72
lines changed

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

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import com.github.jk1.license.filter.ExcludeTransitiveDependenciesFilter
66
import com.github.jk1.license.render.JsonReportRenderer
7-
import org.jetbrains.intellij.pluginRepository.PluginRepositoryFactory
87
import org.jetbrains.kotlin.com.intellij.openapi.util.SystemInfoRt
8+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
99
import java.nio.file.Path
1010
import kotlin.io.path.div
1111

@@ -15,6 +15,7 @@ plugins {
1515
`java-library`
1616
alias(libs.plugins.dependency.license.report)
1717
id("com.github.johnrengelman.shadow") version "8.1.1"
18+
alias(libs.plugins.gradle.wrapper)
1819
}
1920

2021
buildscript {
@@ -25,7 +26,17 @@ buildscript {
2526

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

3142
dependencies {
@@ -47,7 +58,8 @@ dependencies {
4758
// RD-Core https://mvnrepository.com/artifact/com.jetbrains.rd/rd-core
4859
implementation("com.jetbrains.rd:rd-core:2024.1.1")
4960

50-
implementation(libs.gateway.api)
61+
compileOnly(libs.bundles.toolbox.plugin.api)
62+
// implementation(libs.gateway.api)
5163
implementation(libs.slf4j)
5264
implementation(libs.bundles.serialization)
5365
implementation(libs.coroutines.core)
@@ -95,9 +107,7 @@ licenseReport {
95107
}
96108

97109
tasks.compileKotlin {
98-
kotlinOptions.freeCompilerArgs += listOf(
99-
"-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
100-
)
110+
compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
101111
}
102112

103113
val restartToolbox by tasks.creating {
@@ -180,8 +190,8 @@ val uploadPlugin by tasks.creating {
180190
dependsOn(pluginZip)
181191

182192
doLast {
183-
val token = System.getenv("JB_MARKETPLACE_PUBLISH_TOKEN")
184-
val instance = PluginRepositoryFactory.create("https://plugins.jetbrains.com", token)
193+
// val token = System.getenv("JB_MARKETPLACE_PUBLISH_TOKEN")
194+
// val instance = PluginRepositoryFactory.create("https://plugins.jetbrains.com", token)
185195

186196
// first upload
187197
// instance.uploader.uploadNewPlugin(

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
[versions]
2-
gateway = "2.6.0.34606"
3-
kotlin = "1.9.0"
2+
toolbox-plugin-api = "0.2"
3+
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‎

Lines changed: 1 addition & 0 deletions
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/src/main/kotlin/io/gitpod/toolbox/auth/GitpodAuthManager.kt‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
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
914
import io.gitpod.toolbox.components.GitpodIconColored
1015
import io.gitpod.toolbox.components.SimpleButton
@@ -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 {
46+
override fun getSvgIcon(): SvgIcon {
4147
return GitpodIconColored()
4248
}
4349
}

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

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
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 GitpodIcon(): SvgIcon {
12+
return SvgIcon(GitpodGatewayExtension::class.java.getResourceAsStream("/icon.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 GitpodIconColored(): SvgIcon {
17+
return SvgIcon(GitpodGatewayExtension::class.java.getResourceAsStream("/icon-colored.svg")?.readAllBytes() ?: byteArrayOf())
1718
}

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

Lines changed: 6 additions & 6 deletions
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‎

Lines changed: 8 additions & 8 deletions
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.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.EnvironmentStateConsumer
11+
import com.jetbrains.toolbox.api.remoteDev.states.StandardRemoteEnvironmentState
12+
import com.jetbrains.toolbox.api.ui.actions.ActionDescription
13+
import com.jetbrains.toolbox.api.ui.observables.ObservableList
14+
import com.jetbrains.toolbox.api.ui.observables.ObservablePropertiesFactory
1515
import io.gitpod.publicapi.experimental.v1.Workspaces.WorkspaceInstanceStatus
1616
import io.gitpod.toolbox.auth.GitpodAuthManager
1717
import io.gitpod.toolbox.service.ConnectParams

0 commit comments

Comments
 (0)