Migrate to 2.6.0.35616

Author: mustard-mh

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

@@ -7,9 +7,9 @@ import com.github.jk1.license.render.JsonReportRenderer
 import org.jetbrains.kotlin.com.intellij.openapi.util.SystemInfoRt
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.nio.file.Path
-import kotlin.io.path.div
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
+import kotlin.io.path.div
 
 
 plugins {
@@ -18,6 +18,7 @@ plugins {
     `java-library`
     alias(libs.plugins.dependency.license.report)
     id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.gradle.wrapper)
 }
 
 buildscript {
@@ -28,7 +29,17 @@ buildscript {
 
 repositories {
     mavenCentral()
-    maven("https://packages.jetbrains.team/maven/p/tbx/gateway")
+    maven("https://packages.jetbrains.team/maven/p/tbx/toolbox-api")
+}
+
+jvmWrapper {
+    unixJvmInstallDir = "jvm"
+    winJvmInstallDir = "jvm"
+    linuxAarch64JvmUrl = "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-21.0.5-linux-aarch64-b631.28.tar.gz"
+    linuxX64JvmUrl = "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-21.0.5-linux-x64-b631.28.tar.gz"
+    macAarch64JvmUrl = "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-21.0.5-osx-aarch64-b631.28.tar.gz"
+    macX64JvmUrl = "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-21.0.5-osx-x64-b631.28.tar.gz"
+    windowsX64JvmUrl = "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-21.0.5-windows-x64-b631.28.tar.gz"
 }
 
 dependencies {
@@ -50,7 +61,8 @@ dependencies {
     // RD-Core https://mvnrepository.com/artifact/com.jetbrains.rd/rd-core
     implementation("com.jetbrains.rd:rd-core:2024.1.1")
 
-    implementation(libs.gateway.api)
+    compileOnly(libs.bundles.toolbox.plugin.api)
+//    implementation(libs.gateway.api)
     implementation(libs.slf4j)
     implementation(libs.bundles.serialization)
     implementation(libs.coroutines.core)
@@ -61,6 +73,8 @@ val pluginId = "io.gitpod.toolbox.gateway"
 val defaultVersion = "0.0.1-local-${LocalDateTime.now().format(DateTimeFormatter.ofPattern("MMddHHmm"))}"
 val pluginVersion = providers.gradleProperty("pluginVersion").map { it.ifBlank { defaultVersion } }.getOrElse(defaultVersion)
 
+println("Plugin version: $pluginVersion")
+
 tasks.shadowJar {
     archiveBaseName.set(pluginId)
     archiveVersion.set(pluginVersion)
@@ -159,7 +173,7 @@ val copyPlugin by tasks.creating(Sync::class.java) {
         include("extension.json")
         include("dependencies.json")
         include("icon.svg")
-        include("icon-colored.svg")
+        include("icon-gray.svg")
     }
 
     into(targetDir)
@@ -177,7 +191,7 @@ val pluginZip by tasks.creating(Zip::class) {
     }
     from("src/main/resources") {
         include("icon.svg")
-        include("icon-colored.svg")
+        include("icon-gray.svg")
         rename("icon.svg", "pluginIcon.svg")
     }
     archiveBaseName.set(pluginId)

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

@@ -1,16 +1,18 @@
 [versions]
-gateway = "2.6.0.34606"
+toolbox-plugin-api = "0.2"
 kotlin = "2.0.10"
 coroutines = "1.7.3"
 serialization = "1.5.0"
 okhttp = "4.10.0"
 slf4j = "2.0.3"
 dependency-license-report = "2.5"
 marketplace-client = "2.0.38"
+gradle-wrapper = "0.14.0"
 
 [libraries]
-kotlin-stdlib = { module = "com.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
-gateway-api = { module = "com.jetbrains.toolbox.gateway:gateway-api", version.ref = "gateway" }
+toolbox-core-api = { module = "com.jetbrains.toolbox:core-api", version.ref = "toolbox-plugin-api" }
+toolbox-ui-api = { module = "com.jetbrains.toolbox:ui-api", version.ref = "toolbox-plugin-api" }
+toolbox-remote-dev-api = { module = "com.jetbrains.toolbox:remote-dev-api", version.ref = "toolbox-plugin-api" }
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
 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" }
 marketplace-client = { module = "org.jetbrains.intellij:plugin-repository-rest-client", version.ref = "marketplace-client" }
 
 [bundles]
-serialization = [ "serialization-core", "serialization-json", "serialization-json-okio" ]
+serialization = [ "serialization-core", "serialization-json" ]
+toolbox-plugin-api = [ "toolbox-core-api", "toolbox-ui-api", "toolbox-remote-dev-api" ]
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 dependency-license-report = { id = "com.github.jk1.dependency-license-report", version.ref = "dependency-license-report" }
+gradle-wrapper = { id = "me.filippov.gradle.jvm.wrapper", version.ref = "gradle-wrapper" }

components/ide/jetbrains/toolbox/gradle/wrapper/gradle-wrapper.properties

@@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/auth/GitpodAuthManager.kt

@@ -6,7 +6,7 @@ package io.gitpod.toolbox.auth
 
 import com.connectrpc.Code
 import com.connectrpc.ConnectException
-import com.jetbrains.toolbox.gateway.auth.*
+import com.jetbrains.toolbox.api.core.auth.*
 import io.gitpod.publicapi.experimental.v1.UserServiceClient
 import io.gitpod.toolbox.service.GitpodPublicApiManager
 import io.gitpod.toolbox.service.Utils

components/ide/jetbrains/toolbox/src/main/kotlin/io/gitpod/toolbox/auth/GitpodLoginPage.kt

@@ -4,9 +4,14 @@
 
 package io.gitpod.toolbox.auth
 
-import com.jetbrains.toolbox.gateway.ui.*
+import com.jetbrains.toolbox.api.core.ui.icons.SvgIcon
+import com.jetbrains.toolbox.api.ui.actions.ActionDescription
+import com.jetbrains.toolbox.api.ui.components.LinkField
+import com.jetbrains.toolbox.api.ui.components.TextField
+import com.jetbrains.toolbox.api.ui.components.UiField
+import com.jetbrains.toolbox.api.ui.components.ValidationResult
 import io.gitpod.toolbox.components.AbstractUiPage
-import io.gitpod.toolbox.components.GitpodIconColored
+import io.gitpod.toolbox.components.GitpodIcon
 import io.gitpod.toolbox.components.SimpleButton
 import io.gitpod.toolbox.service.Utils
 
@@ -25,8 +30,9 @@ class GitpodLoginPage(private val authManager: GitpodAuthManager) : AbstractUiPa
         return mutableListOf(hostField, LinkField("Learn more", "https://gitpod.io/docs"))
     }
 
-    override fun getActionButtons(): MutableList<ActionDescription> {
-        return mutableListOf(SimpleButton("Login") action@{
+
+    override fun getActionButtons(): List<ActionDescription> {
+        return listOf(SimpleButton("Login") action@{
             val host = getFieldValue<String>(hostField) ?: return@action
             val url = authManager.getOAuthLoginUrl(host)
             Utils.openUrl(url)
@@ -37,7 +43,7 @@ class GitpodLoginPage(private val authManager: GitpodAuthManager) : AbstractUiPa
 
     override fun getDescription() = "Always ready to code."
 
-    override fun getSvgIcon(): ByteArray {
-        return GitpodIconColored()
+    override fun getSvgIcon(): SvgIcon {
+        return GitpodIcon()
     }
 }

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

@@ -4,8 +4,8 @@
 
 package io.gitpod.toolbox.components
 
-import com.jetbrains.toolbox.gateway.ui.UiField
-import com.jetbrains.toolbox.gateway.ui.UiPage
+import com.jetbrains.toolbox.api.ui.components.UiField
+import com.jetbrains.toolbox.api.ui.components.UiPage
 
 abstract class AbstractUiPage : UiPage {
     private var stateAccessor: UiPage.UiFieldStateAccessor? = null

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

@@ -4,7 +4,7 @@
 
 package io.gitpod.toolbox.components
 
-import com.jetbrains.toolbox.gateway.ui.RunnableActionDescription
+import com.jetbrains.toolbox.api.ui.actions.RunnableActionDescription
 
 open class SimpleButton(private val title: String, private val action: () -> Unit = {}): RunnableActionDescription {
     override fun getLabel(): String {

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

@@ -4,14 +4,16 @@
 
 package io.gitpod.toolbox.components
 
+import com.jetbrains.toolbox.api.core.ui.icons.SvgIcon
 import io.gitpod.toolbox.gateway.GitpodGatewayExtension
 
 @Suppress("FunctionName")
-fun GitpodIcon(): ByteArray {
-    return GitpodGatewayExtension::class.java.getResourceAsStream("/icon.svg")?.readAllBytes() ?: byteArrayOf()
+fun GitpodIconGray(): SvgIcon {
+    return SvgIcon(GitpodGatewayExtension::class.java.getResourceAsStream("/icon-gray.svg")?.readAllBytes() ?: byteArrayOf())
 }
 
 @Suppress("FunctionName")
-fun GitpodIconColored(): ByteArray {
-    return GitpodGatewayExtension::class.java.getResourceAsStream("/icon-colored.svg")?.readAllBytes() ?: byteArrayOf()
+fun GitpodIcon(): SvgIcon {
+    return SvgIcon(GitpodGatewayExtension::class.java.getResourceAsStream("/icon.svg")?.readAllBytes() ?: byteArrayOf())
 }
+

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

@@ -4,14 +4,14 @@
 
 package io.gitpod.toolbox.gateway
 
-import com.jetbrains.toolbox.gateway.GatewayExtension
-import com.jetbrains.toolbox.gateway.RemoteEnvironmentConsumer
-import com.jetbrains.toolbox.gateway.RemoteProvider
-import com.jetbrains.toolbox.gateway.ToolboxServiceLocator
+import com.jetbrains.toolbox.api.core.ServiceLocator
+import com.jetbrains.toolbox.api.remoteDev.RemoteDevExtension
+import com.jetbrains.toolbox.api.remoteDev.RemoteEnvironmentConsumer
+import com.jetbrains.toolbox.api.remoteDev.RemoteProvider
 import io.gitpod.toolbox.service.Utils
 
-class GitpodGatewayExtension : GatewayExtension {
-    override fun createRemoteProviderPluginInstance(serviceLocator: ToolboxServiceLocator): RemoteProvider {
+class GitpodGatewayExtension : RemoteDevExtension {
+    override fun createRemoteProviderPluginInstance(serviceLocator: ServiceLocator): RemoteProvider {
         Utils.initialize(serviceLocator)
         return GitpodRemoteProvider(serviceLocator.getService(RemoteEnvironmentConsumer::class.java))
     }

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

@@ -4,14 +4,14 @@
 
 package io.gitpod.toolbox.gateway
 
-import com.jetbrains.toolbox.gateway.AbstractRemoteProviderEnvironment
-import com.jetbrains.toolbox.gateway.EnvironmentVisibilityState
-import com.jetbrains.toolbox.gateway.environments.EnvironmentContentsView
-import com.jetbrains.toolbox.gateway.states.EnvironmentStateConsumer
-import com.jetbrains.toolbox.gateway.states.StandardRemoteEnvironmentState
-import com.jetbrains.toolbox.gateway.ui.ActionDescription
-import com.jetbrains.toolbox.gateway.ui.ObservableList
-import com.jetbrains.toolbox.gateway.ui.ObservablePropertiesFactory
+import com.jetbrains.toolbox.api.remoteDev.AbstractRemoteProviderEnvironment
+import com.jetbrains.toolbox.api.remoteDev.EnvironmentVisibilityState
+import com.jetbrains.toolbox.api.remoteDev.environments.EnvironmentContentsView
+import com.jetbrains.toolbox.api.remoteDev.states.EnvironmentStateConsumer
+import com.jetbrains.toolbox.api.remoteDev.states.StandardRemoteEnvironmentState
+import com.jetbrains.toolbox.api.ui.actions.ActionDescription
+import com.jetbrains.toolbox.api.ui.observables.ObservableList
+import com.jetbrains.toolbox.api.ui.observables.ObservablePropertiesFactory
 import io.gitpod.publicapi.experimental.v1.Workspaces.WorkspaceInstanceStatus
 import io.gitpod.toolbox.auth.GitpodAuthManager
 import io.gitpod.toolbox.service.ConnectParams