From 314304246acd7a10aaf66021582be211dbb8dc66 Mon Sep 17 00:00:00 2001 From: Alex Plate Date: Thu, 5 Sep 2024 17:10:14 +0300 Subject: [PATCH] Fix the LATEST-EAP-SNAPSHOT tests --- build.gradle.kts | 6 +++++- tests/java-tests/build.gradle.kts | 6 +++++- tests/long-running-tests/build.gradle.kts | 6 +++++- tests/property-tests/build.gradle.kts | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 91fed41a34..3638c612b7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -111,10 +111,14 @@ dependencies { compileOnly("org.jetbrains:annotations:24.1.0") intellijPlatform { + // Snapshots don't use installers + // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#target-versions-installers + val useInstaller = "EAP-SNAPSHOT" !in ideaVersion + // Note that it is also possible to use local("...") to compile against a locally installed IDE // E.g. local("/Users/{user}/Applications/IntelliJ IDEA Ultimate.app") // Or something like: intellijIdeaUltimate(ideaVersion) - create(ideaType, ideaVersion) + create(ideaType, ideaVersion, useInstaller) pluginVerifier() zipSigner() diff --git a/tests/java-tests/build.gradle.kts b/tests/java-tests/build.gradle.kts index 621efb1b97..f985422cf1 100644 --- a/tests/java-tests/build.gradle.kts +++ b/tests/java-tests/build.gradle.kts @@ -35,7 +35,11 @@ dependencies { testImplementation("org.junit.vintage:junit-vintage-engine:5.10.3") intellijPlatform { - create(ideaType, ideaVersion) + // Snapshots don't use installers + // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#target-versions-installers + val useInstaller = "EAP-SNAPSHOT" !in ideaVersion + + create(ideaType, ideaVersion, useInstaller) testFramework(TestFrameworkType.Platform) testFramework(TestFrameworkType.JUnit5) bundledPlugins("com.intellij.java", "org.jetbrains.plugins.yaml") diff --git a/tests/long-running-tests/build.gradle.kts b/tests/long-running-tests/build.gradle.kts index a1df0601d3..c6664b7c7d 100644 --- a/tests/long-running-tests/build.gradle.kts +++ b/tests/long-running-tests/build.gradle.kts @@ -28,7 +28,11 @@ dependencies { testImplementation("org.junit.vintage:junit-vintage-engine:5.10.3") intellijPlatform { - create(ideaType, ideaVersion) + // Snapshots don't use installers + // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#target-versions-installers + val useInstaller = "EAP-SNAPSHOT" !in ideaVersion + + create(ideaType, ideaVersion, useInstaller) testFramework(TestFrameworkType.Platform) testFramework(TestFrameworkType.JUnit5) instrumentationTools() diff --git a/tests/property-tests/build.gradle.kts b/tests/property-tests/build.gradle.kts index 19c40d7b81..f8e7ad3f93 100644 --- a/tests/property-tests/build.gradle.kts +++ b/tests/property-tests/build.gradle.kts @@ -28,7 +28,11 @@ dependencies { testImplementation("org.junit.vintage:junit-vintage-engine:5.10.3") intellijPlatform { - create(ideaType, ideaVersion) + // Snapshots don't use installers + // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#target-versions-installers + val useInstaller = "EAP-SNAPSHOT" !in ideaVersion + + create(ideaType, ideaVersion, useInstaller) bundledPlugins("com.intellij.java") testFramework(TestFrameworkType.Platform) testFramework(TestFrameworkType.JUnit5)