Merge pull request #93 from fioan89/add-support-for-idea-2022-3

Add support for idea 2022.3

Author: fioan89

.github/workflows/build.yml

@@ -47,12 +47,12 @@ jobs:
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.0.5
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       # Set environment variables
       - name: Export Properties

.github/workflows/release.yml

@@ -23,12 +23,12 @@ jobs:
         with:
           ref: ${{ github.event.release.tag_name }}
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       # Set environment variables
       - name: Export Properties

CHANGELOG.md

@@ -4,14 +4,22 @@
 
 ## [Unreleased]
 
+### Added
+
+- support for latest OpenSSH private key format
+- support for latest IntelliJ 2022.3
+
 ## [2.0.1]
-### Fixed
-- upload issues when using SFTP from local Windows to remote Linux
-- behavior for SSH keys component, now they properly enable or disable if users want to authenticate with SSH keys
-- plugin icon shown in marketplace
 
-### Changed
-- project's base location label from "Root path" to "Workspace base path". This is a breaking change, users
+### Fixed
+
+- upload issues when using SFTP from local Windows to remote Linux
+- behavior for SSH keys component, now they properly enable or disable if users want to authenticate with SSH keys
+- plugin icon shown in marketplace
+
+### Changed
+
+- project's base location label from "Root path" to "Workspace base path". This is a breaking change, users
   will have to reconfigure the connections again.
 
 ## [2.0.0]

build.gradle.kts

@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.jcraft:jsch:0.1.55")
+    implementation("com.github.mwiede:jsch:0.2.4")
     implementation("commons-net:commons-net:3.9.0")
 
     testImplementation("org.mockito:mockito-core:4.9.0")
@@ -73,6 +73,10 @@ tasks {
         gradleVersion = properties("gradleVersion")
     }
 
+    buildSearchableOptions {
+        isEnabled = false
+    }
+
     patchPluginXml {
         version.set(properties("pluginVersion"))
         sinceBuild.set(properties("pluginSinceBuild"))

gradle.properties

@@ -1,19 +1,19 @@
 pluginGroup=org.wavescale.sourcesync
 pluginName=sourcesync
 # SemVer format -> https://semver.org
-pluginVersion=2.0.1
+pluginVersion=2.0.2
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild=211
-pluginUntilBuild=222.*
+pluginSinceBuild=223
+pluginUntilBuild=
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType=IC
-platformVersion=2022.1
+platformVersion=2022.3
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins=
 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion=11
+javaVersion=17
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion=7.4
 # Opt-out flag for bundling Kotlin standard library.

src/main/kotlin/org/wavescale/sourcesync/synchronizer/SFTPFileSynchronizer.kt

@@ -40,7 +40,8 @@ import java.nio.file.Paths
  * metadata like name, absoulte path, etc...
  * @param indicator      used to report progress on upload process.
  */
-class SFTPFileSynchronizer(connectionInfo: SFTPConfiguration, project: Project, indicator: ProgressIndicator) : FileSynchronizer(connectionInfo, project, indicator) {
+class SFTPFileSynchronizer(connectionInfo: SFTPConfiguration, project: Project, indicator: ProgressIndicator) :
+    FileSynchronizer(connectionInfo, project, indicator) {
     private val jsch: JSch = JSch()
     private lateinit var session: Session
 
@@ -65,15 +66,20 @@ class SFTPFileSynchronizer(connectionInfo: SFTPConfiguration, project: Project,
     @Throws(JSchException::class)
     private fun initSession() {
         val configuration = connectionInfo as SFTPConfiguration
-        session = jsch.getSession(connectionInfo.userName, connectionInfo.host,
-                connectionInfo.port)
+        session = jsch.getSession(
+            connectionInfo.userName, connectionInfo.host,
+            connectionInfo.port
+        )
         session.setConfig("StrictHostKeyChecking", "no")
         if (configuration.isPasswordlessSSHSelected) {
             session.setConfig("PreferredAuthentications", "publickey")
             try {
                 Utils.createFile(SSH_KNOWN_HOSTS)
             } catch (e: IOException) {
-                EventDataLogger.logError("Could not identify nor create the ssh known hosts file at " + SSH_KNOWN_HOSTS + ". The returned error is:" + e.message, project)
+                EventDataLogger.logError(
+                    "Could not identify nor create the ssh known hosts file at " + SSH_KNOWN_HOSTS + ". The returned error is:" + e.message,
+                    project
+                )
             }
             jsch.setKnownHosts(SSH_KNOWN_HOSTS)
             // add private key and passphrase if exists
@@ -88,10 +94,8 @@ class SFTPFileSynchronizer(connectionInfo: SFTPConfiguration, project: Project,
     }
 
     override fun disconnect() {
-        if (session != null) {
-            session.disconnect()
-            isConnected = false
-        }
+        session.disconnect()
+        isConnected = false
     }
 
     override fun syncFile(sourcePath: String, uploadLocation: Path) {
@@ -106,14 +110,20 @@ class SFTPFileSynchronizer(connectionInfo: SFTPConfiguration, project: Project,
         }
 
         if (!channelSftp.absoluteDirExists(connectionInfo.workspaceBasePath)) {
-            EventDataLogger.logError("Remote project base path ${connectionInfo.workspaceBasePath} does not exist or is not a directory. Please make sure the value is a valid absolute directory path", project)
+            EventDataLogger.logError(
+                "Remote project base path ${connectionInfo.workspaceBasePath} does not exist or is not a directory. Please make sure the value is a valid absolute directory path",
+                project
+            )
             return
         }
 
         channelSftp.cd(connectionInfo.workspaceBasePath)
 
         if (!channelSftp.localDirExistsOnRemote(uploadLocation.toString())) {
-            EventDataLogger.logInfo("Upload path $uploadLocation does not exist or is not a directory. Going to create it.", project)
+            EventDataLogger.logInfo(
+                "Upload path $uploadLocation does not exist or is not a directory. Going to create it.",
+                project
+            )
             val exists = channelSftp.mkLocalDirsOnRemote(uploadLocation.toString())
             if (!exists) {
                 EventDataLogger.logError("Upload path $uploadLocation could not be created.", project)