Merge pull request #164 from redhat-developer/feature/support-idea-20…

…24.1.x feat: support idea IJ Version 2024.1.x
redhat-developer · Aug 13, 2024 · c0e71fc · c0e71fc
2 parents 9f91237 + 3de2f9a
commit c0e71fc
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 18 deletions.
diff --git a/.github/workflows/IJ.yml b/.github/workflows/IJ.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        IJ: [IC-2022.1]
+        IJ: [IC-2022.3]
 
     steps:
     - uses: actions/checkout@v2
@@ -51,7 +51,7 @@ jobs:
       - name: Build with Gradle
         run: >
           ./gradlew runPluginVerifier
-          -PideaVersion=IC-2022.1
+          -PideaVersion=IC-2022.3
           -Pgpr.username=${{ github.actor }}
           -Pgpr.token=${{ secrets.GITHUB_TOKEN }}
       - name: Upload report

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,10 +15,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'temurin'
         cache: 'gradle'
     - name: Grant execute permission for gradlew
@@ -34,10 +34,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'temurin'
         cache: 'gradle'
     - name: Grant execute permission for gradlew
@@ -53,10 +53,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'temurin'
         cache: 'gradle'
     - name: Grant execute permission for gradlew

diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,3 @@
-
 plugins {
    id "org.jetbrains.intellij" version "1.15.0"
 }
@@ -40,8 +39,8 @@ intellij {
     version = ideaVersion //for a full list of IntelliJ IDEA releases please see https://www.jetbrains.com/intellij-repository/releases
     pluginName = 'org.jboss.tools.intellij.analytics'
     plugins = ['com.redhat.devtools.intellij.telemetry:1.1.0.52',
-               "org.jetbrains.plugins.go:221.5080.9",
-               "Docker:221.5080.9"]
+               "org.jetbrains.plugins.go:223.7571.182",
+               "Docker:223.7571.175"]
     updateSinceUntilBuild = false
 }
 
@@ -66,6 +65,9 @@ dependencies {
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
     // https://mvnrepository.com/artifact/com.github.package-url/packageurl-java
     implementation group: 'com.github.package-url', name: 'packageurl-java', version: '1.4.1'
+    // https://mvnrepository.com/artifact/commons-io/commons-io
+    implementation group: 'commons-io', name: 'commons-io', version: '2.16.1'
+
 
 
     testImplementation('junit:junit:4.13.1')

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-ideaVersion = 2022.1
+ideaVersion = 2022.3
 projectVersion=1.1.0-SNAPSHOT
 jetBrainsToken=invalid
 jetBrainsChannel=stable
diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/CAService.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/CAService.java
@@ -22,6 +22,7 @@
 import com.redhat.exhort.api.DependencyReport;
 import com.redhat.exhort.api.ProviderReport;
 import com.redhat.exhort.api.Source;
+import org.apache.commons.io.FileUtils;
 import org.jboss.tools.intellij.exhort.ApiService;
 import org.jetbrains.annotations.NotNull;
 
@@ -73,9 +74,10 @@ public static boolean performAnalysis(String packageManager,
                                           PsiFile file) {
         if (dependenciesModified(filePath, dependencies)) {
             Path tempManifest;
+            Path tempDirectory;
             ApiService apiService = ServiceManager.getService(ApiService.class);
             try {
-                Path tempDirectory = Files.createTempDirectory("rhda-idea");
+                tempDirectory = Files.createTempDirectory("rhda-idea");
                 tempManifest = Files.createFile(Path.of(tempDirectory.toString(),fileName));
                 Files.write(tempManifest,PsiDocumentManager.getInstance(file.getProject()).getCachedDocument(file).getText().getBytes());
             } catch (IOException e) {
@@ -84,6 +86,7 @@ public static boolean performAnalysis(String packageManager,
 
 //            AnalysisReport report = apiService.getComponentAnalysis(packageManager, fileName, filePath);
             AnalysisReport report = apiService.getComponentAnalysis(packageManager, fileName, tempManifest.toString());
+            deleteTempDir(tempDirectory);
             if (report == null) {
                 throw new RuntimeException("Failed to perform component analysis, result is invalid.");
             }
@@ -161,6 +164,13 @@ public static boolean performAnalysis(String packageManager,
         return false;
     }
 
+    private static void deleteTempDir(Path tempDirectory)  {
+        try {
+            FileUtils.deleteDirectory(tempDirectory.toFile());
+        } catch (IOException e) {
+            LOG.warn("Failed to delete temp directory: " + tempDirectory, e);
+        }
+    }
 
 
 }
diff --git a/src/main/java/org/jboss/tools/intellij/image/ImageReportAction.java b/src/main/java/org/jboss/tools/intellij/image/ImageReportAction.java
@@ -12,14 +12,16 @@
 package org.jboss.tools.intellij.image;
 
 import com.intellij.docker.dockerFile.DockerFileType;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.actionSystem.*;
 import org.jetbrains.annotations.NotNull;
 
 public class ImageReportAction extends AnAction {
 
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
+
     @Override
     public void actionPerformed(@NotNull AnActionEvent event) {
         var project = event.getProject();

diff --git a/src/main/java/org/jboss/tools/intellij/stackanalysis/SaAction.java b/src/main/java/org/jboss/tools/intellij/stackanalysis/SaAction.java
@@ -15,6 +15,7 @@
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -44,6 +45,11 @@ public SaAction() {
 
     }
 
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
+
     /**
      * <p>Intellij Plugin Action implementation for triggering SA.</p>
      * <p>

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -416,7 +416,7 @@
     </change-notes>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-    <idea-version since-build="211.0"/>
+    <idea-version since-build="223.0"/>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
          on how to target different products -->