Merge branch 'main' into eap

fioan89 · fioan89 · commit c4b0be090aa5 · 2023-02-16T15:06:29.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -105,7 +105,7 @@ jobs:
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2022.3.2
+        uses: JetBrains/qodana-action@v2022.3.3
 
       # Prepare plugin archive content for creating artifact
       - name: Prepare Plugin Artifact
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ## Unreleased
 
+### Fixed
+- terminal link is now correct when host ends in `/`
+
 ## 2.1.6-eap.0 - 2023-02-02
 
 ### Fixed
diff --git a/LICENSE b/LICENSE
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     // Groovy support
     id("groovy")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.7.22"
+    id("org.jetbrains.kotlin.jvm") version "1.8.10"
     // Gradle IntelliJ Plugin
     id("org.jetbrains.intellij") version "1.10.1"
     // Gradle Changelog Plugin
@@ -33,7 +33,7 @@ dependencies {
         exclude("org.slf4j")
     }
 
-    testImplementation(platform("org.apache.groovy:groovy-bom:4.0.8"))
+    testImplementation(platform("org.apache.groovy:groovy-bom:4.0.9"))
     testImplementation("org.apache.groovy:groovy")
     testImplementation(platform("org.spockframework:spock-bom:2.3-groovy-4.0"))
     testImplementation("org.spockframework:spock-core")
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 pluginGroup=com.coder.gateway
 pluginName=coder-gateway
 # SemVer format -> https://semver.org
-pluginVersion=2.1.6-eap.0
+pluginVersion=2.1.7-eap.0
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild=223.7571.70
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
@@ -7,6 +7,7 @@ import com.coder.gateway.models.WorkspaceAgentModel
 import com.coder.gateway.sdk.Arch
 import com.coder.gateway.sdk.CoderRestClientService
 import com.coder.gateway.sdk.OS
+import com.coder.gateway.sdk.withPath
 import com.coder.gateway.toWorkspaceParams
 import com.coder.gateway.views.LazyBrowserLink
 import com.coder.gateway.withProjectPath
@@ -134,7 +135,7 @@ class CoderLocateRemoteProjectStepView(private val disableNextAction: () -> Unit
 
         tfProject.text = if (selectedWorkspace.homeDirectory.isNullOrBlank()) "/home" else selectedWorkspace.homeDirectory
         titleLabel.text = CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.choose.text", selectedWorkspace.name)
-        terminalLink.url = "${coderClient.coderURL}/@${coderClient.me.username}/${selectedWorkspace.name}/terminal"
+        terminalLink.url = coderClient.coderURL.withPath("/@${coderClient.me.username}/${selectedWorkspace.name}/terminal").toString()
 
         ideResolvingJob = cs.launch {
             try {
