From 213c65881f430e6b9912160f2c67acec09db7344 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 12:34:33 +0200 Subject: [PATCH 01/16] Add export of com.sun.javafx.event to org.jabref --- CHANGELOG.md | 1 + build.gradle | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74997f56906..a64e663c4a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv ### Fixed - We fixed an issue where entry type with duplicate fields prevented opening existing libraries with custom entry types [#11127](https://github.com/JabRef/jabref/issues/11127) +- We fixed crash on opening the entry editor when auto completion is enabled. [#11188](https://github.com/JabRef/jabref/issues/11188) ### Removed diff --git a/build.gradle b/build.gradle index 2a2df14ce9f..553a0c29da4 100644 --- a/build.gradle +++ b/build.gradle @@ -393,6 +393,9 @@ compileJava { moduleOptions { // TODO: Remove access to internal api addExports = [ + // Fix for https://github.com/JabRef/jabref/issues/11188 + 'javafx.base/com.sun.javafx.event' : 'org.jabref', + 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', 'org.controlsfx.controls/impl.org.controlsfx.skin' : 'org.jabref' ] From 9f9bab9c3300ce4b494541bb447e95311f8a54b0 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 14:36:13 +0200 Subject: [PATCH 02/16] Works --- build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.gradle b/build.gradle index 553a0c29da4..f7f184df9c8 100644 --- a/build.gradle +++ b/build.gradle @@ -61,6 +61,9 @@ java { application { mainClass.set('org.jabref.Launcher') mainModule.set('org.jabref') + + applicationDefaultJvmArgs = + ['--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module'] } // Workaround for https://github.com/openjfx/javafx-gradle-plugin/issues/89 @@ -394,7 +397,9 @@ compileJava { // TODO: Remove access to internal api addExports = [ // Fix for https://github.com/JabRef/jabref/issues/11188 + 'javafx.base/com.sun.javafx.event' : 'org.controlsfx.controls', 'javafx.base/com.sun.javafx.event' : 'org.jabref', + 'javafx.base/com.sun.javafx.event' : 'org.jabref.merged.module', 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', 'org.controlsfx.controls/impl.org.controlsfx.skin' : 'org.jabref' @@ -406,6 +411,7 @@ run { // TODO: Remove access to internal api moduleOptions { addExports = [ + 'javafx.base/com.sun.javafx.event' : 'org.jabref', 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', 'org.controlsfx.controls/impl.org.controlsfx.skin' : 'org.jabref', @@ -424,6 +430,7 @@ run { ] addOpens = [ + 'javafx.base/com.sun.javafx.event' : 'org.jabref', 'javafx.controls/javafx.scene.control' : 'org.jabref', 'org.controlsfx.controls/org.controlsfx.control.textfield' : 'org.jabref', 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', From 1d96ea0f6ae50cbc1683c405395b48562cec99de Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 14:36:26 +0200 Subject: [PATCH 03/16] Remove other statements --- build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.gradle b/build.gradle index f7f184df9c8..e95295f2c30 100644 --- a/build.gradle +++ b/build.gradle @@ -397,9 +397,7 @@ compileJava { // TODO: Remove access to internal api addExports = [ // Fix for https://github.com/JabRef/jabref/issues/11188 - 'javafx.base/com.sun.javafx.event' : 'org.controlsfx.controls', 'javafx.base/com.sun.javafx.event' : 'org.jabref', - 'javafx.base/com.sun.javafx.event' : 'org.jabref.merged.module', 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', 'org.controlsfx.controls/impl.org.controlsfx.skin' : 'org.jabref' @@ -411,7 +409,6 @@ run { // TODO: Remove access to internal api moduleOptions { addExports = [ - 'javafx.base/com.sun.javafx.event' : 'org.jabref', 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', 'org.controlsfx.controls/impl.org.controlsfx.skin' : 'org.jabref', @@ -430,7 +427,6 @@ run { ] addOpens = [ - 'javafx.base/com.sun.javafx.event' : 'org.jabref', 'javafx.controls/javafx.scene.control' : 'org.jabref', 'org.controlsfx.controls/org.controlsfx.control.textfield' : 'org.jabref', 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', From 798d53205c5428d12f8615f590e5b118e4749f46 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 15:07:37 +0200 Subject: [PATCH 04/16] Add comment --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index e95295f2c30..47886aaf09c 100644 --- a/build.gradle +++ b/build.gradle @@ -63,6 +63,7 @@ application { mainModule.set('org.jabref') applicationDefaultJvmArgs = + // Fix for https://github.com/JabRef/jabref/issues/11188 ['--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module'] } From 346f6cba560aeff7fb26add3fa341622e318ebfd Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 15:07:45 +0200 Subject: [PATCH 05/16] Remove unneeded exports --- build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle b/build.gradle index 47886aaf09c..66a66fd858e 100644 --- a/build.gradle +++ b/build.gradle @@ -397,9 +397,6 @@ compileJava { moduleOptions { // TODO: Remove access to internal api addExports = [ - // Fix for https://github.com/JabRef/jabref/issues/11188 - 'javafx.base/com.sun.javafx.event' : 'org.jabref', - 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', 'org.controlsfx.controls/impl.org.controlsfx.skin' : 'org.jabref' ] From 333965b55c704ab301929d1da00e759f308b8cc3 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 20:27:40 +0200 Subject: [PATCH 06/16] Add some "--opens", too --- build.gradle | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 66a66fd858e..e996982b1e9 100644 --- a/build.gradle +++ b/build.gradle @@ -62,9 +62,19 @@ application { mainClass.set('org.jabref.Launcher') mainModule.set('org.jabref') - applicationDefaultJvmArgs = + applicationDefaultJvmArgs = [ + // On a change here, also adapt "run > moduleOptions" + // Fix for https://github.com/JabRef/jabref/issues/11188 - ['--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module'] + '--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module', + '--add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module', + '--add-exports=org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref.merged.module', + + // Fix for https://github.com/JabRef/jabref/issues/11198 + '--add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module', + '--add-opens=org.controlsfx.controls/org.controlsfx.control.textfield=org.jabref.merged.module', + '--add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module' + ] } // Workaround for https://github.com/openjfx/javafx-gradle-plugin/issues/89 @@ -403,14 +413,21 @@ compileJava { } } +// Configures "application > run" task run { // TODO: Remove access to internal api moduleOptions { + // On a change here, also adapt "application > applicationDefaultJvmArgs" addExports = [ + 'javafx.base/com.sun.javafx.event' : 'org.jabref.merged.module', 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', 'org.controlsfx.controls/impl.org.controlsfx.skin' : 'org.jabref', - // Not sure why we need to restate the controlfx exports + // We need to restate the ControlsFX exports, because we get following error otherwise: + // java.lang.IllegalAccessError: + // class org.controlsfx.control.textfield.AutoCompletionBinding (in module org.controlsfx.controls) + // cannot access class com.sun.javafx.event.EventHandlerManager (in module javafx.base) because + // module javafx.base does not export com.sun.javafx.event to module org.controlsfx.controls // Taken from here: https://github.com/controlsfx/controlsfx/blob/9.0.0/build.gradle#L1 'javafx.graphics/com.sun.javafx.scene' : 'org.controlsfx.controls', 'javafx.graphics/com.sun.javafx.scene.traversal' : 'org.controlsfx.controls', From c5db2600e0fecbede5850ef20f2e097514e5397e Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 20:35:37 +0200 Subject: [PATCH 07/16] Blindly add --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index e996982b1e9..1f120813675 100644 --- a/build.gradle +++ b/build.gradle @@ -71,6 +71,7 @@ application { '--add-exports=org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref.merged.module', // Fix for https://github.com/JabRef/jabref/issues/11198 + '--add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module', '--add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module', '--add-opens=org.controlsfx.controls/org.controlsfx.control.textfield=org.jabref.merged.module', '--add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module' From 87456586d8811607fe2297495b4181ef3d35df85 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 20:57:06 +0200 Subject: [PATCH 08/16] Remove some controlsfx --- build.gradle | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 1f120813675..019a9173524 100644 --- a/build.gradle +++ b/build.gradle @@ -68,12 +68,10 @@ application { // Fix for https://github.com/JabRef/jabref/issues/11188 '--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module', '--add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module', - '--add-exports=org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref.merged.module', // Fix for https://github.com/JabRef/jabref/issues/11198 '--add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module', '--add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module', - '--add-opens=org.controlsfx.controls/org.controlsfx.control.textfield=org.jabref.merged.module', '--add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module' ] } @@ -421,8 +419,7 @@ run { // On a change here, also adapt "application > applicationDefaultJvmArgs" addExports = [ 'javafx.base/com.sun.javafx.event' : 'org.jabref.merged.module', - 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', - 'org.controlsfx.controls/impl.org.controlsfx.skin' : 'org.jabref', + 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref' // We need to restate the ControlsFX exports, because we get following error otherwise: // java.lang.IllegalAccessError: @@ -444,7 +441,6 @@ run { addOpens = [ 'javafx.controls/javafx.scene.control' : 'org.jabref', - 'org.controlsfx.controls/org.controlsfx.control.textfield' : 'org.jabref', 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', 'javafx.controls/javafx.scene.control.skin' : 'org.controlsfx.controls', @@ -465,8 +461,7 @@ javadoc { version = false author = false addMultilineStringsOption("-add-exports").setValue([ - 'javafx.controls/com.sun.javafx.scene.control=org.jabref', - 'org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref' + 'javafx.controls/com.sun.javafx.scene.control=org.jabref' ]) } } From 4f7b6a33c6533febd71e5a16998f65c58dbae323 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 21:00:34 +0200 Subject: [PATCH 09/16] Add missing , --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 019a9173524..4c9972ac8c0 100644 --- a/build.gradle +++ b/build.gradle @@ -419,7 +419,7 @@ run { // On a change here, also adapt "application > applicationDefaultJvmArgs" addExports = [ 'javafx.base/com.sun.javafx.event' : 'org.jabref.merged.module', - 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref' + 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref', // We need to restate the ControlsFX exports, because we get following error otherwise: // java.lang.IllegalAccessError: From 69eb15721cdd14d6c0ab0c5c280b46ef10ce2bf4 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 21:39:35 +0200 Subject: [PATCH 10/16] Try Corretto --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4c9972ac8c0..c926d5a504c 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ java { // - .github/workflows/deployment-jdk-ea.yml#L53 languageVersion = JavaLanguageVersion.of(21) // See https://docs.gradle.org/current/javadoc/org/gradle/jvm/toolchain/JvmVendorSpec.html for a full list - // vendor = JvmVendorSpec.AMAZON + vendor = JvmVendorSpec.AMAZON } } From a825dbc7dcced622285916ee620eb3aa57c58734 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 21:49:24 +0200 Subject: [PATCH 11/16] Try to pass build arguments --- .github/workflows/deployment-arm64.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deployment-arm64.yml b/.github/workflows/deployment-arm64.yml index 7f18ceaa490..9f84d259b61 100644 --- a/.github/workflows/deployment-arm64.yml +++ b/.github/workflows/deployment-arm64.yml @@ -125,7 +125,7 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options --bind-services + --jlink-options --bind-services --add-options="--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" - name: Build pkg (macOS) if: (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash @@ -150,7 +150,7 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options --bind-services + --jlink-options --bind-services --add-options="--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" - name: Rename files with arm64 suffix as well if: (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash From 274eca7b9a42b0d91f39268788acf57c13dbff25 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 21:50:03 +0200 Subject: [PATCH 12/16] Port --- .github/workflows/deployment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 3b3ddf68bbb..06b4fced414 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -137,7 +137,7 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options --bind-services + --jlink-options --bind-services --add-options="--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" - name: Build pkg (macOS) if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash @@ -162,7 +162,7 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options --bind-services + --jlink-options --bind-services --add-options="--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" - name: Build runtime image and installer (linux, Windows) if: (matrix.os != 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash From 8b1c327d758881b745fe46daa783c6b093fd478e Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 21:55:25 +0200 Subject: [PATCH 13/16] Try " at other place --- .github/workflows/deployment-arm64.yml | 4 ++-- .github/workflows/deployment.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deployment-arm64.yml b/.github/workflows/deployment-arm64.yml index 9f84d259b61..e95882287f2 100644 --- a/.github/workflows/deployment-arm64.yml +++ b/.github/workflows/deployment-arm64.yml @@ -125,7 +125,7 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options --bind-services --add-options="--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" + --jlink-options "--bind-services --add-options=--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" - name: Build pkg (macOS) if: (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash @@ -150,7 +150,7 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options --bind-services --add-options="--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" + --jlink-options "--bind-services --add-options=--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" - name: Rename files with arm64 suffix as well if: (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 06b4fced414..74dae9bd84b 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -137,7 +137,7 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options --bind-services --add-options="--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" + --jlink-options "--bind-services --add-options=--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" - name: Build pkg (macOS) if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash @@ -162,7 +162,7 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options --bind-services --add-options="--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" + --jlink-options "--bind-services --add-options=--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" - name: Build runtime image and installer (linux, Windows) if: (matrix.os != 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash From 47b0d6bb4d0d91d2c1123da9f02bdd1fcf49f154 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 22:05:05 +0200 Subject: [PATCH 14/16] Try other way --- .github/workflows/deployment-arm64.yml | 14 ++++++++++++-- .github/workflows/deployment.yml | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deployment-arm64.yml b/.github/workflows/deployment-arm64.yml index e95882287f2..69c4ac284a5 100644 --- a/.github/workflows/deployment-arm64.yml +++ b/.github/workflows/deployment-arm64.yml @@ -125,7 +125,12 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options "--bind-services --add-options=--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" + --jlink-options --bind-services \ + --java-options --add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module \ + --java-options --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module \ + --java-options --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module \ + --java-options --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module \ + --java-options --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module - name: Build pkg (macOS) if: (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash @@ -150,7 +155,12 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options "--bind-services --add-options=--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" + --jlink-options --bind-services \ + --java-options --add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module \ + --java-options --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module \ + --java-options --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module \ + --java-options --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module \ + --java-options --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module - name: Rename files with arm64 suffix as well if: (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 74dae9bd84b..c61282d61c0 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -137,7 +137,12 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options "--bind-services --add-options=--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" + --jlink-options --bind-services \ + --java-options --add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module \ + --java-options --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module \ + --java-options --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module \ + --java-options --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module \ + --java-options --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module - name: Build pkg (macOS) if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash @@ -162,7 +167,12 @@ jobs: --icon src/main/resources/icons/jabref.icns \ --resource-dir buildres/mac \ --file-associations buildres/mac/bibtexAssociations.properties \ - --jlink-options "--bind-services --add-options=--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module" + --jlink-options --bind-services \ + --java-options --add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module \ + --java-options --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module \ + --java-options --add-opens=javafx.graphics/javafx.scene=org.jabref.merged.module \ + --java-options --add-opens=javafx.controls/javafx.scene.control=org.jabref.merged.module \ + --java-options --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref.merged.module - name: Build runtime image and installer (linux, Windows) if: (matrix.os != 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash From 462ff5b2037746ae9e9febe310176ed05902d43c Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 15 Apr 2024 22:06:33 +0200 Subject: [PATCH 15/16] Add hint --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c926d5a504c..b571e07740a 100644 --- a/build.gradle +++ b/build.gradle @@ -63,7 +63,10 @@ application { mainModule.set('org.jabref') applicationDefaultJvmArgs = [ - // On a change here, also adapt "run > moduleOptions" + // On a change here, also adapt + // 1. "run > moduleOptions" + // 2. "deployment.yml" (macOS part) + // 3. "deployment-arm64.yml" // Fix for https://github.com/JabRef/jabref/issues/11188 '--add-exports=javafx.base/com.sun.javafx.event=org.jabref.merged.module', From cff1f640734f38506ce9bf453e651252538187d0 Mon Sep 17 00:00:00 2001 From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com> Date: Mon, 15 Apr 2024 22:46:19 +0200 Subject: [PATCH 16/16] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 16237d47930..bf4c32a3b01 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ java { // - .github/workflows/deployment-jdk-ea.yml#L53 languageVersion = JavaLanguageVersion.of(21) // See https://docs.gradle.org/current/javadoc/org/gradle/jvm/toolchain/JvmVendorSpec.html for a full list - vendor = JvmVendorSpec.AMAZON + // vendor = JvmVendorSpec.AMAZON } }