CM-38753 - Add support for IDEs 2024.2.*; drop support for IDEs 2021.* and 2022.* (#77)

Author: MarshalX

.github/workflows/build.yml

@@ -50,7 +50,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2.9.0
@@ -112,7 +112,7 @@ jobs:
       #        uses: actions/setup-java@v3
       #        with:
       #          distribution: zulu
-      #          java-version: 11
+      #          java-version: 17
       #
       #      - name: Setup Gradle
       #        uses: gradle/gradle-build-action@v2.9.0
@@ -186,7 +186,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2.9.0

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ## [Unreleased]
 
+## [2.0.0] - 2024-08-20
+
+- Add support for IDEs 2024.2
+- Drop support for IDEs 2021 and 2022
+
 ## [1.9.5] - 2024-07-30
 
 - Fix UI tree component loading in new IDE versions
@@ -111,6 +116,8 @@
 
 The first public release of the plugin.
 
+[2.0.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v2.0.0
+
 [1.9.5]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.9.5
 
 [1.9.4]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.9.4
@@ -155,4 +162,4 @@ The first public release of the plugin.
 
 [1.0.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.0.0
 
-[Unreleased]: https://github.com/cycodehq/intellij-platform-plugin/compare/v1.9.5...HEAD
+[Unreleased]: https://github.com/cycodehq/intellij-platform-plugin/compare/v2.0.0...HEAD

build.gradle.kts

@@ -28,14 +28,14 @@ dependencies {
     implementation(libs.flexmark)
 }
 
-// Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
+// Set the JVM language level used to build the project. We are using Java 17 for 2022.2+.
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
         vendor.set(JvmVendorSpec.AZUL)
     }
 }

gradle.properties

@@ -4,17 +4,18 @@ pluginGroup = com.cycode.plugin
 pluginName = Cycode
 pluginRepositoryUrl = https://github.com/cycodehq/intellij-platform-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 1.9.5
+pluginVersion = 2.0.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 211.1
-pluginUntilBuild = 241.*
+pluginSinceBuild = 231
+pluginUntilBuild = 242.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = IC
-# starting from Apple Silicon support + fixes for development on Apple Silicon
-# ref: https://youtrack.jetbrains.com/issue/IDEA-260376
-platformVersion = 2021.1
+# 2021.1 - Apple Silicon support + fixes for development on Apple Silicon
+# 2022.3 - minimum version for IntelliJ Platform Gradle Plugin (2.x)
+# 2023.1 - allows to fix "com.intellij.diagnostic.PluginException: `ActionUpdateThread.OLD_EDT` is deprecated blabla"
+platformVersion = 2023.1
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
 # libraries
-annotations = "24.0.1"
-jackson = "2.15.2"
+annotations = "24.1.0"
+jackson = "2.17.2"
 flexmark = "0.64.8"
 
 # plugins
-dokka = "1.9.10"
-kotlin = "1.9.20"
-changelog = "2.2.0"
-gradleIntelliJPlugin = "1.17.1"
+dokka = "1.9.20"
+kotlin = "2.0.10"
+changelog = "2.2.1"
+gradleIntelliJPlugin = "1.17.4" # the latest before 2.0 with a lot of breaking changes
 kover = "0.7.3"
-sentry = "4.9.0"
+sentry = "4.11.0"
 
 [libraries]
 annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }

src/main/kotlin/com/cycode/plugin/annotators/annotationAppliers/IacApplier.kt

@@ -12,7 +12,7 @@ import com.intellij.psi.PsiFile
 import java.io.File
 
 class IacApplier(private val scanResults: ScanResultsService) : AnnotationApplierBase() {
-    private fun validateIacTextRange(textRange: TextRange, psiFile: PsiFile): Boolean {
+    private fun validateIacTextRange(): Boolean {
         // FIXME(MarshalX): for now, I dont see any way to validate the text range for IaC
         //   small explanation:
         //   - IaC doesn't provide end positions, so we have to calculate them from the line number (get the last character in the line)
@@ -41,7 +41,7 @@ class IacApplier(private val scanResults: ScanResultsService) : AnnotationApplie
             val detectionDetails = detection.detectionDetails
             val textRange = TextRange(startOffset, endOffset)
 
-            if (!validateTextRange(textRange, psiFile) || !validateIacTextRange(textRange, psiFile)) {
+            if (!validateTextRange(textRange, psiFile) || !validateIacTextRange()) {
                 return@forEach
             }
 

src/main/kotlin/com/cycode/plugin/annotators/annotationAppliers/SastApplier.kt

@@ -11,7 +11,7 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiFile
 
 class SastApplier(private val scanResults: ScanResultsService) : AnnotationApplierBase() {
-    private fun validateSastTextRange(textRange: TextRange, psiFile: PsiFile): Boolean {
+    private fun validateSastTextRange(): Boolean {
         // FIXME(MarshalX): for now, I dont see any way to validate the text range for SAST
         //   small explanation:
         //   - SAST doesn't provide end positions, so we have to calculate them from the line number (get the last character in the line)
@@ -40,7 +40,7 @@ class SastApplier(private val scanResults: ScanResultsService) : AnnotationAppli
             val detectionDetails = detection.detectionDetails
             val textRange = TextRange(startOffset, endOffset)
 
-            if (!validateTextRange(textRange, psiFile) || !validateSastTextRange(textRange, psiFile)) {
+            if (!validateTextRange(textRange, psiFile) || !validateSastTextRange()) {
                 return@forEach
             }
 

src/main/kotlin/com/cycode/plugin/annotators/utils.kt

@@ -5,7 +5,7 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiFile
 
 fun convertSeverity(severity: String): HighlightSeverity {
-    return when (severity.toLowerCase()) {
+    return when (severity.lowercase()) {
         "critical" -> HighlightSeverity.ERROR
         "high" -> HighlightSeverity.ERROR
         "medium" -> HighlightSeverity.WARNING

src/main/kotlin/com/cycode/plugin/cli/CliWrapper.kt

@@ -3,6 +3,7 @@ package com.cycode.plugin.cli
 import com.cycode.plugin.cli.models.CliError
 import com.cycode.plugin.services.pluginSettings
 import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
@@ -29,7 +30,7 @@ class CliOSProcessHandler(commandLine: GeneralCommandLine) : OSProcessHandler(co
 class CliWrapper(val executablePath: String, val workDirectory: String? = null) {
     val pluginSettings = pluginSettings()
 
-    var mapper = jacksonObjectMapper()
+    var mapper: ObjectMapper = jacksonObjectMapper()
         .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
         .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
 

src/main/kotlin/com/cycode/plugin/cli/ErrorHandling.kt

@@ -10,7 +10,7 @@ enum class ErrorCode {
 const val MISSING_C_STANDARD_LIBRARY_SEARCH = "GLIBC"
 
 private fun caseInsensitiveSearch(output: String, search: String): Boolean {
-    return output.toLowerCase().contains(search.toLowerCase())
+    return output.lowercase().contains(search.lowercase())
 }
 
 fun detectErrorCode(output: String): ErrorCode {