From b3e691e5a3176c07bd7a7001da12454287d63fb3 Mon Sep 17 00:00:00 2001
From: RedNesto <RedNestoMC@gmail.com>
Date: Thu, 1 Aug 2024 15:36:08 +0200
Subject: [PATCH] Intellij platform plugin 2.0.0

---
 build.gradle.kts  | 25 ++++---------------------
 gradle.properties |  2 +-
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 629d9e3cd..b57956d96 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,14 +35,13 @@ plugins {
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij.platform") version "2.0.0-beta8"
+    id("org.jetbrains.intellij.platform") version "2.0.0"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
     id("org.jetbrains.changelog") version "2.2.0"
 }
 
-val ideaVersion: String by project
-val ideaVersionNoEapSnapshot = ideaVersion.removeSuffix("-EAP-SNAPSHOT")
+val ideaVersionProvider: Provider<String> = providers.gradleProperty("ideaVersion")
 val ideaVersionName: String by project
 val coreVersion: String by project
 
@@ -119,17 +118,6 @@ repositories {
     }
 }
 
-configurations.all {
-    resolutionStrategy.eachDependency {
-        // For some reason dependency versions do not include the EAP-SNAPSHOT suffix anymore since beta7
-        // This works around the issue for now
-        // TODO remove when no longer needed
-        if (requested.version == ideaVersionNoEapSnapshot) {
-            useVersion(ideaVersion)
-        }
-    }
-}
-
 dependencies {
     // Add tools.jar for the JDI API
     implementation(files(Jvm.current().toolsJar))
@@ -161,7 +149,7 @@ dependencies {
     grammarKit(libs.grammarKit)
 
     intellijPlatform {
-        intellijIdeaCommunity(providers.gradleProperty("ideaVersion"))
+        intellijIdeaCommunity(ideaVersionProvider, useInstaller = false)
         bundledPlugin("com.intellij.java.ide")
         bundledPlugin("org.jetbrains.idea.maven")
         bundledPlugin("com.intellij.gradle")
@@ -173,11 +161,6 @@ dependencies {
         bundledPlugin("com.intellij.properties")
         bundledPlugin("org.toml.lang")
 
-        // needed dependencies for unit tests
-        bundledPlugin("JUnit")
-
-        instrumentationTools()
-
         testFramework(TestFrameworkType.JUnit5)
         testFramework(TestFrameworkType.Plugin.Java)
 
@@ -249,7 +232,7 @@ intellijPlatform {
     instrumentCode = false
     buildSearchableOptions = false
 
-    verifyPlugin {
+    pluginVerification {
         ides {
             recommended()
         }
diff --git a/gradle.properties b/gradle.properties
index 00a3559fb..91652714f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,7 @@ ideaVersion = 242.19890.14-EAP-SNAPSHOT
 ideaVersionName = 2024.2
 
 coreVersion = 1.8.0
-downloadIdeaSources = true
+org.jetbrains.intellij.platform.downloadSources=true
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false