diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml index f7414c4..b455e7a 100644 --- a/.config/checkstyle/checkstyle.xml +++ b/.config/checkstyle/checkstyle.xml @@ -81,15 +81,13 @@ - + - - - + @@ -146,6 +144,8 @@ + + diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml index 9dc7a0f..8dde42b 100644 --- a/.config/pmd/java/ruleset.xml +++ b/.config/pmd/java/ruleset.xml @@ -13,6 +13,7 @@ + @@ -45,8 +46,10 @@ + + @@ -138,6 +141,7 @@ + @@ -154,6 +158,7 @@ + @@ -417,7 +422,8 @@ If you are 100% sure that you escaped the value properly and you have no better @@ -440,7 +446,7 @@ A `Set` also prevents duplicates when the ORM reads multiple identical rows from diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 7b1481c..8aeed09 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -13,13 +13,13 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - run: mv .github/.lycheeignore .lycheeignore - name: Link Checker id: lychee - uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2 + uses: lycheeverse/lychee-action@e7477775783ea5526144ba13e8db5eec57747ce8 # v2 with: args: "--verbose --no-progress './**/*.md'" fail: false # Don't fail on broken links, create an issue instead diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index 7db6f78..3057e9c 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -28,7 +28,7 @@ jobs: java: [21] distribution: [temurin] steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Set up JDK uses: actions/setup-java@v5 @@ -37,7 +37,7 @@ jobs: java-version: ${{ matrix.java }} - name: Cache Gradle - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: | ~/.gradle/caches @@ -90,7 +90,7 @@ jobs: java: [21] distribution: [temurin] steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Set up JDK uses: actions/setup-java@v5 @@ -99,7 +99,7 @@ jobs: java-version: ${{ matrix.java }} - name: Cache Gradle - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: | ~/.gradle/caches @@ -120,7 +120,7 @@ jobs: java: [21] distribution: [temurin] steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Set up JDK uses: actions/setup-java@v5 @@ -132,7 +132,7 @@ jobs: run: ./gradlew pmdMain pmdTest -PpmdEnabled --stacktrace -x test - name: Cache Gradle - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: | ~/.gradle/caches diff --git a/.github/workflows/check-ide-compatibility.yml b/.github/workflows/check-ide-compatibility.yml index a398b9b..9321de8 100644 --- a/.github/workflows/check-ide-compatibility.yml +++ b/.github/workflows/check-ide-compatibility.yml @@ -41,7 +41,7 @@ jobs: done sudo df -h - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Set up JDK uses: actions/setup-java@v5 @@ -50,7 +50,7 @@ jobs: java-version: 21 - name: Cache Gradle - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: | ~/.gradle/caches diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e637fb9..9420cc2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Set up JDK uses: actions/setup-java@v5 @@ -22,7 +22,7 @@ jobs: distribution: 'temurin' - name: Try restore Gradle Cache - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 with: path: | ~/.gradle/caches @@ -59,7 +59,7 @@ jobs: outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Configure Git run: | @@ -112,7 +112,7 @@ jobs: needs: [prepare_release] timeout-minutes: 60 steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Set up JDK uses: actions/setup-java@v5 @@ -145,7 +145,7 @@ jobs: needs: [publish] timeout-minutes: 10 steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Init Git and pull run: | diff --git a/.github/workflows/report-gha-workflow-security-problems.yml b/.github/workflows/report-gha-workflow-security-problems.yml index b17aa53..7847028 100644 --- a/.github/workflows/report-gha-workflow-security-problems.yml +++ b/.github/workflows/report-gha-workflow-security-problems.yml @@ -17,7 +17,7 @@ jobs: # Only run this in our repos (Prevent notification spam by forks) if: ${{ github.repository_owner == 'xdev-software' }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Check id: check diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index 6471ce7..dc68d05 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 with: sparse-checkout: .github/labels.yml diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 4909897..b74b8c4 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 60 steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Set up JDK uses: actions/setup-java@v5 diff --git a/.idea/PMDPlugin.xml b/.idea/PMDPlugin.xml deleted file mode 100644 index 0936e51..0000000 --- a/.idea/PMDPlugin.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml index 27f72ce..b8b753e 100644 --- a/.idea/checkstyle-idea.xml +++ b/.idea/checkstyle-idea.xml @@ -1,7 +1,7 @@ - 13.4.0 + latest JavaOnlyWithTests true true diff --git a/.idea/pmd-x.xml b/.idea/pmd-x.xml index 260e454..7b3b48f 100644 --- a/.idea/pmd-x.xml +++ b/.idea/pmd-x.xml @@ -10,6 +10,7 @@ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85832bc..04af27a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,14 +23,14 @@ You should have the following things installed: * Gradle (shipped inside the repo as Gradle Wrapper - also available inside IntelliJ) ### Recommended setup -* Install ``IntelliJ`` (Community Edition is sufficient) - * Install the following plugins: - * [Save Actions](https://plugins.jetbrains.com/plugin/22113) - Provides save actions, like running the formatter or adding ``final`` to fields - * [SonarLint](https://plugins.jetbrains.com/plugin/7973-sonarlint) - CodeStyle/CodeAnalysis - * [Checkstyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) - CodeStyle/CodeAnalysis - * [Plugin DevKit](https://plugins.jetbrains.com/plugin/22851) - IntelliJ Plugin development +* Install `IntelliJ` + * Recommended setup actions + * Disable not needed plugins + * Disable [telemetry](https://www.jetbrains.com/help/idea/settings-usage-statistics.html) + * Configure the available memory * Import the project - * Ensure that everything is encoded in ``UTF-8`` + * You will get prompted to install the required plugins + * Ensure that everything is encoded in `UTF-8` * Ensure that the JDK/Java-Version is correct ## Development environment diff --git a/build.gradle b/build.gradle index 029fd6f..d66125a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,13 +3,13 @@ plugins { id 'idea' id 'checkstyle' id 'pmd' - id 'org.jetbrains.intellij.platform' version '2.13.1' + id 'org.jetbrains.intellij.platform' version '2.18.1' } ext { - checkstyleVersion = '13.4.0' + checkstyleVersion = '13.9.0' - pmdVersion = '7.23.0' + pmdVersion = '7.26.0' } def properties(String key) { @@ -58,7 +58,7 @@ dependencies { checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}" pmd "net.sourceforge.pmd:pmd-ant:${pmdVersion}", "net.sourceforge.pmd:pmd-java:${pmdVersion}" - testImplementation platform('org.junit:junit-bom:6.0.3'), + testImplementation platform('org.junit:junit-bom:6.1.2'), 'org.junit.jupiter:junit-jupiter', 'org.junit.jupiter:junit-jupiter-engine', 'org.assertj:assertj-core:3.27.7' @@ -90,14 +90,9 @@ intellijPlatform { } pluginVerification { ides { - select { - it.types = [IntelliJPlatformType.IntellijIdeaCommunity] - it.sinceBuild = properties("platformSinceBuild") - it.untilBuild = '252.*' - } select { it.types = [IntelliJPlatformType.IntellijIdea] - it.sinceBuild = '253' + it.sinceBuild = properties("platformSinceBuild") } } } diff --git a/gradle.properties b/gradle.properties index 98d4e06..b51b8fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,8 +5,8 @@ pluginName=OpenRewriter X pluginVersion=1.0.4-SNAPSHOT # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType=IU -platformVersion=2025.3.1.1 -platformSinceBuild=243 +platformVersion=2026.2 +platformSinceBuild=253 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformBundledPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 platformBundledPlugins=org.jetbrains.idea.maven,org.jetbrains.plugins.gradle diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c61a118..a351597 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/renovate.json5 b/renovate.json5 index fa392df..5903655 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -12,6 +12,14 @@ ], "matchCurrentVersion": "0", "enabled": false + }, + { + "description": "org.jetbrains.intellij.platform - Changelog", + "packagePattern": "^org.jetbrains.intellij.platform", + "matchDatasources": [ + "maven" + ], + "changelogUrl": "https://github.com/JetBrains/intellij-platform-gradle-plugin/releases" } ] }