diff --git a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/PackagingContentChecker.kt b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/PackagingContentChecker.kt index f3cb2a965691..2633d032dc5a 100644 --- a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/PackagingContentChecker.kt +++ b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/PackagingContentChecker.kt @@ -1,5 +1,5 @@ // Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -@file:Suppress("ReplaceGetOrSet") +@file:Suppress("ReplaceGetOrSet", "DestructuringDeclaration") package com.intellij.platform.buildScripts.testFramework.distributionContent diff --git a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/contentChecker.kt b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/contentChecker.kt index e4e5f9e1fd51..577dedc07234 100644 --- a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/contentChecker.kt +++ b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/distributionContent/contentChecker.kt @@ -16,7 +16,6 @@ import org.assertj.core.util.diff.DiffUtils import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.util.JpsPathUtil -import org.opentest4j.MultipleFailuresError import java.nio.file.Files import java.nio.file.NoSuchFileException import java.nio.file.Path @@ -136,15 +135,6 @@ fun collectPluginContentFailures( } } -@Internal -fun assertNoPackagingCheckFailures(problemMessage: String, failures: List) { - when (failures.size) { - 0 -> return - 1 -> throw failures.single().error - else -> throw MultipleFailuresError(problemMessage, failures.map { wrapFailureWithName(it) }) - } -} - private fun collectPluginContentCategoryFailures( fileEntries: Sequence, project: JpsProject, @@ -203,10 +193,6 @@ private fun collectPluginContentCategoryFailures( return failures } -private fun wrapFailureWithName(failure: PackagingCheckFailure): Throwable { - return AssertionError(failure.name, failure.error) -} - private fun toPluginContentMap(contentList: List): Map { val result = LinkedHashMap(contentList.size) for (item in contentList) { diff --git a/plugins/javaFX/community/plugin-content.yaml b/plugins/javaFX/community/plugin-content.yaml index 62463b28d520..1e07b8370c34 100644 --- a/plugins/javaFX/community/plugin-content.yaml +++ b/plugins/javaFX/community/plugin-content.yaml @@ -9,13 +9,15 @@ - name: intellij.javaFX.community contentModules: - name: intellij.javaFX.properties - - name: intellij.platform.commercial.verifier - name: lib/modules/intellij.javaFX.css.jar contentModules: - name: intellij.javaFX.css - name: lib/modules/intellij.javaFX.jar contentModules: - name: intellij.javaFX +- name: lib/modules/intellij.platform.commercial.verifier.jar + contentModules: + - name: intellij.platform.commercial.verifier - name: lib/rt/sceneBuilderBridge.jar modules: - - name: intellij.javaFX.sceneBuilder \ No newline at end of file + - name: intellij.javaFX.sceneBuilder