From 7d3baebb0cbed2c12cfbefe7eb7785c310a3c932 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 11:52:57 +0000 Subject: [PATCH 1/3] Build(deps): bump org.jetbrains.intellij.platform from 2.1.0 to 2.2.1 Bumps org.jetbrains.intellij.platform from 2.1.0 to 2.2.1. --- updated-dependencies: - dependency-name: org.jetbrains.intellij.platform dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index eb35ffa0..958ba86e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,5 +19,5 @@ junixsocket = ["junixsocket-common", "junixsocket-native-common"] changelog = "org.jetbrains.changelog:2.2.1" gradleJvmWrapper = "me.filippov.gradle.jvm.wrapper:0.14.0" grammarkit = "org.jetbrains.grammarkit:2022.3.2.2" -intellijPlatform = "org.jetbrains.intellij.platform:2.1.0" +intellijPlatform = "org.jetbrains.intellij.platform:2.2.1" kotlin = { id = "org.jetbrains.kotlin.jvm", version = "2.0.0" } From 07fe6f5f648404e33115ae28a506668794fdd05f Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Thu, 6 Feb 2025 23:33:30 +0100 Subject: [PATCH 2/3] Build: fix after intellij-platform-gradle-plugin update --- build.gradle.kts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3b3010ee..1890af9f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,6 +4,7 @@ import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask import org.jetbrains.kotlin.gradle.dsl.JvmTarget import java.security.MessageDigest import java.util.zip.ZipFile +import kotlin.io.path.pathString plugins { id("java") @@ -61,8 +62,11 @@ dependencies { intellijPlatform { intellijIdeaCommunity(libs.versions.intellij) bundledPlugins("org.intellij.intelliLang", "org.jetbrains.plugins.terminal") - instrumentationTools() - testFramework(TestFrameworkType.Bundled) + bundledLibrary(provider { + // TODO: This is a workaround, remove in intellij-platform-gradle-plugin 2.2.2 + project.intellijPlatform.platformPath.resolve("lib/testFramework.jar").pathString + }) + testFramework(TestFrameworkType.Platform) pluginVerifier() } From cddac3a92e43ab0785b0ac27a37242a962e666ca Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Thu, 6 Feb 2025 23:55:40 +0100 Subject: [PATCH 3/3] (#340) Connect a TODO with the issue --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1890af9f..e75950b8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -63,7 +63,7 @@ dependencies { intellijIdeaCommunity(libs.versions.intellij) bundledPlugins("org.intellij.intelliLang", "org.jetbrains.plugins.terminal") bundledLibrary(provider { - // TODO: This is a workaround, remove in intellij-platform-gradle-plugin 2.2.2 + // TODO[#340]: This is a workaround, remove in intellij-platform-gradle-plugin 2.2.2 project.intellijPlatform.platformPath.resolve("lib/testFramework.jar").pathString }) testFramework(TestFrameworkType.Platform)