diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml index b455e7a..6e193ba 100644 --- a/.config/checkstyle/checkstyle.xml +++ b/.config/checkstyle/checkstyle.xml @@ -65,6 +65,7 @@ + @@ -144,6 +145,7 @@ + diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml index 8dde42b..4c72bf2 100644 --- a/.config/pmd/java/ruleset.xml +++ b/.config/pmd/java/ruleset.xml @@ -169,7 +169,7 @@ - + diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index 1b30a97..f63ba1d 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -93,7 +93,7 @@ jobs: - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -109,7 +109,7 @@ jobs: ${{ runner.os }}-gradle-checkstyle- - name: Run Checkstyle - run: ./gradlew checkstyleMain checkstyleTest -PcheckstyleEnabled --stacktrace + run: ./gradlew checkstyleMain checkstyleTest -PcheckstyleEnabled --stacktrace -x compileJava -x compileTestJava -x classes -x testClasses pmd: runs-on: ubuntu-latest @@ -123,7 +123,7 @@ jobs: - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} diff --git a/.github/workflows/check-ide-compatibility.yml b/.github/workflows/check-ide-compatibility.yml index be952a9..455d578 100644 --- a/.github/workflows/check-ide-compatibility.yml +++ b/.github/workflows/check-ide-compatibility.yml @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: 25 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c785dbf..1e0c678 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: java-version: '25' distribution: 'temurin' @@ -115,7 +115,7 @@ jobs: - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: 25 diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index a69f9f9..62d2b64 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: 25 diff --git a/build.gradle b/build.gradle index d6c5208..fefe6b3 100644 --- a/build.gradle +++ b/build.gradle @@ -7,9 +7,9 @@ plugins { } ext { - checkstyleVersion = '13.11.0' + checkstyleVersion = '14.1.0' - pmdVersion = '7.26.0' + pmdVersion = '7.27.0' } def properties(String key) { @@ -48,12 +48,18 @@ import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType // Add dependencies to test, junit5 api (annotations) and engine (runtime) dependencies { - intellijPlatform { - create(properties("platformType"), properties("platformVersion")) - bundledPlugins(properties("platformBundledPlugins").map { it.split(",").collect { it.trim() }.findAll { !it.empty } }) - plugins(properties("platformPlugins").map { it.split(",").collect { it.trim() }.findAll { !it.empty } }) - pluginVerifier() - zipSigner() + // Downloading 3GB of IntelliJ is not needed for CheckStyle + if (!project.hasProperty("checkstyleEnabled")) { + intellijPlatform { + create(properties("platformType"), properties("platformVersion")) { + // PMD 7.27: This will otherwise crash because PMD assumes all files are ZIP files + useInstaller = !project.hasProperty("pmdEnabled") + } + bundledPlugins(properties("platformBundledPlugins").map { it.split(",").collect { it.trim() }.findAll { !it.empty } }) + plugins(properties("platformPlugins").map { it.split(",").collect { it.trim() }.findAll { !it.empty } }) + pluginVerifier() + zipSigner() + } } checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}" pmd "net.sourceforge.pmd:pmd-ant:${pmdVersion}", diff --git a/gradle.properties b/gradle.properties index 19652d9..d2aab16 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ pluginName= pluginVersion= # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType=IU -platformVersion=2026.2.0.1 +platformVersion=2026.2.1 platformSinceBuild=261 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformBundledPlugins = com.intellij.java, com.jetbrains.php:203.4449.22