IJPL-224042 IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 intellij.libraries.compose.foundation.desktop.junit must not export the whole world

GitOrigin-RevId: 517993e03d14c4292e30f4d0958bece73a793d17
This commit is contained in:
Vladimir Krivosheev
2025-12-19 08:04:15 +00:00
committed by intellij-monorepo-bot
parent c64be88821
commit 4f459317e1
35 changed files with 75 additions and 13 deletions
+4
View File
@@ -25,6 +25,8 @@ jvm_library(
"//platform/analysis-api:analysis",
"@lib//:jetbrains-annotations",
"//libraries/kotlinx/coroutines/core",
"//libraries/compose-runtime-desktop",
"//libraries/skiko",
"@lib//:jetbrains-compose-components-ui-tooling-preview-desktop",
"//platform/diagnostic/telemetry",
],
@@ -57,6 +59,8 @@ jvm_library(
"//platform/analysis-api:analysis",
"@lib//:jetbrains-annotations",
"//libraries/kotlinx/coroutines/core",
"//libraries/compose-runtime-desktop",
"//libraries/skiko",
"@lib//:jetbrains-compose-components-ui-tooling-preview-desktop",
"@lib//:junit4",
"//platform/jewel/int-ui/int-ui-standalone:jewel-intUi-standalone",
@@ -41,6 +41,8 @@
<orderEntry type="module" module-name="intellij.platform.analysis" />
<orderEntry type="library" name="jetbrains-annotations" level="project" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.libraries.skiko" />
<orderEntry type="library" exported="" name="jetbrains.compose.components.ui.tooling.preview.desktop" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
<orderEntry type="module" module-name="intellij.platform.jewel.intUi.standalone" scope="TEST" />
@@ -34,6 +34,7 @@ jvm_library(
"//platform/jewel/ui",
"//libraries/compose-foundation-desktop",
"//platform/jewel/foundation",
"//libraries/compose-runtime-desktop",
"//platform/jewel/int-ui/int-ui-standalone:jewel-intUi-standalone",
"//libraries/jbr",
"@lib//:jna",
@@ -37,6 +37,7 @@
<orderEntry type="module" module-name="intellij.platform.jewel.ui" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" />
<orderEntry type="module" module-name="intellij.platform.jewel.foundation" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.platform.jewel.intUi.standalone" />
<orderEntry type="module" module-name="intellij.libraries.jbr" />
<orderEntry type="library" name="jna" level="project" />
@@ -37,6 +37,7 @@ jvm_library(
"//platform/jewel/ui",
"//platform/projectModel-api:projectModel",
"//platform/projectModel-impl",
"//libraries/compose-runtime-desktop",
"//platform/platform-api:ide",
"//platform/platform-impl:ide-impl",
"@lib//:jna",
@@ -71,6 +72,7 @@ jvm_library(
"//platform/jewel/ui:ui_test_lib",
"//platform/projectModel-api:projectModel",
"//platform/projectModel-impl",
"//libraries/compose-runtime-desktop",
"//platform/platform-api:ide",
"//platform/platform-impl:ide-impl",
"@lib//:jna",
@@ -41,6 +41,7 @@
<orderEntry type="module" module-name="intellij.platform.jewel.ui" exported="" />
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.platform.ide" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="library" name="jna" level="project" />
@@ -34,6 +34,7 @@ jvm_library(
"@lib//:jetbrains-annotations",
"//platform/jewel/ui",
"//libraries/compose-foundation-desktop",
"//libraries/compose-runtime-desktop",
"//platform/jewel/foundation",
"//libraries/jbr",
],
@@ -38,6 +38,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.jewel.ui" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.platform.jewel.foundation" />
<orderEntry type="module" module-name="intellij.libraries.jbr" />
</component>
+3
View File
@@ -41,6 +41,7 @@ jvm_library(
"@lib//:platform-jewel-markdown-core-org-commonmark-commonmark",
"//platform/jewel/foundation",
"//libraries/compose-foundation-desktop",
"//libraries/compose-runtime-desktop",
"//libraries/jsoup",
],
exports = ["@lib//:platform-jewel-markdown-core-org-commonmark-commonmark"],
@@ -64,6 +65,8 @@ jvm_library(
"//platform/jewel/foundation",
"//platform/jewel/foundation:foundation_test_lib",
"//libraries/compose-foundation-desktop",
"//libraries/junit4",
"//libraries/compose-runtime-desktop",
"//libraries/compose-foundation-desktop-junit",
"//libraries/jsoup",
],
@@ -57,6 +57,8 @@
</orderEntry>
<orderEntry type="module" module-name="intellij.platform.jewel.foundation" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" />
<orderEntry type="module" module-name="intellij.libraries.junit4" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop.junit" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.jsoup" />
</component>
@@ -58,6 +58,7 @@ jvm_library(
"//platform/jewel/foundation:foundation_test_lib",
"@lib//:platform-jewel-markdown-extensions-autolink-commonmark-ext-autolink",
"//libraries/compose-foundation-desktop",
"//libraries/junit4",
"//libraries/compose-foundation-desktop-junit",
],
plugins = ["@lib//:compose-plugin"]
@@ -65,6 +65,7 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" />
<orderEntry type="module" module-name="intellij.libraries.junit4" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop.junit" scope="TEST" />
</component>
</module>
@@ -35,6 +35,7 @@ jvm_library(
"//platform/jewel/ui",
"//platform/jewel/foundation",
"//libraries/compose-foundation-desktop",
"//libraries/compose-runtime-desktop",
],
plugins = ["@lib//:compose-plugin"]
)
@@ -56,7 +57,9 @@ jvm_library(
"//platform/jewel/foundation",
"//platform/jewel/foundation:foundation_test_lib",
"//libraries/compose-foundation-desktop",
"//libraries/compose-runtime-desktop",
"//libraries/compose-foundation-desktop-junit",
"//libraries/junit4",
],
plugins = ["@lib//:compose-plugin"]
)
@@ -39,6 +39,8 @@
<orderEntry type="module" module-name="intellij.platform.jewel.ui" />
<orderEntry type="module" module-name="intellij.platform.jewel.foundation" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop.junit" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.junit4" scope="TEST" />
</component>
</module>
@@ -35,6 +35,7 @@ jvm_library(
"//platform/jewel/ui",
"//platform/jewel/foundation",
"//libraries/compose-foundation-desktop",
"//libraries/compose-runtime-desktop",
"@lib//:platform-jewel-markdown-extensions-gfm_tables-commonmark-ext-gfm-tables",
],
plugins = ["@lib//:compose-plugin"]
@@ -38,6 +38,7 @@
<orderEntry type="module" module-name="intellij.platform.jewel.ui" />
<orderEntry type="module" module-name="intellij.platform.jewel.foundation" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module-library">
<library name="commonmark.ext.gfm.tables" type="repository">
<properties include-transitive-deps="false" maven-id="org.commonmark:commonmark-ext-gfm-tables:0.24.0">
@@ -35,6 +35,7 @@ jvm_library(
"//platform/jewel/ui",
"//platform/jewel/foundation",
"//libraries/coil",
"//libraries/compose-runtime-desktop",
"//libraries/ktor/client",
"//libraries/compose-foundation-desktop",
],
@@ -58,6 +59,9 @@ jvm_library(
"//platform/jewel/foundation",
"//platform/jewel/foundation:foundation_test_lib",
"//libraries/coil",
"//libraries/junit4",
"//libraries/compose-runtime-desktop",
"//libraries/kotlinx/coroutines/test",
"//libraries/compose-foundation-desktop-junit",
"//libraries/ktor/client",
"//libraries/compose-foundation-desktop",
@@ -39,6 +39,9 @@
<orderEntry type="module" module-name="intellij.platform.jewel.ui" />
<orderEntry type="module" module-name="intellij.platform.jewel.foundation" />
<orderEntry type="module" module-name="intellij.libraries.coil" />
<orderEntry type="module" module-name="intellij.libraries.junit4" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.test" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop.junit" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.ktor.client" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" />
@@ -44,6 +44,7 @@ jvm_library(
"//platform/jewel/markdown/core",
"//platform/jewel/ui",
"//platform/jewel/foundation",
"//libraries/compose-runtime-desktop",
"//platform/jewel/int-ui/int-ui-standalone:jewel-intUi-standalone",
"//libraries/compose-foundation-desktop",
":platform_jewel_markdown_extensions_gfm-alerts_provided",
@@ -37,6 +37,7 @@
<orderEntry type="module" module-name="intellij.platform.jewel.markdown.core" />
<orderEntry type="module" module-name="intellij.platform.jewel.ui" />
<orderEntry type="module" module-name="intellij.platform.jewel.foundation" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.platform.jewel.intUi.standalone" />
<orderEntry type="module" module-name="intellij.platform.jewel.markdown.extensions.gfmAlerts" scope="PROVIDED" />
<orderEntry type="module" module-name="intellij.platform.jewel.markdown.extensions.gfmTables" scope="PROVIDED" />
@@ -34,6 +34,7 @@ jvm_library(
"@lib//:jetbrains-annotations",
"//platform/jewel/ui",
"//platform/jewel/foundation",
"//libraries/compose-runtime-desktop",
"//platform/jewel/markdown/core",
"//libraries/compose-foundation-desktop",
"//libraries/skiko",
@@ -36,6 +36,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.jewel.ui" />
<orderEntry type="module" module-name="intellij.platform.jewel.foundation" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.platform.jewel.markdown.core" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" />
<orderEntry type="module" module-name="intellij.libraries.skiko" />
+3
View File
@@ -42,11 +42,14 @@ jvm_library(
"//platform/jewel/ui:ui_test_lib",
"//platform/jewel/int-ui/int-ui-standalone:jewel-intUi-standalone",
"//libraries/compose-foundation-desktop",
"//libraries/junit4",
"//libraries/compose-foundation-desktop-junit",
"@lib//:kotlin-stdlib",
"@lib//:kotlin-test",
"@lib//:kotlin-test-assertions-core-jvm",
"@lib//:kotlin-test-junit",
"//libraries/compose-runtime-desktop",
"//libraries/kotlinx/coroutines/test",
],
plugins = ["@lib//:compose-plugin"]
)
@@ -38,10 +38,13 @@
<orderEntry type="module" module-name="intellij.platform.jewel.ui" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.jewel.intUi.standalone" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.junit4" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop.junit" scope="TEST" />
<orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
<orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
<orderEntry type="library" scope="TEST" name="kotlin-test-assertions-core-jvm" level="project" />
<orderEntry type="library" scope="TEST" name="kotlin-test-junit" level="project" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.test" scope="TEST" />
</component>
</module>
+3
View File
@@ -42,6 +42,7 @@ jvm_library(
"@lib//:platform-jewel-ui-org-jetbrains-compose-components-components-resources",
"@lib//:platform-jewel-ui-org-jetbrains-compose-components-components-resources-desktop",
"//libraries/compose-foundation-desktop",
"//libraries/compose-runtime-desktop",
],
exports = [
"//platform/jewel/foundation",
@@ -69,6 +70,8 @@ jvm_library(
"@lib//:platform-jewel-ui-org-jetbrains-compose-components-components-resources",
"@lib//:platform-jewel-ui-org-jetbrains-compose-components-components-resources-desktop",
"//libraries/compose-foundation-desktop",
"//libraries/compose-runtime-desktop",
"//libraries/junit4",
"//libraries/compose-foundation-desktop-junit",
],
exports = [
@@ -80,6 +80,8 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop" exported="" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.libraries.junit4" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop.junit" scope="TEST" />
</component>
</module>
@@ -20,6 +20,7 @@ jvm_library(
"//platform/core-api:core",
"//jps/model-api:model",
"//platform/lang-core",
"//libraries/compose-runtime-desktop",
"//platform/projectModel-api:projectModel",
"//platform/util:util-ui",
"//platform/platform-api:ide",
@@ -39,6 +39,7 @@
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.jps.model" />
<orderEntry type="module" module-name="intellij.platform.lang.core" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.util.ui" />
@@ -50,6 +50,7 @@ jvm_library(
"//platform/lang-impl",
"//uast/uast-common:uast",
"//java/openapi:java",
"//libraries/skiko",
"//java/debugger/impl",
"//platform/ide-core-impl",
],
@@ -54,6 +54,7 @@
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.platform.uast" />
<orderEntry type="module" module-name="intellij.java" />
<orderEntry type="module" module-name="intellij.libraries.skiko" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" />
<orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
</component>
+10 -6
View File
@@ -44,10 +44,11 @@ jvm_library(
"//platform/projectModel-api:projectModel",
"//platform/execution-impl",
"@lib//:jediterm-core",
"@lib//:kotlin-reflect",
"@lib//:kotlinx-collections-immutable",
"//libraries/compose-runtime-desktop",
"//platform/statistics",
"//python/python-process-output:processOutput",
"//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
"//libraries/kotlin/reflect",
],
plugins = ["@lib//:compose-plugin"]
)
@@ -78,7 +79,6 @@ jvm_library(
"//python/openapi:community_test_lib",
"//platform/util:util-ui",
"//platform/editor-ui-api:editor-ui",
"//libraries/compose-foundation-desktop-junit",
"@lib//:kotlin-test",
"@lib//:kotlin-test-assertions-core-jvm",
"@lib//:kotlin-test-junit",
@@ -86,19 +86,23 @@ jvm_library(
"//platform/projectModel-api:projectModel",
"//platform/execution-impl",
"@lib//:jediterm-core",
"//libraries/compose-runtime-desktop",
"@lib//:io-mockk",
"@lib//:io-mockk-jvm",
"@lib//:kotlin-reflect",
"@lib//:kotlinx-collections-immutable",
"//platform/testFramework/junit5",
"//platform/testFramework/junit5:junit5_test_lib",
"@lib//:junit5",
"//platform/testFramework/common",
"//platform/statistics",
"//platform/statistics:statistics_test_lib",
"//python/python-process-output:processOutput",
"//python/junit5Tests-framework:community-junit5Tests-framework_test_lib",
"//libraries/compose-foundation-desktop-junit",
"//libraries/kotlinx/coroutines/debug",
"//libraries/junit5",
"//libraries/junit4",
"//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
"//libraries/kotlinx/coroutines/test",
"//libraries/kotlin/reflect",
],
plugins = ["@lib//:compose-plugin"]
)
@@ -44,7 +44,6 @@
<orderEntry type="module" module-name="intellij.python.community" />
<orderEntry type="module" module-name="intellij.platform.util.ui" />
<orderEntry type="module" module-name="intellij.platform.editor.ui" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop.junit" scope="TEST" />
<orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
<orderEntry type="library" scope="TEST" name="kotlin-test-assertions-core-jvm" level="project" />
<orderEntry type="library" scope="TEST" name="kotlin-test-junit" level="project" />
@@ -52,16 +51,20 @@
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="module" module-name="intellij.platform.execution.impl" />
<orderEntry type="library" name="jediterm-core" level="project" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="library" scope="TEST" name="io.mockk" level="project" />
<orderEntry type="library" scope="TEST" name="io.mockk.jvm" level="project" />
<orderEntry type="library" name="kotlin-reflect" level="project" />
<orderEntry type="library" name="kotlinx-collections-immutable" level="project" />
<orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
<orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
<orderEntry type="module" module-name="intellij.platform.testFramework.common" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
<orderEntry type="module" module-name="intellij.python.processOutput" />
<orderEntry type="module" module-name="intellij.python.community.junit5Tests.framework" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.compose.foundation.desktop.junit" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.debug" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.junit5" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.junit4" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
<orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.test" scope="TEST" />
<orderEntry type="module" module-name="intellij.libraries.kotlin.reflect" />
</component>
</module>
@@ -4,11 +4,11 @@ import androidx.compose.ui.test.assertCountEquals
import androidx.compose.ui.test.onAllNodesWithText
import androidx.compose.ui.text.AnnotatedString
import com.intellij.python.processOutput.impl.ProcessOutputTest
import kotlin.test.Test
import org.junit.Test
internal class InterTextTest : ProcessOutputTest() {
@Test
fun `string text is properly rendered`() = processOutputTest {
fun `string text is properly rendered`(): Unit = processOutputTest {
scaffoldTestContent {
InterText(text = DEFAULT_TEXT)
}
@@ -18,7 +18,7 @@ internal class InterTextTest : ProcessOutputTest() {
}
@Test
fun `annotated string text is properly rendered`() = processOutputTest {
fun `annotated string text is properly rendered`(): Unit = processOutputTest {
scaffoldTestContent {
InterText(text = AnnotatedString(DEFAULT_TEXT))
}
@@ -32,6 +32,7 @@ jvm_library(
"//platform/project/shared:project",
"//fleet/rpc",
"//platform/platform-api:ide",
"//libraries/compose-runtime-desktop",
"//platform/jewel/ui",
"//platform/jewel/ide-laf-bridge",
"//platform/compose",
@@ -45,6 +45,7 @@
<orderEntry type="module" module-name="intellij.platform.project" />
<orderEntry type="module" module-name="fleet.rpc" />
<orderEntry type="module" module-name="intellij.platform.ide" />
<orderEntry type="module" module-name="intellij.libraries.compose.runtime.desktop" />
<orderEntry type="module" module-name="intellij.platform.jewel.ui" />
<orderEntry type="module" module-name="intellij.platform.jewel.ideLafBridge" />
<orderEntry type="module" module-name="intellij.platform.compose" />