Skip to content

Commit 90e5025

Browse files
authored
Move module tweaking of merged module to launcher (#13303)
* Move module tweaking of merged module to launcher * Move --enable-native-acess for merged module
1 parent d477101 commit 90e5025

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

jabgui/build.gradle.kts

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,6 @@ application {
169169
"-XX:+UseZGC", "-XX:+ZUncommit",
170170
"-XX:+UseStringDeduplication",
171171

172-
// Fix for https://github.com/JabRef/jabref/issues/11188
173-
"--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module",
174-
"--add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module",
175-
176-
// Fix for https://github.com/JabRef/jabref/issues/11198
177-
"--add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module",
178-
"--add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module",
179-
"--add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module",
180-
// fix for https://github.com/JabRef/jabref/issues/11426
181-
"--add-opens=javafx.controls/javafx.scene.control.skin=org.jabref.merged.module",
182-
183172
// Fix for https://github.com/JabRef/jabref/issues/11225 on linux
184173
"--add-opens=javafx.controls/javafx.scene.control=org.jabref",
185174
"--add-exports=javafx.base/com.sun.javafx.event=org.jabref",
@@ -191,7 +180,7 @@ application {
191180
"--add-opens=javafx.base/javafx.collections=org.jabref",
192181
"--add-opens=javafx.base/javafx.collections.transformation=org.jabref",
193182

194-
"--enable-native-access=org.jabref.merged.module,ai.djl.tokenizers,ai.djl.pytorch_engine,com.sun.jna,javafx.graphics,javafx.media,javafx.web,org.apache.lucene.core"
183+
"--enable-native-access=ai.djl.tokenizers,ai.djl.pytorch_engine,com.sun.jna,javafx.graphics,javafx.media,javafx.web,org.apache.lucene.core"
195184
)
196185
}
197186

@@ -244,8 +233,21 @@ jlink {
244233
)
245234

246235
launcher {
247-
name =
248-
"JabRef"
236+
name = "JabRef"
237+
jvmArgs = listOf(
238+
// Fix for https://github.com/JabRef/jabref/issues/11188
239+
"--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module",
240+
"--add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module",
241+
242+
// Fix for https://github.com/JabRef/jabref/issues/11198
243+
"--add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module",
244+
"--add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module",
245+
"--add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module",
246+
// fix for https://github.com/JabRef/jabref/issues/11426
247+
"--add-opens=javafx.controls/javafx.scene.control.skin=org.jabref.merged.module",
248+
249+
"--enable-native-access=org.jabref.merged.module"
250+
)
249251
}
250252

251253
// TODO: Remove as soon as dependencies are fixed (upstream)

0 commit comments

Comments
 (0)