Merge pull request jMonkeyEngine#621 from tonihele/bugfix/issue-620

Fix jME tests template and Ant BasicGame template
tonihele · Nov 3, 2024 · c0f3794 · c0f3794
2 parents bdb7db8 + 9daafdb
commit c0f3794
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/BasicGameTemplate/nbproject/project.properties b/BasicGameTemplate/nbproject/project.properties
@@ -43,7 +43,8 @@ javac.classpath=\
     ${libs.jme3-effects.classpath}:\
     ${libs.jme3-terrain.classpath}:\
     ${libs.jme3-jbullet.classpath}:\
-    ${libs.jme3-awt-dialogs.classpath}
+    ${libs.jme3-awt-dialogs.classpath}:\
+    ${libs.jme3-plugins-json.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

diff --git a/JME3TestsTemplate/nbproject/project.properties b/JME3TestsTemplate/nbproject/project.properties
@@ -26,7 +26,7 @@ includes=**
 jar.compress=false
 javac.classpath=\
     ${libs.jme3-jogg.classpath}:\
-    ${libs.jme3-blender.classpath}:\
+    ${libs.jme3-plugins-json.classpath}:\
     ${libs.jme3-networking.classpath}:\
     ${libs.jme3-plugins.classpath}:\
     ${libs.jme3-core.classpath}:\

diff --git a/build.gradle b/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     corelibs dep("org.jmonkeyengine:jme3-core:$jmeVersion-$jmeVersionTag", true, true)
     corelibs dep("org.jmonkeyengine:jme3-desktop:$jmeVersion-$jmeVersionTag", true, true)
     corelibs dep("org.jmonkeyengine:jme3-awt-dialogs:$jmeVersion-$jmeVersionTag", true, true)
+    corelibs dep("org.jmonkeyengine:jme3-plugins-json:$jmeVersion-$jmeVersionTag", true, true)
     corelibs dep("org.jmonkeyengine:jme3-lwjgl:$jmeVersion-$jmeVersionTag", true, true)
     corelibs dep("org.jmonkeyengine:jme3-effects:$jmeVersion-$jmeVersionTag", true, true)
     corelibs dep("com.github.stephengold:Minie:8.0.0", false, false) // replacement for bullet-native

diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -12,7 +12,7 @@ app.version=3.6.0-make_texture_panel_resizable-SNAPSHOT
 plugins.version=3.6.0
 nbm.revision=2401
 #command line args
-run.args.extra=-J-Dsun.java2d.noddraw\=true -J--add-opens\=java.base/java.net\=ALL-UNNAMED -J--add-exports\=java.desktop/sun.awt\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing.text\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing\=ALL-UNNAMED -J--add-opens\=java.prefs/java.util.prefs\=ALL-UNNAMED -J--add-opens\=java.base/java.security\=ALL-UNNAMED -J--add-exports\=java.base/sun.reflect.annotation\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing.plaf.basic\=ALL-UNNAMED -J--add-opens\=java.desktop/java.awt\=ALL-UNNAMED -J--add-opens\=java.desktop/java.awt.event\=ALL-UNNAMED -J--add-opens\=java.desktop/sun.awt.X11\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing.plaf.synth\=ALL-UNNAMED -J--add-opens\=java.desktop/com.sun.java.swing.plaf.gtk\=ALL-UNNAMED -J--add-opens\=java.desktop/sun.awt.shell\=ALL-UNNAMED -J--add-opens\=java.desktop/sun.awt.im\=ALL-UNNAMED -J--add-exports\=java.desktop/java.awt.peer\=ALL-UNNAMED -J--add-exports\=java.desktop/com.sun.beans.editors\=ALL-UNNAMED -J--add-exports\=java.desktop/sun.swing\=ALL-UNNAMED -J--add-exports\=java.desktop/sun.awt.im\=ALL-UNNAMED -J--add-exports\=java.desktop/com.sun.java.swing.plaf.motif\=ALL-UNNAMED -J--add-exports\=java.desktop/com.apple.eio\=ALL-UNNAMED -J--add-opens\=java.base/java.io\=ALL-UNNAMED -J--add-opens\=java.base/java.lang\=ALL-UNNAMED
+run.args.extra=-J-Dsun.java2d.noddraw\=true -J--add-opens\=java.base/java.net\=ALL-UNNAMED -J--add-exports\=java.desktop/sun.awt\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing.text\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing\=ALL-UNNAMED -J--add-opens\=java.prefs/java.util.prefs\=ALL-UNNAMED -J--add-opens\=java.base/java.security\=ALL-UNNAMED -J--add-exports\=java.base/sun.reflect.annotation\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing.plaf.basic\=ALL-UNNAMED -J--add-opens\=java.desktop/java.awt\=ALL-UNNAMED -J--add-opens\=java.desktop/java.awt.event\=ALL-UNNAMED -J--add-opens\=java.desktop/sun.awt.X11\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing.plaf.synth\=ALL-UNNAMED -J--add-opens\=java.desktop/com.sun.java.swing.plaf.gtk\=ALL-UNNAMED -J--add-opens\=java.desktop/sun.awt.shell\=ALL-UNNAMED -J--add-opens\=java.desktop/sun.awt.im\=ALL-UNNAMED -J--add-exports\=java.desktop/java.awt.peer\=ALL-UNNAMED -J--add-exports\=java.desktop/com.sun.beans.editors\=ALL-UNNAMED -J--add-exports\=java.desktop/sun.swing\=ALL-UNNAMED -J--add-exports\=java.desktop/sun.awt.im\=ALL-UNNAMED -J--add-exports\=java.desktop/com.sun.java.swing.plaf.motif\=ALL-UNNAMED -J--add-exports\=java.desktop/com.apple.eio\=ALL-UNNAMED -J--add-opens\=java.base/java.io\=ALL-UNNAMED -J--add-opens\=java.base/java.lang\=ALL-UNNAMED -J--add-exports\=jdk.internal.opt/jdk.internal.opt\=ALL-UNNAMED
 auxiliary.org-netbeans-modules-apisupport-installer.license-file=license-jme.txt
 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true
 auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true