From 232c173529d4356148b42e3bcb743db5f21e5e38 Mon Sep 17 00:00:00 2001
From: AlexanderBartash <AlexanderBartash@gmail.com>
Date: Fri, 18 Oct 2024 01:17:34 +0300
Subject: [PATCH] Fixed tests by using non-installer IDE version.

---
 .idea/misc.xml            | 3 ++-
 build.gradle.kts          | 9 +++++++--
 gradle.properties         | 3 ++-
 gradle/libs.versions.toml | 7 ++++++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4d50598..95823eb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <list size="1">
@@ -7,5 +8,5 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index c1b0e76..10dc1f2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
     id("java")
     alias(libs.plugins.kotlin)
-    id("org.jetbrains.intellij.platform")
+    alias(libs.plugins.intellijPlatform)
     alias(libs.plugins.changelog)
     alias(libs.plugins.jvmwrapper)
 }
@@ -36,12 +36,17 @@ dependencies {
 
     intellijPlatform {
         val platformVer: String = providers.gradleProperty("platformVersion").get()
-        rider(platformVer)
+        // Do not set useInstaller = true because installer version for some reason do not contain libs/testFramework.jar
+        // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html#setting-up-intellij-platform
+        // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#target-versions
+        rider(platformVer, useInstaller = false)
         jetbrainsRuntime()
         pluginVerifier()
         zipSigner()
         instrumentationTools()
 
+        // TestFrameworkType.Platform as of this moment does not work for rider and the warning on this page is wrong.
+        // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#testing
         testFramework(TestFrameworkType.Bundled)
     }
 }
diff --git a/gradle.properties b/gradle.properties
index d7d4169..ebe394c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,4 +14,5 @@ gradleVersion=8.10.2
 org.jetbrains.intellij.platform.downloadSources=false
 # Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE
 # https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default
-kotlin.stdlib.default.dependency=false
\ No newline at end of file
+kotlin.stdlib.default.dependency=false
+org.gradle.jvmargs = -Xmx1G
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3b42a50..2a533f7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,10 +3,15 @@ kotlin = "1.9.25" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.htm
 changelog = "2.2.1"
 jvmwrapper = "0.14.0"
 
+# https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
+# Apache 2.0 https://github.com/ota4j-team/opentest4j/blob/main/LICENSE
+intellijPlatform = "2.1.0"
+
 [libraries]
 kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
 
 [plugins]
 changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-jvmwrapper = { id = "me.filippov.gradle.jvm.wrapper", version.ref = "jvmwrapper" }
\ No newline at end of file
+jvmwrapper = { id = "me.filippov.gradle.jvm.wrapper", version.ref = "jvmwrapper" }
+intellijPlatform = { id = "org.jetbrains.intellij.platformr", version.ref = "intellijPlatform" }
\ No newline at end of file