From ddad3e65d8ed647dca6a5b183dad41308c210a7f Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Fri, 19 Apr 2024 12:06:29 +0200
Subject: [PATCH] Add a runLocalIde task that uses the
 apolloIntellijPlugin.ideDir property

---
 .idea/runConfigurations/Run_IntelliJ_plugin.xml |  5 +++--
 intellij-plugin/build.gradle.kts                | 17 +++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.idea/runConfigurations/Run_IntelliJ_plugin.xml b/.idea/runConfigurations/Run_IntelliJ_plugin.xml
index afdce5b4984..c3b81888a79 100644
--- a/.idea/runConfigurations/Run_IntelliJ_plugin.xml
+++ b/.idea/runConfigurations/Run_IntelliJ_plugin.xml
@@ -16,7 +16,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":intellij-plugin:runIde" />
+          <option value=":intellij-plugin:runLocalIde" />
         </list>
       </option>
       <option name="vmOptions" />
@@ -24,6 +24,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/intellij-plugin/build.gradle.kts b/intellij-plugin/build.gradle.kts
index c6af8ef4dce..aba89665f67 100644
--- a/intellij-plugin/build.gradle.kts
+++ b/intellij-plugin/build.gradle.kts
@@ -2,6 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.platform.gradle.extensions.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.tasks.RunIdeTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 import java.net.URL
 import java.text.SimpleDateFormat
@@ -55,24 +56,24 @@ tasks {
     }
   }
 
-  runIde {
+  withType<RunIdeTask> {
     // Enables debug logging for the plugin
     systemProperty("idea.log.debug.categories", "Apollo")
 
     // Disable hiding frequent exceptions in logs (annoying for debugging). See com.intellij.idea.IdeaLogger.
     systemProperty("idea.logger.exception.expiration.minutes", "0")
 
-    // Use a custom IntelliJ installation. Set this property in your local ~/.gradle/gradle.properties file.
-    // (for AS, it should be something like '/Applications/Android Studio.app/Contents')
-    // See https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-gradle-build-script
-    if (project.hasProperty("apolloIntellijPlugin.ideDir")) {
-      localPath.set(file(project.property("apolloIntellijPlugin.ideDir")!!))
-    }
-
     // Uncomment to disable internal mode - see https://plugins.jetbrains.com/docs/intellij/enabling-internal.html
     // systemProperty("idea.is.internal", "false")
   }
 
+  val runLocalIde by registering(RunIdeTask::class) {
+    // Use a custom IJ/AS installation. Set this property in your local ~/.gradle/gradle.properties file.
+    // (for AS, it should be something like '/Applications/Android Studio.app/Contents')
+    // See https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-gradle-build-script
+    localPath = providers.gradleProperty("apolloIntellijPlugin.ideDir").orNull?.let { file(it) }
+  }
+
   // Log tests
   withType<AbstractTestTask> {
     testLogging {