From c92a71ad6e3d4eefa2a6b00bd33ff22818754416 Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Sat, 19 Oct 2024 14:56:04 +0400 Subject: [PATCH] Migrated to the gradle plugin 2.1.1-SNAPSHOT bundledModule are necessary to workaround current bugs --- build.gradle.kts | 8 +++++++- plugin/build.gradle.kts | 10 ++++++++++ plugin/coverage/build.gradle.kts | 1 + plugin/profiler/build.gradle.kts | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9694e046ff..2bc8bd6f04 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,7 +34,7 @@ buildscript { plugins { id("idea") id("jacoco") - id("org.jetbrains.intellij.platform") version "2.0.1" + id("org.jetbrains.intellij.platform") version "2.1.1-SNAPSHOT" id("org.jetbrains.grammarkit") version "2022.3.2.2" id("com.github.kt3k.coveralls") version "2.12.2" id("org.sonarqube") version "5.1.0.4882" @@ -190,9 +190,15 @@ allprojects { buildSearchableOptions { enabled = false } + prepareJarSearchableOptions { + enabled = false + } verifyPlugin { enabled = false } + verifyPluginProjectConfiguration { + enabled = true + } publishPlugin { enabled = false } diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index ba55d25434..e5a994a3c2 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -81,6 +81,7 @@ dependencies { } + tasks { buildPlugin { archiveBaseName.set("lang.perl5") @@ -92,4 +93,13 @@ tasks { intoChild(intellijPlatform.projectName.map { projectName -> "$projectName/perl" }) .from(file("scripts")) } + + test { + dependencies { + intellijPlatform { + bundledModule("intellij.platform.coverage.agent") + bundledModule("intellij.profiler.common") + } + } + } } diff --git a/plugin/coverage/build.gradle.kts b/plugin/coverage/build.gradle.kts index 610ee21c85..40aafc18f7 100644 --- a/plugin/coverage/build.gradle.kts +++ b/plugin/coverage/build.gradle.kts @@ -26,5 +26,6 @@ dependencies { val platformVersionProvider: Provider by rootProject.extra create("IC", platformVersionProvider.get(), useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()) bundledPlugins(providers.gradleProperty("coveragePlugin").get()) + bundledModule("intellij.platform.coverage.agent") } } diff --git a/plugin/profiler/build.gradle.kts b/plugin/profiler/build.gradle.kts index 3ead87c53a..5a68166018 100644 --- a/plugin/profiler/build.gradle.kts +++ b/plugin/profiler/build.gradle.kts @@ -26,6 +26,7 @@ dependencies { intellijPlatform { val platformVersionProvider: Provider by rootProject.extra create("IU", platformVersionProvider.get(), useInstaller = properties("useInstaller").get().toBoolean()) + bundledModule("intellij.profiler.common") } }