Update Gradle IJ plugin to IJP Gradle plugin

Author: c5inco

.gitignore

@@ -20,4 +20,7 @@ dist/
 .cxx
 local.properties
 
-.kotlin
+.kotlin
+
+# IntelliJ Platform Gradle Plugin cache
+.intellijPlatform

gradle.properties

@@ -9,7 +9,7 @@ pluginVersion = 1.0.16
 pluginSinceBuild = 243
 pluginUntilBuild = 263.*
 
-# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
+# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html
 platformType = IC
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html

gradle/libs.versions.toml

@@ -2,14 +2,14 @@
 kotlin = "2.0.20"
 compose = "1.6.11"
 agp = "8.2.0"
-intellij-plugin = "1.17.4"
+intellij-platform-plugin = "2.10.5"
 changelog = "2.1.0"
 intellij-platform = "2024.3"
 
 [plugins]
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose" }
-jetbrainsIntellij = { id = "org.jetbrains.intellij", version.ref = "intellij-plugin" }
+intellijPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intellij-platform-plugin" }
 jetbrainsChangelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
 composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

ideaPlugin/build.gradle.kts

@@ -4,12 +4,20 @@ plugins {
     alias(libs.plugins.kotlinJvm)
     alias(libs.plugins.jetbrainsCompose)
     alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.jetbrainsIntellij)
+    alias(libs.plugins.intellijPlatform)
     alias(libs.plugins.jetbrainsChangelog)
 }
 
 version = properties("pluginVersion").get()
 
+repositories {
+    mavenCentral()
+    
+    intellijPlatform {
+        defaultRepositories()
+    }
+}
+
 dependencies {
     implementation(compose.desktop.linux_x64) {
         exclude(group = "org.jetbrains.kotlinx")
@@ -26,37 +34,49 @@ dependencies {
     implementation(project(":shared")) {
         exclude(group = "org.jetbrains.kotlinx")
     }
-}
 
-intellij {
-    pluginName = properties("pluginName").get()
-    version = libs.versions.intellij.platform.get()
-    type = properties("platformType").get()
+    intellijPlatform {
+        intellijIdea("2025.1")
+    }
 }
 
-tasks {
-    buildSearchableOptions {
-        enabled = false
-    }
-    patchPluginXml {
+intellijPlatform {
+    pluginConfiguration {
+        name = properties("pluginName").get()
         version = properties("pluginVersion").get()
-        sinceBuild = properties("pluginSinceBuild").get()
-        untilBuild = properties("pluginUntilBuild").get()
-
-    changeNotes.set("""
-        <ul>
-            <li>Bumped IntelliJ plugin versions (min: 243.*, max: 263.*)</li>
-            <li>Compose Desktop dependencies to 1.6.11</li>
-            <li>Exclude coroutines for IJ plugin to avoid class loader conflicts with Compose</li>
-        </ul>
-    """)
+        
+        ideaVersion {
+            sinceBuild = properties("pluginSinceBuild").get()
+            untilBuild = properties("pluginUntilBuild").get()
+        }
+        
+        changeNotes = """
+            <ul>
+                <li>Bumped IntelliJ plugin versions (min: 243, max: 263.*)</li>
+                <li>Compose Desktop dependencies to 1.6.11</li>
+                <li>Exclude coroutines for IJ plugin to avoid class loader conflicts with Compose</li>
+            </ul>
+        """
     }
+    
+    buildSearchableOptions = false
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = "17"
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
+    }
+}
+
+// Skip tasks that require JBR download
+tasks.named("buildSearchableOptions") {
+    enabled = false
+}
+
+tasks.named("jarSearchableOptions") {
+    enabled = false
 }

settings.gradle.kts

@@ -5,6 +5,7 @@ pluginManagement {
         google()
     }
 }
+
 rootProject.name = "ModifiersPlayground"
 
 include(":shared")