Skip to content

Commit 236e0b4

Browse files
committed
Support Idea 2024.1+ versions only
1 parent 21bffc3 commit 236e0b4

File tree

6 files changed

+23
-16
lines changed

6 files changed

+23
-16
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# PMDPlugin Changelog
44

55
## [Unreleased]
6+
### Added
7+
- Support Intellij 2024 versions (only)
8+
69
## [1.8.28]
710
### Added
811
- Support for running PMD task in background

build.gradle.kts

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ val pmdVersion = "6.55.0"
88
plugins {
99
id("java")
1010
id("org.jetbrains.kotlin.jvm") version "1.6.20"
11-
id("org.jetbrains.intellij") version "1.13.3"
11+
id("org.jetbrains.intellij") version "1.17.3"
1212
id("org.jetbrains.changelog") version "1.1.2"
1313
}
1414

@@ -29,8 +29,8 @@ dependencies {
2929
implementation("net.sourceforge.pmd:pmd-xml:${pmdVersion}")
3030
}
3131
java {
32-
sourceCompatibility = JavaVersion.VERSION_11
33-
targetCompatibility = JavaVersion.VERSION_11
32+
sourceCompatibility = JavaVersion.VERSION_17
33+
targetCompatibility = JavaVersion.VERSION_17
3434
}
3535

3636
// Configure gradle-intellij-plugin plugin.
@@ -54,13 +54,13 @@ changelog {
5454
}
5555

5656
tasks {
57-
// Set the compatibility versions to 11
57+
val javaVersion = "17"
5858
withType<JavaCompile> {
59-
sourceCompatibility = "11"
60-
targetCompatibility = "11"
59+
sourceCompatibility = javaVersion
60+
targetCompatibility = javaVersion
6161
}
6262
withType<KotlinCompile> {
63-
kotlinOptions.jvmTarget = "11"
63+
kotlinOptions.jvmTarget = javaVersion
6464
}
6565

6666
patchPluginXml {

gradle.properties

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33

44
# pluginGroup = com.intellij.plugins.bodhi.pmd
55
pluginName = PMDPlugin
6-
pluginVersion = 1.8.28
6+
pluginVersion = 1.9.0
77

88
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
99
# for insight into build numbers and IntelliJ Platform versions.
10-
pluginSinceBuild = 222.4
11-
pluginUntilBuild = 240
10+
pluginSinceBuild = 241
11+
pluginUntilBuild = 241.*
1212

1313
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
1414
# See https://jb.gg/intellij-platform-builds-list for available build versions.
15-
pluginVerifierIdeVersions = 2022.2.4, 2022.3.1, 2023.1
15+
pluginVerifierIdeVersions = 2024.1
1616

1717
platformType = IC
18-
platformVersion = 2022.2.4
18+
platformVersion = 2024.1
1919
platformDownloadSources = true
2020

2121
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/java/com/intellij/plugins/bodhi/pmd/actions/PMDMenuGroup.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
import com.intellij.openapi.fileEditor.FileEditorManager;
55
import com.intellij.openapi.project.Project;
66
import com.intellij.openapi.vfs.VirtualFile;
7+
import org.jetbrains.annotations.NotNull;
78

89
/**
910
* The main menu group for the PMD Plugin. This will contain the Predefined
10-
* as well as custome rules menu.
11+
* as well as custom rules menu.
1112
*
1213
* @author bodhi
1314
* @version 1.0
@@ -33,4 +34,8 @@ public void update(AnActionEvent e) {
3334
}
3435
}
3536

37+
@Override
38+
public @NotNull ActionUpdateThread getActionUpdateThread() {
39+
return ActionUpdateThread.EDT;
40+
}
3641
}

src/main/java/com/intellij/plugins/bodhi/pmd/handlers/PMDCheckinHandler.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.intellij.plugins.bodhi.pmd.tree.*;
1919
import com.intellij.util.PairConsumer;
2020
import com.intellij.util.ui.UIUtil;
21-
import org.apache.commons.lang.StringUtils;
2221
import org.apache.commons.logging.Log;
2322
import org.apache.commons.logging.LogFactory;
2423
import org.jetbrains.annotations.NonNls;
@@ -178,6 +177,6 @@ private void showToolWindow(List<PMDRuleSetNode> ruleSetResultNodes, Project pro
178177
if (toolWindow != null) {
179178
toolWindow.activate(null);
180179
}
181-
plugin.setLastRunActionAndRules(null, StringUtils.join(plugin.getCustomRuleSetPaths(), PMDInvoker.RULE_DELIMITER), true);
180+
plugin.setLastRunActionAndRules(null, String.join(PMDInvoker.RULE_DELIMITER, plugin.getCustomRuleSetPaths()), true);
182181
}
183182
}

0 commit comments

Comments
 (0)