Merge branch 'gluonhq:master' into issue-369

gluonhq · Dec 22, 2024 · bda6925 · bda6925
2 parents abe85a2 + 39688b6
commit bda6925
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 2 deletions.
diff --git a/.github/scripts/jpackage.bat b/.github/scripts/jpackage.bat
@@ -23,6 +23,7 @@ REM set MODULES=java.desktop,java.logging,java.naming,java.prefs,java.security.j
 --runtime-image app/target/runtime ^
 --dest %INSTALL_DIR% ^
 --type msi ^
+--java-options "-Djavafx.allowjs=true" ^
 --java-options "--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED" ^
 --java-options "-Djava.library.path=runtime\bin;runtime\lib" ^
 --icon app/assets/windows/icon-windows.ico ^

diff --git a/.github/workflows/bundles-linux.yml b/.github/workflows/bundles-linux.yml
@@ -77,6 +77,7 @@ jobs:
           .github/scripts/jpackage.sh \
             --icon app/assets/linux/icon-linux.png \
             --java-options '"-Djdk.gtk.version=2"' \
+            --java-options '"-Djavafx.allowjs=true"' \
             --java-options '"--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED"' \
             --java-options '"-Djava.library.path=/opt/scenebuilder/lib/runtime/bin:/opt/scenebuilder/lib/runtime/lib"' \
             --linux-menu-group '"Development;Building;GUIDesigner;Java;"' \

diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml
@@ -88,6 +88,7 @@ jobs:
         run: |
           .github/scripts/jpackage.sh \
             --icon app/assets/osx/icon-mac.icns \
+            --java-options '"-Djavafx.allowjs=true"' \
             --java-options '"--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED"' \
             --type dmg \
             --mac-package-identifier com.gluonhq.scenebuilder \

diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml
@@ -89,6 +89,7 @@ jobs:
         run: |
           .github/scripts/jpackage.sh \
             --icon app/assets/osx/icon-mac.icns \
+            --java-options '"-Djavafx.allowjs=true"' \
             --java-options '"--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED"' \
             --type dmg \
             --mac-package-identifier com.gluonhq.scenebuilder \

diff --git a/kit/src/test/resources/com/oracle/javafx/scenebuilder/kit/fxom/HeaderWithNotOnlyImports.fxml b/kit/src/test/resources/com/oracle/javafx/scenebuilder/kit/fxom/HeaderWithNotOnlyImports.fxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?language nameOfScriptLanguage?>
+<?language javascript?>
 
 <!-- This could be a license header -->
 

diff --git a/pom.xml b/pom.xml
@@ -80,6 +80,7 @@
                     <configuration>
                         <mainClass>${main.class.name}</mainClass>
                         <options>
+                            <option>-Djavafx.allowjs=true</option>
                             <option>--add-opens=javafx.fxml/javafx.fxml=com.gluonhq.scenebuilder.app</option>
                             <option>--add-opens=javafx.fxml/javafx.fxml=com.gluonhq.scenebuilder.kit</option>
                             <option>--add-opens=javafx.controls/com.sun.javafx.scene.control.skin.caspian=com.gluonhq.scenebuilder.kit</option>
@@ -139,7 +140,7 @@
                     <configuration>
                         <reuseForks>false</reuseForks>
                         <forkCount>1</forkCount>
-                        <argLine>--add-opens=javafx.fxml/javafx.fxml=com.gluonhq.scenebuilder.kit</argLine>
+                        <argLine>--add-opens=javafx.fxml/javafx.fxml=com.gluonhq.scenebuilder.kit -Djavafx.allowjs=true</argLine>
                     </configuration>
                 </plugin>
             </plugins>