Merge remote-tracking branch 'origin/update-from-template' into develop

Author: AB-xdev

.github/workflows/check-build.yml

@@ -25,7 +25,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [17, 21]
+        java: [21]
         distribution: [temurin]
 
     steps:
@@ -79,7 +79,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [17]
+        java: [21]
         distribution: [temurin]
 
     steps:
@@ -101,7 +101,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [17]
+        java: [21]
         distribution: [temurin]
 
     steps:

.github/workflows/checkIDECompatibility.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: 'gradle'
 
@@ -106,7 +106,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
         cache: 'gradle'
 
     - name: Init Git and pull

.github/workflows/release.yml

@@ -49,7 +49,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Cache SonarCloud packages
         uses: actions/cache@v4

.github/workflows/sonar.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
 
       - name: Update/Generify version

.github/workflows/test-deploy.yml

@@ -5,7 +5,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
+      <option name="scriptParameters" value="-PskipPMD" />
       <option name="taskDescriptions">
         <list />
       </option>
@@ -19,6 +19,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
-</component>
+</component>

.run/Run Tests.run.xml

@@ -11,7 +11,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="runPluginVerifier" />
+          <option value="verifyPlugin" />
         </list>
       </option>
       <option name="vmOptions" value="" />

.run/Run Verifications.run.xml

@@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
 ### Software Requirements
 You should have the following things installed:
 * Git
-* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
+* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
 * Gradle (shipped inside the repo as Gradle Wrapper - also available inside IntelliJ)
 
 ### Recommended setup

CONTRIBUTING.md

@@ -3,12 +3,13 @@ plugins {
     id 'idea'
     id 'checkstyle'
     id 'pmd'
-    id 'org.jetbrains.intellij' version '1.17.4'
+    id 'org.jetbrains.intellij.platform' version '2.0.1'
     id 'org.sonarqube' version '5.1.0.4882'
 }
 
 ext {
     checkstyleVersion = '10.18.1'
+    pmdVersion = '7.5.0'
 }
 
 def properties(String key) {
@@ -19,7 +20,7 @@ def environment(String key) {
     return providers.environmentVariable(key)
 }
 
-apply plugin: 'org.jetbrains.intellij'
+apply plugin: 'org.jetbrains.intellij.platform'
 apply plugin: 'java'
 apply plugin: 'checkstyle'
 
@@ -30,6 +31,10 @@ version = properties("pluginVersion").get()
 // Add build script repository to maven central
 repositories {
     mavenCentral()
+    intellijPlatform {
+        defaultRepositories()
+        jetbrainsRuntime()
+    }
 }
 
 // https://github.com/gradle/gradle/issues/27035
@@ -41,7 +46,17 @@ configurations.checkstyle {
 
 // 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()
+        instrumentationTools()
+    }
     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:5.11.0'),
             'org.junit.jupiter:junit-jupiter',
             'org.junit.jupiter:junit-jupiter-engine',
@@ -55,21 +70,36 @@ dependencies {
 // This needs to fit the tag <idea-version since-build="xxx"> in plugin.xml
 // See https://www.jetbrains.com/intellij-repository/snapshots
 // See https://www.jetbrains.com/intellij-repository/releases
-intellij {
-    pluginName = properties("pluginName")
-
-    version = properties("platformVersion")
-    type = properties("platformType")
-
-    // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    plugins = properties("platformPlugins").map { it.split(",").collect { it.trim() }.findAll { !it.empty } }
-
-    updateSinceUntilBuild = false
-}
-
-
-listProductsReleases {
-    sinceBuild = "241.*"
+intellijPlatform {
+    pluginConfiguration {
+        name = properties("pluginName")
+        version = properties("pluginVersion")
+    }
+    patchPluginXml {
+        pluginId = properties("pluginGroup")
+        pluginName = properties("pluginName")
+        pluginVersion = properties("pluginVersion")
+        sinceBuild = properties("platformSinceBuild")
+        untilBuild = provider { null }
+    }
+    pluginVerification {
+        ides {
+            recommended()
+        }
+    }
+    signPlugin {
+        certificateChain = environment("CERTIFICATE_CHAIN")
+        privateKey = environment("PRIVATE_KEY")
+        password = environment("PRIVATE_KEY_PASSWORD")
+    }
+    publishPlugin {
+        token = environment("PUBLISH_TOKEN")
+        // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
+        // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
+        // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
+        channels = properties("pluginVersion")
+                .map { [((it.split('-') as List)[1] ?: "default").split('\\.').find { true }.toLowerCase()] }
+    }
 }
 
 checkstyle {
@@ -82,18 +112,23 @@ checkstyle {
 pmd {
     consoleOutput = true
     ruleSetFiles = files(".config/pmd/ruleset.xml")
+    toolVersion = pmdVersion
 }
 
 tasks.withType(Checkstyle).configureEach {
     enabled = project.hasProperty("checkstyleEnabled");
 }
 
+tasks.withType(Pmd).configureEach {
+    enabled = !project.hasProperty("skipPMD")
+}
+
 // Configure compileJava AND compileTestJava
 // https://docs.gradle.org/current/dsl/org.gradle.api.tasks.compile.JavaCompile.html
 tasks.withType(JavaCompile).configureEach {
     // JAVA compatibility
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 compileJava.options.encoding = 'UTF-8'
@@ -105,6 +140,16 @@ test {
     useJUnitPlatform()
 }
 
+sonar {
+    properties {
+        // Ignore sonar warnings globally
+        property 'sonar.issue.ignore.multicriteria', 'S1948'
+        // Ignore serialization waring as it's only relevant for RMI which is not used
+        property 'sonar.issue.ignore.multicriteria.S1948.ruleKey', 'java:S1948'
+        property 'sonar.issue.ignore.multicriteria.S1948.resourceKey', '**/*.java'
+    }
+}
+
 // Add resources directory because intellij test framework checks there for test resources (instead of build/resources)
 sourceSets {
     test.output.resourcesDir = "build/classes/java/resources"
@@ -114,23 +159,4 @@ tasks {
     wrapper {
         gradleVersion = properties("gradleVersion").get()
     }
-
-    patchPluginXml {
-        version = properties("pluginVersion")
-    }
-
-    signPlugin {
-        certificateChain = environment("CERTIFICATE_CHAIN")
-        privateKey = environment("PRIVATE_KEY")
-        password = environment("PRIVATE_KEY_PASSWORD")
-    }
-
-    publishPlugin {
-        token = environment("PUBLISH_TOKEN")
-        // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
-        // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
-        // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
-        channels = properties("pluginVersion")
-                .map { [((it.split('-') as List)[1] ?: "default").split('\\.').find { true }.toLowerCase()] }
-    }
 }

build.gradle

@@ -5,12 +5,14 @@ pluginName=Save Actions X
 pluginVersion=1.2.4-SNAPSHOT
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType=IC
-platformVersion=2024.1.6
+platformVersion=2024.2.2
+platformSinceBuild=242
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
-# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins=java
+# Example: platformBundledPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
+platformBundledPlugins=java
+platformPlugins=
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion=8.9
+gradleVersion=8.10.1
 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
 org.gradle.configuration-cache=true
 # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html