User: rednesto
Date: 01 Aug 24 13:36
Revision: b3e691e5a3176c07bd7a7001da12454287d63fb3
Summary:
Intellij platform plugin 2.0.0


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9524&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision e95da3e13e17093daa6935af42fdad3dd8bf03d8)
+++ build.gradle.kts	(revision b3e691e5a3176c07bd7a7001da12454287d63fb3)
@@ -35,14 +35,13 @@
     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 @@
     }
 }
 
-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 @@
     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 @@
         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 @@
     instrumentCode = false
     buildSearchableOptions = false
 
-    verifyPlugin {
+    pluginVerification {
         ides {
             recommended()
         }
Index: gradle.properties
===================================================================
--- gradle.properties	(revision e95da3e13e17093daa6935af42fdad3dd8bf03d8)
+++ gradle.properties	(revision b3e691e5a3176c07bd7a7001da12454287d63fb3)
@@ -25,7 +25,7 @@
 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