Make base version 2023.2 and validate all other available IntelliJ ve…

…rsions
camel-tooling · Nov 30, 2024 · 83d6fef · 83d6fef
1 parent 3fcc3da
commit 83d6fef
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 41 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -40,28 +40,31 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        version: [2023.2.8, 2023.3.8, 2024.1.7, 2024.2.5, 2024.3]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
           cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Validate Gradle wrapper
-        uses: gradle/[email protected]
-      - name: Build against all supported versions
-        run: ./build.sh ${{ matrix.version }}
+        uses: gradle/actions/wrapper-validation@v3
+      - name: Clean project
+        run: ./gradlew --no-daemon --no-parallel clean build
+      - name: Verify plugin against all supported versions
+        run: ./gradlew --no-daemon verifyPlugin
         shell: bash
       - uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: ${{ matrix.os }}-${{ matrix.version }}-Reports
+          name: ${{ matrix.os }}-Reports
           path: camel-idea-plugin/build/reports
       - uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: ${{ matrix.os }}-${{ matrix.version }}-Logs
+          name: ${{ matrix.os }}-Logs
           path: camel-idea-plugin/build/idea-sandbox/system-test/testlog/idea.log
diff --git a/build-all.sh b/build-all.sh
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.models.ProductRelease
 
 plugins {
     id 'org.jetbrains.intellij.platform' version '2.1.0'
@@ -119,7 +121,12 @@ dependencies {
 intellijPlatform {
     pluginVerification {
         ides {
-            recommended()
+            select {
+                it.types = [IntelliJPlatformType.IntellijIdeaCommunity]
+                it.channels = [ProductRelease.Channel.RELEASE]
+                it.sinceBuild = '232'
+                it.untilBuild = '998.*'
+            }
         }
     }
     patchPluginXml {

diff --git a/build.sh b/build.sh
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ camelVersion = 4.8.1
 camelQuarkusVersion = 3.15.0
 camelKameletVersion = 4.8.0
 camelKarafVersion = 3.22.2
-ideaVersion = 2024.3
+ideaVersion = 2023.2
 mavenResolverVersion = 1.9.22
 
 org.jetbrains.intellij.platform.downloadSources = true
diff --git a/...n/java/com/github/cameltooling/idea/runner/debugger/ui/CamelDebuggerEvaluationDialog.java b/...n/java/com/github/cameltooling/idea/runner/debugger/ui/CamelDebuggerEvaluationDialog.java
@@ -48,7 +48,6 @@
 import com.intellij.xdebugger.impl.actions.XDebuggerActions;
 import com.intellij.xdebugger.impl.breakpoints.XExpressionImpl;
 import com.intellij.xdebugger.impl.evaluate.CodeFragmentInputComponent;
-import com.intellij.xdebugger.impl.evaluate.DebuggerEvaluationStatisticsCollector;
 import com.intellij.xdebugger.impl.evaluate.EvaluationInputComponent;
 import com.intellij.xdebugger.impl.settings.XDebuggerSettingManagerImpl;
 import com.intellij.xdebugger.impl.ui.XDebugSessionTab;
@@ -106,15 +105,6 @@ public CamelDebuggerEvaluationDialog(@NotNull XDebugSession session,
         this(session, null, session.getProject(), editorsProvider, text, sourcePosition, isCodeFragmentEvaluationSupported);
     }
 
-    public CamelDebuggerEvaluationDialog(@NotNull XDebuggerEvaluator evaluator,
-                                         @NotNull Project project,
-                                         @NotNull XDebuggerEditorsProvider editorsProvider,
-                                         @NotNull XExpression text,
-                                         @Nullable XSourcePosition sourcePosition,
-                                         boolean isCodeFragmentEvaluationSupported) {
-        this(null, () -> evaluator, project, editorsProvider, text, sourcePosition, isCodeFragmentEvaluationSupported);
-    }
-
     private CamelDebuggerEvaluationDialog(@Nullable XDebugSession session,
                                           @Nullable Supplier<? extends XDebuggerEvaluator> evaluatorSupplier,
                                           @NotNull Project project,
@@ -182,7 +172,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         }
         setTitle(XDebuggerBundle.message("xdebugger.evaluate.dialog.title"));
         switchToMode(mode, text);
-        DebuggerEvaluationStatisticsCollector.DIALOG_OPEN.log(project, mode);
+        // internal feature usage tracker
+        //DebuggerEvaluationStatisticsCollector.DIALOG_OPEN.log(project, mode);
         if (mode == EvaluationMode.EXPRESSION) {
             myInputComponent.getInputEditor().selectAll();
         }
@@ -227,7 +218,8 @@ private void updateSourcePosition() {
 
     @Override
     protected void doOKAction() {
-        DebuggerEvaluationStatisticsCollector.EVALUATE.log(myProject, myMode);
+        // internal feature usage tracker
+        //DebuggerEvaluationStatisticsCollector.EVALUATE.log(myProject, myMode);
         FeatureUsageTracker.getInstance().triggerFeatureUsed("debugger.evaluate.expression");
         evaluate();
     }
@@ -442,7 +434,8 @@ public void actionPerformed(ActionEvent e) {
             EvaluationMode newMode = (myMode == EvaluationMode.EXPRESSION) ? EvaluationMode.CODE_FRAGMENT : EvaluationMode.EXPRESSION;
             // remember only on user selection
             XDebuggerSettingManagerImpl.getInstanceImpl().getGeneralSettings().setEvaluationDialogMode(newMode);
-            DebuggerEvaluationStatisticsCollector.MODE_SWITCH.log(myProject, newMode);
+            // internal feature usage tracker
+            //DebuggerEvaluationStatisticsCollector.MODE_SWITCH.log(myProject, newMode);
             switchToMode(newMode, text);
         }
     }

diff --git a/src/main/java/com/github/cameltooling/idea/runner/debugger/ui/CamelSetValueDialog.java b/src/main/java/com/github/cameltooling/idea/runner/debugger/ui/CamelSetValueDialog.java
@@ -115,7 +115,8 @@ private CamelSetValueDialog(@Nullable XDebugSession session,
         }
         setTitle("Set Value");
         switchToMode(mode, text);
-        DebuggerEvaluationStatisticsCollector.DIALOG_OPEN.log(project, mode);
+        // internal feature usage tracker
+        //DebuggerEvaluationStatisticsCollector.DIALOG_OPEN.log(project, mode);
         if (mode == EvaluationMode.EXPRESSION) {
             myInputComponent.getInputEditor().selectAll();
         }
@@ -302,7 +303,8 @@ public void actionPerformed(ActionEvent e) {
             EvaluationMode newMode = (myMode == EvaluationMode.EXPRESSION) ? EvaluationMode.CODE_FRAGMENT : EvaluationMode.EXPRESSION;
             // remember only on user selection
             XDebuggerSettingManagerImpl.getInstanceImpl().getGeneralSettings().setEvaluationDialogMode(newMode);
-            DebuggerEvaluationStatisticsCollector.MODE_SWITCH.log(myProject, newMode);
+            // internal feature usage tracker
+            //DebuggerEvaluationStatisticsCollector.MODE_SWITCH.log(myProject, newMode);
             switchToMode(newMode, text);
         }
     }