mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IJPL-162433 Compose Desktop is on platform class loader
GitOrigin-RevId: 361ec1beb1a3ff16a220b53f573bb73ee4cf1383
This commit is contained in:
committed by
intellij-monorepo-bot
parent
225e2f6693
commit
68c03c29f1
@@ -7,7 +7,7 @@
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module-library" scope="RUNTIME">
|
||||
<orderEntry type="module-library" exported="">
|
||||
<library name="jetbrains.skiko.awt.runtime.all" type="repository">
|
||||
<properties include-transitive-deps="false" maven-id="org.jetbrains.skiko:skiko-awt-runtime-all:0.8.9">
|
||||
<verification>
|
||||
|
||||
@@ -51,7 +51,6 @@ fun getIdeSystemProperties(runDir: Path): VmProperties {
|
||||
"jna.nosys" to "true",
|
||||
"jna.noclasspath" to "true",
|
||||
"jb.vmOptionsFile" to "${Files.newDirectoryStream(runDir.parent, "*.vmoptions").use { it.singleOrNull() }}",
|
||||
"skiko.library.path" to "$libDir/skiko-awt-runtime-all",
|
||||
"compose.swing.render.on.graphics" to "true",
|
||||
)
|
||||
)
|
||||
|
||||
@@ -360,7 +360,6 @@ class BuildContextImpl internal constructor(
|
||||
// https://youtrack.jetbrains.com/issue/IDEA-269280
|
||||
jvmArgs.add("-Daether.connector.resumeDownloads=false")
|
||||
|
||||
jvmArgs.add("-Dskiko.library.path=${macroName}/lib/skiko-awt-runtime-all".let { if (isScript) '"' + it + '"' else it })
|
||||
jvmArgs.add("-Dcompose.swing.render.on.graphics=true")
|
||||
|
||||
jvmArgs.addAll(getCommandLineArgumentsForOpenPackages(this, os))
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
<module name="intellij.platform.smRunner.vcs"/>
|
||||
<module name="intellij.platform.collaborationTools"/>
|
||||
<module name="intellij.libraries.microba"/>
|
||||
<module name="intellij.libraries.skiko"/>
|
||||
<module name="intellij.libraries.compose.desktop"/>
|
||||
<module name="intellij.platform.compose"/>
|
||||
</content>
|
||||
|
||||
<xi:include href="/META-INF/vcs-modules.xml"/>
|
||||
|
||||
@@ -3,9 +3,6 @@
|
||||
<module name="intellij.platform.settings.local"/>
|
||||
<module name="intellij.libraries.ktor.client"/>
|
||||
<module name="intellij.libraries.ktor.client.cio"/>
|
||||
<module name="intellij.libraries.skiko" />
|
||||
<module name="intellij.libraries.compose.desktop" />
|
||||
<module name="intellij.platform.compose" />
|
||||
|
||||
<module name="intellij.platform.rpc.backend"/>
|
||||
<module name="intellij.platform.kernel.backend"/>
|
||||
|
||||
@@ -214,7 +214,6 @@ private fun getIdeSystemProperties(runDir: Path): Map<String, String> {
|
||||
// require bundled JNA dispatcher lib
|
||||
"jna.nosys" to "true",
|
||||
"jna.noclasspath" to "true",
|
||||
"skiko.library.path" to "$libDir/skiko-awt-runtime-all",
|
||||
"compose.swing.render.on.graphics" to "true",
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user