chore: upgrade intellij plugin to remediate compatibility issues (#444)

* chore: update IntelliJ compatibility and Icons

chore: icons updated

chore: update workflows

chore: fix async test

chore: fix tests (wip)

chore: fix tests (wip)

chore: fix tests (wip)

chore: update icons

chore: wip

chore: upgrade & make the new config compilable

* chore: make linter happy

* fix: workflows

* fix: blocking kubernetes file scan

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fetch Sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1
@@ -25,12 +25,13 @@ jobs:
 
     steps:
       - name: Fetch Sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - name: Setup Java
-        uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
+        name: Setup Java
         with:
-          java-version: 1.8
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
 
       - name: Setup Gradle Cache
         uses: actions/cache@v2
@@ -76,10 +77,11 @@ jobs:
 
       # PluginVerifier has been compiled by a more recent version of the Java - Java 11.
       # That's why, we are using not version 8 here, but 11.
-      - name: Setup Java
-        uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
+        name: Setup Java
         with:
-          java-version: 11
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
 
       - name: Setup Gradle Cache
         uses: actions/cache@v2

.github/workflows/detekt.yml

@@ -9,12 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fetch Sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - name: Setup Java
-        uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
+        name: Setup Java
         with:
-          java-version: 1.8
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
 
       - name: Setup Gradle Cache
         uses: actions/cache@v2

.github/workflows/release.yml

@@ -21,14 +21,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fetch Sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Setup Java
-        uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
+        name: Setup Java
         with:
-          java-version: 1.8
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
 
       - name: Setup Gradle Cache
         uses: actions/cache@v2
@@ -44,7 +45,7 @@ jobs:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
           SNYK_ORG_NAME: ${{ secrets.SNYK_ORG_NAME }}
         run: |
-          ./gradlew test integTest verifyPlugin clean
+          ./gradlew test verifyPlugin clean
           git clean -d --force
           git reset --hard
 

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Snyk Changelog
 
+## [2.5.0]
+
+### Changed
+
+- Fix compatibility issues; only support Jetbrains 2023.x for plugin versions > 2.5.0
+
 ## [2.4.63]
 
 ### Fixed

build.gradle.kts

@@ -1,17 +1,18 @@
 import io.gitlab.arturbosch.detekt.Detekt
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 // reads properties from gradle.properties file
 fun properties(key: String) = project.findProperty(key).toString()
 
 plugins {
-    id("org.jetbrains.changelog") version "1.2.1"
-    id("org.jetbrains.intellij") version "1.1.2"
-    id("org.jetbrains.kotlin.jvm") version "1.8.0"
-    id("io.gitlab.arturbosch.detekt") version ("1.21.0")
+    id("org.jetbrains.changelog") version "2.1.2"
+    id("org.jetbrains.intellij") version "1.15.0"
+    id("org.jetbrains.kotlin.jvm") version "1.9.0"
+    id("io.gitlab.arturbosch.detekt") version ("1.23.1")
     id("pl.allegro.tech.build.axion-release") version "1.13.6"
 }
 
@@ -20,34 +21,43 @@ version = scmVersion.version
 group = properties("pluginGroup")
 description = properties("pluginName")
 
-val jdk = "1.8"
+val jdk = "17"
 
 repositories {
     mavenCentral()
     mavenLocal()
 }
 
 dependencies {
-    implementation("org.commonmark:commonmark:0.19.0")
-    implementation("com.google.code.gson:gson:2.9.0")
-    implementation("com.segment.analytics.java:analytics:3.3.1")
-    implementation("io.sentry:sentry:6.4.2")
+    implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
+    implementation("org.commonmark:commonmark:0.21.0")
+    implementation("com.google.code.gson:gson:2.10.1")
+    implementation("com.segment.analytics.java:analytics:3.4.0")
+    implementation("io.sentry:sentry:6.27.0")
+    implementation("javax.xml.bind:jaxb-api:2.3.1") // necessary because since JDK 9 not included
+    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation("com.squareup.okhttp3:okhttp")
+    implementation("com.squareup.okhttp3:logging-interceptor")
     implementation("ly.iterative.itly:plugin-iteratively:1.2.11")
     implementation("ly.iterative.itly:plugin-schema-validator:1.2.11") {
         exclude(group = "org.slf4j")
     }
-    implementation("ly.iterative.itly:sdk-jvm:1.2.11")
-    testImplementation("com.google.jimfs:jimfs:1.2")
-    testImplementation("com.squareup.okhttp3:mockwebserver:4.10.0")
+    implementation("ly.iterative.itly:sdk-jvm:1.2.11") {
+        exclude(group = "org.slf4j")
+    }
+    implementation("com.segment.analytics.java:analytics:3.4.0")
+
+    testImplementation("com.google.jimfs:jimfs:1.3.0")
+    testImplementation("com.squareup.okhttp3:mockwebserver")
+
     testImplementation("junit:junit:4.13.2") {
         exclude(group = "org.hamcrest")
     }
     testImplementation("org.hamcrest:hamcrest:2.2")
-    testImplementation("io.mockk:mockk:1.12.2") // updating this breaks tests
+    testImplementation("io.mockk:mockk:1.13.5")
     testImplementation("org.awaitility:awaitility:4.2.0")
-    runtimeOnly("org.jetbrains.kotlin:kotlin-reflect:1.4.32")
 
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.21.0")
+    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.1")
 }
 
 // configuration for gradle-intellij-plugin plugin.
@@ -64,15 +74,15 @@ intellij {
 // configure for detekt plugin.
 // read more: https://detekt.github.io/detekt/kotlindsl.html
 detekt {
-    config = files("$projectDir/.github/detekt/detekt-config.yml")
+    config.setFrom("$projectDir/.github/detekt/detekt-config.yml")
     baseline = file("$projectDir/.github/detekt/detekt-baseline.xml")
     buildUponDefaultConfig = true
 }
 
 tasks {
     withType<KotlinCompile> {
         kotlinOptions.jvmTarget = jdk
-        kotlinOptions.languageVersion = "1.3"
+        kotlinOptions.languageVersion = "1.9"
     }
 
     withType<JavaCompile> {
@@ -136,7 +146,7 @@ tasks {
             }.joinToString("\n").run { markdownToHTML(this) }
         )
 
-        changeNotes.set(provider { changelog.getLatest().toHTML() })
+        changeNotes.set(provider { changelog.renderItem(changelog.getLatest(), Changelog.OutputType.HTML) })
     }
 
     publishPlugin {
@@ -160,27 +170,5 @@ tasks {
                 org.jetbrains.intellij.tasks.RunPluginVerifierTask.FailureLevel.INVALID_PLUGIN
             )
         )
-        verificationReportsDir.set("$rootDir.path/reports/pluginVerifier")
     }
 }
-
-sourceSets {
-    create("integTest") {
-        compileClasspath += sourceSets.main.get().output
-        runtimeClasspath += sourceSets.main.get().output
-    }
-}
-val integTestImplementation: Configuration by configurations.getting {
-    extendsFrom(configurations.implementation.get(), configurations.testImplementation.get())
-}
-configurations["integTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.get())
-
-val integTest = task<Test>("integTest") {
-    description = "Runs the integration tests."
-    group = "verification"
-
-    testClassesDirs = sourceSets["integTest"].output.classesDirs
-    classpath = sourceSets["integTest"].runtimeClasspath
-    shouldRunAfter("test")
-}
-tasks.check { dependsOn(integTest) }

gradle.properties

@@ -3,22 +3,18 @@ pluginName=Snyk Security - Code, Open Source, Container, IaC Configurations
 
 # for insight into build numbers and IntelliJ Platform versions
 # see https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild=202
+pluginSinceBuild=231
 pluginUntilBuild=232.*
-
-platformVersion=2020.2
+platformVersion=2023.1
 platformDownloadSources=true
 
 # plugin dependencies (comma-separated)
 # example: platformPlugins = com.intellij.java, org.jetbrains.plugins.yaml
 # see https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
-platformPlugins=org.intellij.plugins.hcl:0.7.10,org.jetbrains.plugins.yaml,org.jetbrains.kotlin,com.intellij.java,org.intellij.groovy
-
+platformPlugins=org.intellij.plugins.hcl:231.8109.91,org.jetbrains.plugins.yaml,org.jetbrains.kotlin,com.intellij.java,org.intellij.groovy
 # list of versions for which to check the plugin for api compatibility
-pluginVerifierIdeVersions=2020.3.1,2021.1.1,2021.3,2022.1
-
+pluginVerifierIdeVersions=2023.1,2023.2
 localIdeDirectory=
-
 # opt-out flag for bundling Kotlin standard library
 # see https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
 kotlin.stdlib.default.dependency=false

gradle/wrapper/gradle-wrapper.properties

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