Upgrade Gradle to 9.0 and Intellij Platform to 2.9

Author: delacry

.github/workflows/build.yaml

@@ -18,24 +18,24 @@ jobs:
       - name: Build with Gradle
         run: |
           chmod +x gradlew
-          ./gradlew build -x test
+          ./gradlew buildPlugin
       - name: Create artifact name
         id: vars
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: artifact-${{ steps.vars.outputs.sha_short }}
-          path: build/libs/instrumented*.jar
+          path: build/libs/*instrumented.jar
       - name: Download artifact
         uses: actions/download-artifact@v4
       - name: IntelliJ Platform Plugin Verifier
         uses: ChrisCarini/intellij-platform-plugin-verifier-action@v2.0.1
         with:
           ide-versions: |
-            phpstorm:2022.2
             phpstorm:2023.1
             phpstorm:2024.1
+            phpstorm:2025.1
             phpstorm:LATEST-EAP-SNAPSHOT
       - name: Upload release assets
         uses: softprops/action-gh-release@v2

.gitignore

@@ -3,6 +3,8 @@
 local.properties
 /src/main/gen
 /.idea
+/.kotlin
+/.intellijPlatform
 /.gradle
 /build
 /out

build.gradle.kts

@@ -1,28 +1,32 @@
-import kotlinx.kover.tasks.KoverXmlTask
+import org.gradle.kotlin.dsl.register
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.grammarkit.tasks.GenerateLexerTask
 import org.jetbrains.grammarkit.tasks.GenerateParserTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
-fun properties(key: String) = providers.gradleProperty(key)
-fun environment(key: String) = providers.environmentVariable(key)
+fun cfg(key: String) = providers.gradleProperty(key)
+fun env(key: String) = providers.environmentVariable(key)
 
 plugins {
     id("java")
-    id("org.jetbrains.kotlin.jvm") version "1.8.20"
-    id("org.jetbrains.intellij") version "1.17.3"
-    id("org.jetbrains.grammarkit") version "2022.3.2.2"
-    id("org.jetbrains.changelog") version "2.2.0"
+    id("org.jetbrains.intellij.platform") version "2.9.0"
+    id("org.jetbrains.changelog") version "2.4.0"
     id("org.jetbrains.qodana") version "0.1.13"
-    id("org.jetbrains.kotlinx.kover") version "0.6.1"
+    id("org.jetbrains.grammarkit") version "2022.3.2.2"
+    kotlin("jvm") version "2.2.10"
 }
 
-group = properties("pluginGroup").get()
-version = properties("pluginVersion").get()
+group = cfg("pluginGroup").get()
+version = cfg("pluginVersion").get()
 
 repositories {
     mavenCentral()
+
+    intellijPlatform {
+        defaultRepositories()
+    }
 }
 
 kotlin {
@@ -38,96 +42,99 @@ sourceSets {
     }
 }
 
-// https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
-intellij {
-    pluginName.set(properties("pluginName"))
-    version.set(properties("platformVersion"))
-    type.set(properties("platformType"))
+dependencies {
+    intellijPlatform {
+        create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
+        plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
+        testFramework(TestFrameworkType.Platform)
+    }
 
-    // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    plugins.set(properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) })
+    testImplementation("junit:junit:4.13.2")
 }
 
-grammarKit {
-    // Version of IntelliJ patched JFlex (see the link below), Default is 1.7.0-1
-    jflexRelease.set(properties("jflexRelease"))
+intellijPlatform {
+    pluginConfiguration {
+        name = cfg("pluginName")
+        version = cfg("pluginVersion")
+
+        description = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {
+            val start = "<!-- Plugin description -->"
+            val end = "<!-- Plugin description end -->"
 
-    // Release version, tag, or short commit hash of Grammar-Kit to use (see link below). Default is 2021.1.2
-    grammarKitRelease.set(properties("grammarKitRelease"))
+            with(it.lines()) {
+                if (!containsAll(listOf(start, end))) {
+                    throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
+                }
+                subList(indexOf(start) + 1, indexOf(end)).joinToString("\n").let(::markdownToHTML)
+            }
+        }
+
+        changeNotes = provider {
+            changelog.getAll().values.joinToString("\n") { changelog.renderItem(it, Changelog.OutputType.HTML) }
+        }
+
+        ideaVersion {
+            sinceBuild = cfg("pluginSinceBuild")
+        }
+    }
+
+    autoReload = true
 }
 
-// https://github.com/JetBrains/gradle-qodana-plugin
-qodana {
-    cachePath.set(provider { file(".qodana").canonicalPath })
-    reportPath.set(provider { file("build/reports/inspections").canonicalPath })
-    saveReport.set(true)
-    showReport.set(environment("QODANA_SHOW_REPORT").map { it.toBoolean() }.getOrElse(false))
+grammarKit {
+    jflexRelease.set(cfg("jflexRelease"))
+    grammarKitRelease.set(cfg("grammarKitRelease"))
+}
+
+changelog {
+    version = cfg("pluginVersion")
+    repositoryUrl = cfg("pluginRepositoryUrl")
+    path = file("CHANGELOG.md").canonicalPath
 }
 
-// https://github.com/Kotlin/kotlinx-kover#configuration
-kover.xmlReport {
-    onCheck.set(true)
+qodana {
+    cachePath = provider { file(".qodana").canonicalPath }
+    reportPath = provider { file("build/reports/inspections").canonicalPath }
+    saveReport = true
+    showReport = env("QODANA_SHOW_REPORT").map { it.toBoolean() }.getOrElse(false)
 }
 
-val generateLatteParser = task("generateLatteParser", GenerateParserTask::class) {
+val generateLatteParser = tasks.register<GenerateParserTask>("generateLatteParser") {
     sourceFile.set(File("src/main/java/org/nette/latte/parser/LatteParser.bnf"))
     targetRootOutputDir.set(File("src/main/gen"))
     pathToParser.set("/org/nette/latte/parser/LatteParser.java")
     pathToPsiRoot.set("/org/nette/latte/psi")
     purgeOldFiles.set(false)
 }
 
-val generateLatteMacroContentLexer = task<GenerateLexerTask>("generateLatteMacroContentLexer") {
+val generateLatteMacroContentLexer = tasks.register<GenerateLexerTask>("generateLatteMacroContentLexer") {
     sourceFile.set(File("src/main/java/org/nette/latte/lexer/grammars/LatteMacroContentLexer.flex"))
     targetOutputDir.set(File("src/main/gen/org/nette/latte/lexer"))
     purgeOldFiles.set(false)
 }
 
-val generateLatteMacroLexer = task<GenerateLexerTask>("generateLatteMacroLexer") {
+val generateLatteMacroLexer = tasks.register<GenerateLexerTask>("generateLatteMacroLexer") {
     sourceFile.set(File("src/main/java/org/nette/latte/lexer/grammars/LatteMacroLexer.flex"))
     targetOutputDir.set(File("src/main/gen/org/nette/latte/lexer"))
     purgeOldFiles.set(false)
 }
 
-val generateLatteTopLexer = task<GenerateLexerTask>("generateLatteTopLexer") {
+val generateLatteTopLexer = tasks.register<GenerateLexerTask>("generateLatteTopLexer") {
     sourceFile.set(File("src/main/java/org/nette/latte/lexer/grammars/LatteTopLexer.flex"))
     targetOutputDir.set(File("src/main/gen/org/nette/latte/lexer"))
     purgeOldFiles.set(false)
 }
 
-val generateLattePhpLexer = task<GenerateLexerTask>("generateLattePhpLexer") {
+val generateLattePhpLexer = tasks.register<GenerateLexerTask>("generateLattePhpLexer") {
     sourceFile.set(File("src/main/java/org/nette/latte/lexer/grammars/LattePhpLexer.flex"))
     targetOutputDir.set(File("src/main/gen/org/nette/latte/lexer"))
     purgeOldFiles.set(false)
 }
 
-changelog {
-    version.set(properties("pluginVersion"))
-    repositoryUrl = properties("pluginRepositoryUrl")
-    path.set(file("CHANGELOG.md").canonicalPath)
-}
-
 tasks {
     generateLexer.configure { enabled = false }
     generateParser.configure { enabled = false }
 
-    // Set the JVM compatibility versions
-    properties("javaVersion").get().let {
-        withType<JavaCompile> {
-            sourceCompatibility = it
-            targetCompatibility = it
-        }
-    }
-
-    withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = "17"
-        kotlinOptions.freeCompilerArgs = listOf("-Xjvm-default=all")
-    }
-
-    withType<KoverXmlTask> {
-        dependsOn("compileJava")
-    }
-
     withType<KotlinCompile> {
         dependsOn(
             generateLatteMacroContentLexer,
@@ -139,42 +146,10 @@ tasks {
     }
 
     wrapper {
-        gradleVersion = properties("gradleVersion").get()
-    }
-
-    patchPluginXml {
-        version.set(properties("pluginVersion"))
-        sinceBuild.set(properties("pluginSinceBuild"))
-        untilBuild.set(properties("pluginUntilBuild"))
-
-        // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
-        pluginDescription.set(providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {
-            val start = "<!-- Plugin description -->"
-            val end = "<!-- Plugin description end -->"
-
-            with (it.lines()) {
-                if (!containsAll(listOf(start, end))) {
-                    throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
-                }
-                subList(indexOf(start) + 1, indexOf(end)).joinToString("\n").let(::markdownToHTML)
-            }
-        })
-
-        changeNotes.set( provider {
-            changelog.getAll().values.joinToString("\n") { changelog.renderItem(it, Changelog.OutputType.HTML) }
-        })
-    }
-
-    // Configure UI tests plugin
-    // Read more: https://github.com/JetBrains/intellij-ui-test-robot
-    runIdeForUiTests {
-        systemProperty("robot-server.port", "8082")
-        systemProperty("ide.mac.message.dialogs.as.sheets", "false")
-        systemProperty("jb.privacy.policy.text", "<!--999.999-->")
-        systemProperty("jb.consents.confirmation.enabled", "false")
+        gradleVersion = cfg("gradleVersion").get()
     }
 
     publishPlugin {
-        token.set(environment("PLUGIN_PUBLISH_TOKEN"))
+        token = env("PLUGIN_PUBLISH_TOKEN")
     }
 }

gradle.properties

@@ -1,4 +1,4 @@
-# IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
+# https://github.com/JetBrains/intellij-platform-plugin-template/blob/main/gradle.properties
 
 pluginGroup = org.nette.latte
 pluginName = Latte Support
@@ -7,13 +7,11 @@ pluginRepositoryUrl = https://github.com/Rixafy/LatteSupport
 pluginVersion = 1.6.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 222
-pluginUntilBuild = 291.*
+pluginSinceBuild = 223
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = PS
 platformVersion = 2023.3.3
-platformDownloadSources = true
 
 # GrammarKit Properties
 jflexRelease = 1.7.0-1
@@ -24,12 +22,14 @@ grammarKitIntelliJRelease = 223.8214.52
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins = com.jetbrains.php:233.11799.232
 
-# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion = 17
-
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.7
+gradleVersion = 9.0.0
 
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
-# suppress inspection "UnusedProperty"
 kotlin.stdlib.default.dependency = false
+
+# 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
+org.gradle.caching = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME