Bump org.jetbrains.intellij.platform to v2.0.0-rc1

.github/workflows/run-ui-tests.yaml

@@ -28,15 +28,15 @@ jobs:
             runIde: |
               export DISPLAY=:99.0
               Xvfb -ac :99 -screen 0 1920x1080x16 &
-              gradle testIdeUi &
+              gradle runIdeForUiTests &
           -
             os: windows-latest
             runIde: |
-              start gradlew.bat testIdeUi
+              start gradlew.bat runIdeForUiTests
           -
             os: macos-latest
             runIde: |
-              ./gradlew testIdeUi &
+              ./gradlew runIdeForUiTests &
     
     steps:
       -

.run/Run IDE for UI Tests.run.xml

@@ -11,7 +11,7 @@
 			</option>
 			<option name="taskNames">
 				<list>
-					<option value="testIdeUi"/>
+					<option value="runIdeForUiTests"/>
 				</list>
 			</option>
 			<option name="vmOptions"/>

CHANGELOG_CODE.md

@@ -19,7 +19,7 @@ For user-facing changes, see [`CHANGELOG.md`][_-1].
 
 ### Changed
 
-* [The documentation][60-2] is updated. (fcf2c0fb, 91d467ac, HEAD)
+* [The documentation][60-2] is updated. (fcf2c0fb, 91d467ac, cf6beccd)
 * [`PyrightBundle`][60-3] and [`PyrightIcon`][60-4] are renamed. (7032faff)
 * Gradle is updated to 8.9. (2397aafd, c5d7c8c8)
 * [Kotlin Serialization Gradle Plugin][60-5] is updated to 1.7.1.
@@ -28,10 +28,12 @@ For user-facing changes, see [`CHANGELOG.md`][_-1].
 * [The `lsp4ij` submodule][60-7] is added. (b67210b7)
 * Various files are moved to [the new `cli` submodule][60-8]. (37136d65)
 * Path-hints-related logic is revisited to use `PropertyGraph`. (bf2de95e)
+* [IntelliJ Platform Gradle Plugin][60-9] is updated to 2.0.0-rc1.
+  (ace16ca8, HEAD)
 
 ### Fixed
 
-* [`PyrightExternalAnnotator`][60-9] now overrides
+* [`PyrightExternalAnnotator`][60-10] now overrides
   `collectInformation(PsiFile, Editor, boolean)`
   instead of `collectInformation(PsiFile)`. (7032faff)
 
@@ -44,7 +46,8 @@ For user-facing changes, see [`CHANGELOG.md`][_-1].
   [60-6]: https://github.com/Kotlin/kotlinx-kover
   [60-7]: https://github.com/InSyncWithFoo/pyright-for-pycharm/blob/b67210b7/src/main/kotlin/com/insyncwithfoo/pyright/lsp4ij
   [60-8]: https://github.com/InSyncWithFoo/pyright-for-pycharm/blob/37136d65/src/main/kotlin/com/insyncwithfoo/pyright/cli
-  [60-9]: https://github.com/InSyncWithFoo/pyright-for-pycharm/blob/7032faff/src/main/kotlin/com/insyncwithfoo/pyright/PyrightExternalAnnotator.kt
+  [60-9]: https://github.com/JetBrains/intellij-platform-gradle-plugin
+  [60-10]: https://github.com/InSyncWithFoo/pyright-for-pycharm/blob/7032faff/src/main/kotlin/com/insyncwithfoo/pyright/PyrightExternalAnnotator.kt
 
 
 ## [0.5.0] - 2024-06-04

build.gradle.kts

@@ -1,13 +1,14 @@
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
+import org.jetbrains.intellij.platform.gradle.Constants.Constraints
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 fun properties(key: String) = providers.gradleProperty(key)
 fun environment(key: String) = providers.environmentVariable(key)
 
 plugins {
     alias(libs.plugins.kotlin)
-    alias(libs.plugins.intellijPlatform)
+    alias(libs.plugins.intelliJPlatForm)
     alias(libs.plugins.changelog)
     alias(libs.plugins.qodana)
     alias(libs.plugins.kover)
@@ -35,7 +36,7 @@ repositories {
 // Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
 dependencies {
     compileOnly(libs.kotlinxSerialization)
-    testImplementation(kotlin("test"))
+    testImplementation(libs.junit)
 
     // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
     intellijPlatform {
@@ -143,16 +144,26 @@ tasks {
         gradleVersion = properties("gradleVersion").get()
     }
 
-    // Configure UI tests plugin
-    // Read more: https://github.com/JetBrains/intellij-ui-test-robot
-    testIdeUi {
-        systemProperty("robot-server.port", "8082")
-        systemProperty("ide.mac.message.dialogs.as.sheets", "false")
-        systemProperty("jb.privacy.policy.text", "<!--999.999-->")
-        systemProperty("jb.consents.confirmation.enabled", "false")
-    }
-
     publishPlugin {
         dependsOn(patchChangelog)
     }
 }
+
+// Configure UI tests plugin
+// Read more: https://github.com/JetBrains/intellij-ui-test-robot
+val runIdeForUiTests by intellijPlatformTesting.runIde.registering {
+    task {
+        jvmArgumentProviders += CommandLineArgumentProvider {
+            listOf(
+                "-Drobot-server.port=8082",
+                "-Dide.mac.message.dialogs.as.sheets=false",
+                "-Djb.privacy.policy.text=<!--999.999-->",
+                "-Djb.consents.confirmation.enabled=false",
+            )
+        }
+    }
+
+    plugins {
+        robotServerPlugin(Constraints.LATEST_VERSION)
+    }
+}

gradle/libs.versions.toml

@@ -2,10 +2,11 @@
 # libraries
 annotations = "24.1.0"
 kotlinxSerialization = "1.7.1"
+junit = "4.13.2"
 
 # plugins
 changelog = "2.2.1"
-intellijPlatform = "2.0.0-beta9"
+intelliJPlatForm = "2.0.0-rc1"
 kotlin = "2.0.0"
 kover = "0.8.2"
 qodana = "2024.1.5"
@@ -20,13 +21,18 @@ group = "org.jetbrains.kotlinx"
 name = "kotlinx-serialization-json"
 version.ref = "kotlinxSerialization"
 
+[libraries.junit]
+group = "junit"
+name = "junit"
+version.ref = "junit"
+
 [plugins.changelog]
 id = "org.jetbrains.changelog"
 version.ref = "changelog"
 
-[plugins.intellijPlatform]
+[plugins.intelliJPlatForm]
 id = "org.jetbrains.intellij.platform"
-version.ref = "intellijPlatform"
+version.ref = "intelliJPlatForm"
 
 [plugins.kotlin]
 id = "org.jetbrains.kotlin.jvm"

settings.gradle.kts

@@ -1,5 +1 @@
-plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-}
-
 rootProject.name = "pyright"