From 408f707f7fdfedecd128fdfccc13d9470be28864 Mon Sep 17 00:00:00 2001 From: Vladimir Orany Date: Mon, 31 Jul 2023 08:47:04 +0200 Subject: [PATCH 1/3] support for IJ 2023.2 --- .github/workflows/beta_release.yml | 2 +- .github/workflows/gradle.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/beta_release.yml b/.github/workflows/beta_release.yml index 8f77689..819f872 100644 --- a/.github/workflows/beta_release.yml +++ b/.github/workflows/beta_release.yml @@ -21,4 +21,4 @@ jobs: distribution: zulu - uses: gradle/gradle-build-action@v2 with: - arguments: publishPlugin -PpublishPluginChannels=beta -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2023.1 -PpluginVersion=6.1.0-${{ env.SNAPSHOT_SUFFIX }} + arguments: publishPlugin -PpublishPluginChannels=beta -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2023.2 -PpluginVersion=6.2.0-${{ env.SNAPSHOT_SUFFIX }} diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index af1d7ac..2f19a5e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: matrix: version: - "-PideVersion=IC-2022.3" - - "-PideVersion=IC-2023.1" + - "-PideVersion=IC-2023.2" steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea69426..8056777 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,4 +21,4 @@ jobs: distribution: zulu - uses: gradle/gradle-build-action@v2 with: - arguments: publishPlugin -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2023.1 -PpluginVersion=${{ steps.version.outputs.tag }} + arguments: publishPlugin -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2023.2 -PpluginVersion=${{ steps.version.outputs.tag }} From 19bd2bfb05ddefe8f3a985ce5d676050074dc95f Mon Sep 17 00:00:00 2001 From: musketyr Date: Mon, 31 Jul 2023 08:59:34 +0200 Subject: [PATCH 2/3] upgraded Gradle plugin, attempt to fix compilation issue --- build.gradle | 2 +- .../AbstractClassWithoutAbstractMethodInspectionTool.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8d6c026..aba759a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.intellij' version '1.13.3' + id 'org.jetbrains.intellij' version '1.15.0' id 'java' id 'idea' id 'groovy' diff --git a/src/main/java/org/codenarc/idea/inspections/design/AbstractClassWithoutAbstractMethodInspectionTool.java b/src/main/java/org/codenarc/idea/inspections/design/AbstractClassWithoutAbstractMethodInspectionTool.java index 1419c13..ec1c994 100644 --- a/src/main/java/org/codenarc/idea/inspections/design/AbstractClassWithoutAbstractMethodInspectionTool.java +++ b/src/main/java/org/codenarc/idea/inspections/design/AbstractClassWithoutAbstractMethodInspectionTool.java @@ -70,7 +70,7 @@ public boolean isEnhancedMode() { if (theClass == null) { return Collections.singletonList(new GrRemoveModifierFix(PsiModifier.ABSTRACT)); } - return Arrays.asList( + return Arrays.asList( new GrModifierFix(theClass, PsiModifier.ABSTRACT, true, false, GrModifierFix.MODIFIER_LIST_CHILD), new AddDefaultConstructorFix(theClass, PsiModifier.PROTECTED) ); From 71755126a42afe938abb7ce9a8a8e071e07f75f2 Mon Sep 17 00:00:00 2001 From: musketyr Date: Mon, 31 Jul 2023 09:15:32 +0200 Subject: [PATCH 3/3] removed fix offending in a newer versions of IJ --- build.gradle | 2 +- .../AbstractClassWithoutAbstractMethodInspectionTool.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index aba759a..7bdd812 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { if (!project.hasProperty('publishPluginChannels')) ext.publishPluginChannels = '' if (!project.hasProperty('publishPluginToken')) ext.publishPluginToken = '**UNDEFINED**' -if (!project.hasProperty('ideVersion')) ext.ideVersion = 'IC-2022.3' +if (!project.hasProperty('ideVersion')) ext.ideVersion = 'IC-2023.2' wrapper { gradleVersion = '8.0.2' diff --git a/src/main/java/org/codenarc/idea/inspections/design/AbstractClassWithoutAbstractMethodInspectionTool.java b/src/main/java/org/codenarc/idea/inspections/design/AbstractClassWithoutAbstractMethodInspectionTool.java index ec1c994..8454a02 100644 --- a/src/main/java/org/codenarc/idea/inspections/design/AbstractClassWithoutAbstractMethodInspectionTool.java +++ b/src/main/java/org/codenarc/idea/inspections/design/AbstractClassWithoutAbstractMethodInspectionTool.java @@ -1,13 +1,11 @@ package org.codenarc.idea.inspections.design; -import com.intellij.codeInsight.daemon.impl.quickfix.AddDefaultConstructorFix; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiModifier; import com.intellij.util.containers.JBIterable; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import javax.annotation.Generated; @@ -70,9 +68,8 @@ public boolean isEnhancedMode() { if (theClass == null) { return Collections.singletonList(new GrRemoveModifierFix(PsiModifier.ABSTRACT)); } - return Arrays.asList( - new GrModifierFix(theClass, PsiModifier.ABSTRACT, true, false, GrModifierFix.MODIFIER_LIST_CHILD), - new AddDefaultConstructorFix(theClass, PsiModifier.PROTECTED) + return Collections.singleton( + new GrModifierFix(theClass, PsiModifier.ABSTRACT, true, false, GrModifierFix.MODIFIER_LIST_CHILD) ); }