Support CLion v2025.2+

CHANGELOG.md

@@ -4,6 +4,14 @@
 
 ## Unreleased
 
+## 2.0.3 - 2025-09-23
+
+### Changed
+
+- Support CLion version 2025.2 and above
+
+### Added
+
 ## 2.0.2 - 2025-04-10
 
 ### Changed

build.gradle.kts

@@ -2,6 +2,8 @@ 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.dsl.JvmDefaultMode
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 fun properties(key: String) = providers.gradleProperty(key)
@@ -47,7 +49,6 @@ dependencies {
         // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
         bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
 
-        instrumentationTools()
         pluginVerifier()
         zipSigner()
     }
@@ -126,9 +127,10 @@ tasks {
             targetCompatibility = it
         }
         withType<KotlinCompile> {
-            kotlinOptions {
-                jvmTarget = it
-                freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all")
+            compilerOptions {
+                jvmTarget = JvmTarget.fromTarget(it)
+                optIn.add("kotlin.RequiresOptIn")
+                jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
             }
         }
     }
@@ -165,8 +167,8 @@ tasks {
     compileKotlin {
         dependsOn("generateAll")
 
-        kotlinOptions {
-            freeCompilerArgs = listOf("-Xcontext-receivers")
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
         }
     }
 

gradle.properties

@@ -1,15 +1,16 @@
 pluginGroup=org.ladybird.dsl
 pluginName=Ladybird-DSL
-pluginVersion=2.0.2
-pluginSinceBuild=243
+pluginVersion=2.0.3
+pluginSinceBuild=252
 platformType=CL
-platformVersion=2024.3.5
+platformVersion=2025.2
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins=
 # Example: platformBundledPlugins = com.intellij.java
-platformBundledPlugins=com.intellij.clion,com.intellij.cidr.base,com.intellij.cidr.lang
+platformBundledPlugins=com.intellij.clion,com.intellij.cidr.lang
 javaVersion=21
 gradleVersion=8.9
 # The platform includes Kotlin, so we don't have to
 kotlin.stdlib.default.dependency=false
+org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m

gradle/libs.versions.toml

@@ -3,8 +3,8 @@
 annotations = "24.1.0"
 
 # plugins
-intellijPlatform = "2.0.1"
-kotlin = "1.9.25"
+intellijPlatform = "2.9.0"
+kotlin = "2.2.0"
 changelog = "2.2.0"
 grammarkit = "2022.3.2.2"
 kotlinxSerialization = "1.6.2"

src/main/resources/META-INF/plugin.xml

@@ -6,8 +6,8 @@
 
     <depends>com.intellij.modules.platform</depends>
     <depends>com.intellij.clion</depends>
-    <depends>com.intellij.cidr.base</depends>
     <depends>com.intellij.cidr.lang</depends>
+    <depends>com.intellij.modules.clion</depends>
 
     <description><![CDATA[
         Adds syntax highlighting for Ladybird file types.