Merge branch 'main' into eap

Author: fioan89

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
 
       # Check out current repository
       - name: Fetch Sources
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.3.0
 
       # Validate wrapper
       - name: Gradle Wrapper Validation
@@ -134,7 +134,7 @@ jobs:
 
       # Check out current repository
       - name: Fetch Sources
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.3.0
 
       # Remove old release drafts by using the curl request for the available releases with draft flag
       - name: Remove Old Release Drafts

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
 
       # Check out current repository
       - name: Fetch Sources
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.3.0
         with:
           ref: ${{ github.event.release.tag_name }}
 

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 ## Unreleased
 
+### Fixed
+- support for `Remote Development` in the Jetbrains IDE's
+
 ## 2.1.4-eap.0 - 2022-12-23
 Bug fixes and enhancements included in `2.1.4` release:
 

README.md

@@ -27,7 +27,7 @@ Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=soc
 
 ## Getting Started
 
-![Install this plugin from the JetBrains Marketplace](https://plugins.jetbrains.com/plugin/19620-coder-gateway)
+[Install this plugin from the JetBrains Marketplace](https://plugins.jetbrains.com/plugin/19620-coder/)
 
 ## Manually Building
 
@@ -142,6 +142,8 @@ An artifact file is also built with the plugin attached. Every new Build overrid
 When you edit the draft and use the <kbd>Publish release</kbd> button, GitHub will tag the repository with the given version and add a new entry to the Releases tab.
 Next, it will notify users who are *watching* the repository, triggering the final [Release](.github/workflows/release.yml) workflow.
 
+> **IMPORTANT:**  `pluginVersion` from `gradle.properties` needs to be manually increased after a release.
+
 ### Plugin signing
 
 Plugin Signing is a mechanism introduced in the 2021.2 release cycle to increase security in [JetBrains Marketplace](https://plugins.jetbrains.com).

build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
         exclude("org.slf4j")
     }
 
-    testImplementation(platform("org.apache.groovy:groovy-bom:4.0.6"))
+    testImplementation(platform("org.apache.groovy:groovy-bom:4.0.7"))
     testImplementation("org.apache.groovy:groovy")
     testImplementation(platform("org.spockframework:spock-bom:2.3-groovy-4.0"))
     testImplementation("org.spockframework:spock-core")

gradle.properties

@@ -3,7 +3,7 @@
 pluginGroup=com.coder.gateway
 pluginName=coder-gateway
 # SemVer format -> https://semver.org
-pluginVersion=2.1.4-eap.0
+pluginVersion=2.1.5-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

src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt

@@ -40,6 +40,7 @@ import com.jetbrains.gateway.ssh.IdeWithStatus
 import com.jetbrains.gateway.ssh.IntelliJPlatformProduct
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -146,16 +147,18 @@ class CoderLocateRemoteProjectStepView(private val disableNextAction: () -> Unit
                 }
             } else {
                 logger.info("Resolved OS and Arch for ${selectedWorkspace.name} is: $workspaceOS")
-                val installedIdes = withContext(Dispatchers.IO) {
+                val installedIdesJob = async(Dispatchers.IO) {
                     hostAccessor.getInstalledIDEs().map { ide -> IdeWithStatus(ide.product, ide.buildNumber, IdeStatus.ALREADY_INSTALLED, null, ide.pathToIde, ide.presentableVersion, ide.remoteDevType) }
                 }
-                val idesWithStatus = withContext(Dispatchers.IO) {
+                val idesWithStatusJob = async(Dispatchers.IO) {
                     IntelliJPlatformProduct.values()
                         .filter { it.showInGateway }
                         .flatMap { CachingProductsJsonWrapper.getInstance().getAvailableIdes(it, workspaceOS) }
                         .map { ide -> IdeWithStatus(ide.product, ide.buildNumber, IdeStatus.DOWNLOAD, ide.download, null, ide.presentableVersion, ide.remoteDevType) }
                 }
 
+                val installedIdes = installedIdesJob.await()
+                val idesWithStatus = idesWithStatusJob.await()
                 if (installedIdes.isEmpty()) {
                     logger.info("No IDE is installed in workspace ${selectedWorkspace.name}")
                 } else {

src/main/resources/META-INF/plugin.xml

@@ -9,7 +9,10 @@
     <depends>com.intellij.modules.platform</depends>
 
     <!-- TODO: enable this when https://youtrack.jetbrains.com/issue/GTW-1528/Plugin-depends-on-unknown-plugin-comjetbrainsgateway is fixed-->
-    <!-- depends>com.jetbrains.gateway</depends>-->
+    <!-- <depends>com.jetbrains.gateway</depends>-->
+
+    <!-- we trick Gateway into no longer rasing the unknown module error by marking the dependency optional-->
+    <depends optional="true">com.jetbrains.gateway</depends>
 
     <extensions defaultExtensionNs="com.intellij">
         <applicationService serviceImplementation="com.coder.gateway.sdk.CoderRestClientService"></applicationService>

src/main/resources/version/CoderSupportedVersions.properties

@@ -1,2 +1,2 @@
 minCompatibleCoderVersion=0.12.9
-maxCompatibleCoderVersion=0.13.6
+maxCompatibleCoderVersion=1.0.0