Gradle updates and fixes for newer IntelliJ versions

Author: cypressious

.gitignore

@@ -1,3 +1,4 @@
 build
 .gradle
-*.iml
+*.iml
+.intellijPlatform

.idea/kotlinc.xml

@@ -1,30 +1,42 @@
 plugins {
-    kotlin("jvm") version "1.6.10"
-    id("org.jetbrains.intellij") version "1.4.0"
+    kotlin("jvm") version "1.9.25"
+    id("org.jetbrains.intellij.platform") version "2.0.1"
 }
 
 group = "org.example"
-version = "0.1.3"
+version = "0.1.4"
 
 repositories {
     mavenCentral()
+
+    intellijPlatform {
+        defaultRepositories()
+    }
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
-}
+    intellijPlatform {
+        create("IU", "2024.2")
+        bundledPlugins(listOf("JavaScript", "org.jetbrains.plugins.sass"))
 
-// See https://github.com/JetBrains/gradle-intellij-plugin/
-intellij {
-    type.set("IU")
-    plugins.set(listOf("JavaScriptLanguage", "sass"))
-    version.set("LATEST-EAP-SNAPSHOT")
-    updateSinceUntilBuild.set(false)
+        pluginVerifier()
+        zipSigner()
+        instrumentationTools()
+    }
 }
 
-tasks {
-    patchPluginXml {
-        version.set(project.version.toString())
-        sinceBuild.set("212.0")
+// See https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html
+intellijPlatform {
+    pluginConfiguration {
+        ideaVersion {
+            sinceBuild = "223"
+            untilBuild = provider { null }
+        }
     }
-}
+
+    pluginVerification {
+        ides {
+            recommended()
+        }
+    }
+}

.idea/misc.xml

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

build.gradle.kts

@@ -1,6 +1,7 @@
 package de.rakhman.angular_split_buttons
 
 import com.intellij.icons.AllIcons
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
@@ -38,7 +39,7 @@ abstract class AbstractOpenAngularAction(
 
         // find existing window where the sibling file is opened and which is not the window
         // where the action was performed
-        val window = fileEditorManager.splitters.windows.firstOrNull {
+        val window = fileEditorManager.splitters.windows().firstOrNull {
             !it.hasEditor(myEditor) && it.hasFile(siblingFile)
         }
 
@@ -48,10 +49,10 @@ abstract class AbstractOpenAngularAction(
         } else {
             // otherwise, split the current window
             val currentWindow =
-                fileEditorManager.splitters.windows.firstOrNull { it.hasEditor(myEditor) }
+                fileEditorManager.splitters.windows().firstOrNull { it.hasEditor(myEditor) }
                     ?: fileEditorManager.currentWindow
 
-            currentWindow.split(
+            currentWindow?.split(
                 JSplitPane.HORIZONTAL_SPLIT,
                 false,
                 siblingFile,
@@ -72,6 +73,10 @@ abstract class AbstractOpenAngularAction(
     private fun hasMatchingExtension(file: PsiFile): Boolean {
         return file.name.substringAfterLast(".").lowercase() in extensions
     }
+
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.BGT
+    }
 }
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -11,6 +11,11 @@
     ]]></description>
 
     <change-notes><![CDATA[
+        0.1.4
+        <ul>
+            <li>Updated for newer versions of IntelliJ IDEA and WebStorm</li>
+        </ul>
+
         0.1.3
         <ul>
             <li>Fix usage of deprecated symbols</li>