diff --git a/.github/actions/build-installers/action.yml b/.github/actions/build-installers/action.yml index 6752d3711..1aeaee9e1 100644 --- a/.github/actions/build-installers/action.yml +++ b/.github/actions/build-installers/action.yml @@ -15,10 +15,10 @@ inputs: runs: using: "composite" steps: - - name: Set up JDK 21 # NBPackage requires JDK + - name: Set up JDK 25 # NBPackage requires JDK uses: actions/setup-java@v5 with: - java-version: '21' + java-version: '25' distribution: 'temurin' - name: Download bundle diff --git a/.github/actions/build-sdk/action.yml b/.github/actions/build-sdk/action.yml index 641fbe58c..0fb34ffa4 100644 --- a/.github/actions/build-sdk/action.yml +++ b/.github/actions/build-sdk/action.yml @@ -14,10 +14,10 @@ inputs: runs: using: "composite" steps: - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: - java-version: '21' + java-version: '25' distribution: 'temurin' - name: Validate the Gradle wrapper diff --git a/BasicGameTemplate/nbproject/project.properties b/BasicGameTemplate/nbproject/project.properties index f3c44b70d..df9f65a01 100644 --- a/BasicGameTemplate/nbproject/project.properties +++ b/BasicGameTemplate/nbproject/project.properties @@ -51,8 +51,8 @@ javac.compilerargs= javac.deprecation=false javac.processorpath=\ ${javac.classpath} -javac.source=21 -javac.target=21 +javac.source=25 +javac.target=25 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/JME3TestsTemplate/nbproject/project.properties b/JME3TestsTemplate/nbproject/project.properties index 9c88d6ff3..58dae8aa3 100644 --- a/JME3TestsTemplate/nbproject/project.properties +++ b/JME3TestsTemplate/nbproject/project.properties @@ -42,8 +42,8 @@ javac.classpath=\ # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false -javac.source=21 -javac.target=21 +javac.source=25 +javac.target=25 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/installers/download-jdks.sh b/installers/download-jdks.sh index 549a69a45..540e33b3e 100755 --- a/installers/download-jdks.sh +++ b/installers/download-jdks.sh @@ -4,7 +4,7 @@ set -e # Quit on Error -jdk_major_version="21" +jdk_major_version="25" jvm_impl="hotspot" jdk_vendor="eclipse" diff --git a/jme3-android/nbproject/project.properties b/jme3-android/nbproject/project.properties index 1ace752eb..279176cfa 100644 --- a/jme3-android/nbproject/project.properties +++ b/jme3-android/nbproject/project.properties @@ -1,6 +1,6 @@ #Updated by build script #Thu, 25 Aug 2011 21:00:54 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-angelfont/nbproject/project.properties b/jme3-angelfont/nbproject/project.properties index 7316056ce..92a7dd8ed 100644 --- a/jme3-angelfont/nbproject/project.properties +++ b/jme3-angelfont/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:50 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial nbm.homepage=https://www.jmonkeyengine.org nbm.module.author=Normen Hansen diff --git a/jme3-assetbrowser/nbproject/project.properties b/jme3-assetbrowser/nbproject/project.properties index def3d2911..70f1d5b44 100644 --- a/jme3-assetbrowser/nbproject/project.properties +++ b/jme3-assetbrowser/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-assetpack-support/nbproject/project.properties b/jme3-assetpack-support/nbproject/project.properties index 712cc5326..73c1fb775 100644 --- a/jme3-assetpack-support/nbproject/project.properties +++ b/jme3-assetpack-support/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-autodesk/nbproject/platform.properties b/jme3-autodesk/nbproject/platform.properties index 67ee64ae7..2fc4baf25 100644 --- a/jme3-autodesk/nbproject/platform.properties +++ b/jme3-autodesk/nbproject/platform.properties @@ -129,8 +129,8 @@ nbplatform.active=default #need these in the file for all dependencies to resolve when using command line #ant and a download of the platform, same as those generated by netbeans platform #under ${user.properties.file} (defined in platform-private.properties) -default.javac.source=21 -default.javac.target=21 +default.javac.source=25 +default.javac.target=25 libs.absolutelayout.classpath=${nbplatform.default.netbeans.dest.dir}/java/modules/ext/AbsoluteLayout.jar libs.absolutelayout.javadoc= libs.absolutelayout.maven-pom= diff --git a/jme3-autodesk/nbproject/project.properties b/jme3-autodesk/nbproject/project.properties index ce0ba091e..e77aa92fa 100644 --- a/jme3-autodesk/nbproject/project.properties +++ b/jme3-autodesk/nbproject/project.properties @@ -1,5 +1,5 @@ auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial spec.version.base=3.6.1 diff --git a/jme3-cinematics/nbproject/project.properties b/jme3-cinematics/nbproject/project.properties index 95d4dabce..4527a4e06 100644 --- a/jme3-cinematics/nbproject/project.properties +++ b/jme3-cinematics/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:50 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-code-check/nbproject/project.properties b/jme3-code-check/nbproject/project.properties index 0213ae6c1..f91bbffba 100644 --- a/jme3-code-check/nbproject/project.properties +++ b/jme3-code-check/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:50 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-codepalette/nbproject/project.properties b/jme3-codepalette/nbproject/project.properties index 712cc5326..73c1fb775 100644 --- a/jme3-codepalette/nbproject/project.properties +++ b/jme3-codepalette/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-core-baselibs/nbproject/project.properties b/jme3-core-baselibs/nbproject/project.properties index fbcab5ea4..ca6706caa 100644 --- a/jme3-core-baselibs/nbproject/project.properties +++ b/jme3-core-baselibs/nbproject/project.properties @@ -1,4 +1,4 @@ -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-core-libraries/nbproject/project.properties b/jme3-core-libraries/nbproject/project.properties index d1eea1307..d3b5d59aa 100644 --- a/jme3-core-libraries/nbproject/project.properties +++ b/jme3-core-libraries/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:48 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-core-updatecenters/nbproject/project.properties b/jme3-core-updatecenters/nbproject/project.properties index 8555c2630..fe985af70 100644 --- a/jme3-core-updatecenters/nbproject/project.properties +++ b/jme3-core-updatecenters/nbproject/project.properties @@ -1,4 +1,4 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial spec.version.base=3.5.2 diff --git a/jme3-core/nbproject/project.properties b/jme3-core/nbproject/project.properties index 12cdd5ff2..c1b5897f3 100644 --- a/jme3-core/nbproject/project.properties +++ b/jme3-core/nbproject/project.properties @@ -1,7 +1,7 @@ #Thu, 25 Aug 2011 20:26:48 +0200 file.reference.DDSUtils.jar=release/modules/ext/DDSUtils.jar #Thu, 25 Aug 2011 19:32:54 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-dark-laf/nbproject/project.properties b/jme3-dark-laf/nbproject/project.properties index e389d229c..4fed28fac 100644 --- a/jme3-dark-laf/nbproject/project.properties +++ b/jme3-dark-laf/nbproject/project.properties @@ -1,5 +1,5 @@ file.reference.nimrodlf.jar=release/modules/ext/nimrodlf.jar -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-desktop-executables/nbproject/project.properties b/jme3-desktop-executables/nbproject/project.properties index 712cc5326..73c1fb775 100644 --- a/jme3-desktop-executables/nbproject/project.properties +++ b/jme3-desktop-executables/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-documentation/nbproject/project.properties b/jme3-documentation/nbproject/project.properties index 95d6f8ca0..5057bdad8 100644 --- a/jme3-documentation/nbproject/project.properties +++ b/jme3-documentation/nbproject/project.properties @@ -1,4 +1,4 @@ -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-glsl-highlighter/nbproject/project.properties b/jme3-glsl-highlighter/nbproject/project.properties index e379e8913..bcebad845 100644 --- a/jme3-glsl-highlighter/nbproject/project.properties +++ b/jme3-glsl-highlighter/nbproject/project.properties @@ -1,3 +1,3 @@ -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint:-serial project.license=jme license diff --git a/jme3-gui/nbproject/project.properties b/jme3-gui/nbproject/project.properties index 60152d079..22eb832af 100644 --- a/jme3-gui/nbproject/project.properties +++ b/jme3-gui/nbproject/project.properties @@ -9,7 +9,7 @@ file.reference.slf4j-simple-1.7.7.jar=release/modules/ext/slf4j-simple-1.7.7.jar file.reference.swingtonifty.jar=release/modules/ext/swingtonifty.jar file.reference.xsom-20110101-SNAPSHOT.jar=release/modules/ext/xsom-20110101-SNAPSHOT.jar #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-lwjgl-applet/nbproject/project.properties b/jme3-lwjgl-applet/nbproject/project.properties index 712cc5326..73c1fb775 100644 --- a/jme3-lwjgl-applet/nbproject/project.properties +++ b/jme3-lwjgl-applet/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-materialeditor/nbproject/project.properties b/jme3-materialeditor/nbproject/project.properties index 712cc5326..73c1fb775 100644 --- a/jme3-materialeditor/nbproject/project.properties +++ b/jme3-materialeditor/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-model-importer/nbproject/project.properties b/jme3-model-importer/nbproject/project.properties index 712cc5326..73c1fb775 100644 --- a/jme3-model-importer/nbproject/project.properties +++ b/jme3-model-importer/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-navmesh-gen/nbproject/project.properties b/jme3-navmesh-gen/nbproject/project.properties index fe30131fe..4a8f7302b 100644 --- a/jme3-navmesh-gen/nbproject/project.properties +++ b/jme3-navmesh-gen/nbproject/project.properties @@ -1,4 +1,4 @@ -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-obfuscate/nbproject/project.properties b/jme3-obfuscate/nbproject/project.properties index 59538f1be..f5ed02174 100644 --- a/jme3-obfuscate/nbproject/project.properties +++ b/jme3-obfuscate/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:50 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https\://proguard.sourceforge.net/ diff --git a/jme3-project-baselibs/nbproject/project.properties b/jme3-project-baselibs/nbproject/project.properties index d1eea1307..d3b5d59aa 100644 --- a/jme3-project-baselibs/nbproject/project.properties +++ b/jme3-project-baselibs/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:48 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-project-libraries/nbproject/project.properties b/jme3-project-libraries/nbproject/project.properties index d1eea1307..d3b5d59aa 100644 --- a/jme3-project-libraries/nbproject/project.properties +++ b/jme3-project-libraries/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:48 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-project-testdata/nbproject/project.properties b/jme3-project-testdata/nbproject/project.properties index d1eea1307..d3b5d59aa 100644 --- a/jme3-project-testdata/nbproject/project.properties +++ b/jme3-project-testdata/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:48 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-scenecomposer/nbproject/project.properties b/jme3-scenecomposer/nbproject/project.properties index 712cc5326..73c1fb775 100644 --- a/jme3-scenecomposer/nbproject/project.properties +++ b/jme3-scenecomposer/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-templates/nbproject/project.properties b/jme3-templates/nbproject/project.properties index d1eea1307..d3b5d59aa 100644 --- a/jme3-templates/nbproject/project.properties +++ b/jme3-templates/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:48 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-templates/src/com/jme3/gde/templates/RollingTheMonkeyProject.zip b/jme3-templates/src/com/jme3/gde/templates/RollingTheMonkeyProject.zip index 00789f9fb..55b39d906 100644 Binary files a/jme3-templates/src/com/jme3/gde/templates/RollingTheMonkeyProject.zip and b/jme3-templates/src/com/jme3/gde/templates/RollingTheMonkeyProject.zip differ diff --git a/jme3-templates/src/com/jme3/gde/templates/files/freemarker/build.gradle.ftl b/jme3-templates/src/com/jme3/gde/templates/files/freemarker/build.gradle.ftl index 6cd0956eb..20523ed51 100644 --- a/jme3-templates/src/com/jme3/gde/templates/files/freemarker/build.gradle.ftl +++ b/jme3-templates/src/com/jme3/gde/templates/files/freemarker/build.gradle.ftl @@ -40,7 +40,7 @@ project(":assets") { java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) } } } @@ -114,7 +114,7 @@ jar { java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) } } diff --git a/jme3-templates/src/com/jme3/gde/templates/jaimesascent/JaimesAscentDownloadPanel.java b/jme3-templates/src/com/jme3/gde/templates/jaimesascent/JaimesAscentDownloadPanel.java index b2d9c6270..eeee18519 100644 --- a/jme3-templates/src/com/jme3/gde/templates/jaimesascent/JaimesAscentDownloadPanel.java +++ b/jme3-templates/src/com/jme3/gde/templates/jaimesascent/JaimesAscentDownloadPanel.java @@ -64,7 +64,7 @@ public JaimesAscentDownloadPanel() { } public int doDownloadZip() { - return downloadFile("https://github.com/neph1/JaimesAscent/archive/refs/tags/v1.1.1.zip", DOWNLOAD_FOLDER, ZIP_NAME); + return downloadFile("https://github.com/neph1/JaimesAscent/archive/refs/tags/v1.1.3.zip", DOWNLOAD_FOLDER, ZIP_NAME); } private int downloadFile(String fileURL, String saveDir, String fileName) { diff --git a/jme3-templates/src/com/jme3/gde/templates/jaimesascent/build.gradle.ftl b/jme3-templates/src/com/jme3/gde/templates/jaimesascent/build.gradle.ftl index f40ada913..b92b0cdd9 100644 --- a/jme3-templates/src/com/jme3/gde/templates/jaimesascent/build.gradle.ftl +++ b/jme3-templates/src/com/jme3/gde/templates/jaimesascent/build.gradle.ftl @@ -3,17 +3,20 @@ plugins { id 'application' } -group 'com.JaimesAscent' -version '1.0' +group = 'com.JaimesAscent' +version = '1.0' -mainClassName = "com.JaimesAscent.JaimesAscent" +application { + applicationName = '${name}' + mainClass = 'com.JaimesAscent.JaimesAscent' +} repositories { mavenCentral() } project.ext { - jmeVer = '3.7.0-stable' + jmeVer = '3.9.0-stable' } project(":assets") { @@ -31,14 +34,14 @@ project(":assets") { java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) } } } java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) } } @@ -48,18 +51,18 @@ dependencies { implementation "org.jmonkeyengine:jme3-desktop:$jmeVer" implementation "org.jmonkeyengine:jme3-lwjgl:$jmeVer" implementation "org.jmonkeyengine:jme3-lwjgl:$jmeVer" - implementation "com.github.stephengold:Heart:9.0.0" - implementation "com.github.stephengold:Minie:8.0.0" + implementation "com.github.stephengold:Heart:9.3.0" + implementation "com.github.stephengold:Minie:9.0.3" implementation project("assets") } jar { manifest { - attributes 'Main-Class': "$mainClassName" + attributes 'Main-Class': application.mainClass } } wrapper { - gradleVersion = '8.6' + gradleVersion = '9.2.1' } diff --git a/jme3-templates/src/com/jme3/gde/templates/monkeyzone/build.gradle.ftl b/jme3-templates/src/com/jme3/gde/templates/monkeyzone/build.gradle.ftl index 8093c2a70..20586dbd5 100644 --- a/jme3-templates/src/com/jme3/gde/templates/monkeyzone/build.gradle.ftl +++ b/jme3-templates/src/com/jme3/gde/templates/monkeyzone/build.gradle.ftl @@ -3,17 +3,20 @@ plugins { id 'application' } -group 'com.monkeyzone' -version '1.0' +group = 'com.monkeyzone' +version = '1.0' -mainClassName = "com.monkeyzone.MonkeyZone" +application { + applicationName = '${name}' + mainClass = 'com.monkeyzone.MonkeyZone' +} repositories { mavenCentral() } project.ext { - jmeVer = '3.7.0-stable' + jmeVer = '3.9.0-stable' } project(":assets") { @@ -31,14 +34,14 @@ project(":assets") { java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) } } } java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) } } @@ -48,18 +51,18 @@ dependencies { implementation "org.jmonkeyengine:jme3-desktop:$jmeVer" implementation "org.jmonkeyengine:jme3-lwjgl:$jmeVer" implementation "org.jmonkeyengine:jme3-lwjgl:$jmeVer" - implementation "com.github.stephengold:Heart:9.0.0" - implementation "com.github.stephengold:Minie:8.0.0" + implementation "com.github.stephengold:Heart:9.3.0" + implementation "com.github.stephengold:Minie:9.0.3" implementation project("assets") } jar { manifest { - attributes 'Main-Class': "$mainClassName" + attributes 'Main-Class': application.mainClass } } wrapper { - gradleVersion = '8.6' + gradleVersion = '9.2.1' } diff --git a/jme3-templates/src/com/jme3/gde/templates/rollingthemonkey/RollingTheMonkeyWizardIterator.java b/jme3-templates/src/com/jme3/gde/templates/rollingthemonkey/RollingTheMonkeyWizardIterator.java index f3afe7777..d96d7219b 100644 --- a/jme3-templates/src/com/jme3/gde/templates/rollingthemonkey/RollingTheMonkeyWizardIterator.java +++ b/jme3-templates/src/com/jme3/gde/templates/rollingthemonkey/RollingTheMonkeyWizardIterator.java @@ -117,9 +117,9 @@ private String[] createSteps() { // Create build.gradle from template File gradleBuildFile = new File(dirF, "build.gradle"); - Map buildFileBindings = new HashMap<>(); - createFileFromTemplate(gradleBuildFile, BUILDFILE, buildFileBindings); + createFileFromTemplate(gradleBuildFile, BUILDFILE, + Collections.singletonMap("name", wiz.getProperty("name"))); // Always open top dir as a project: resultSet.add(dir); diff --git a/jme3-templates/src/com/jme3/gde/templates/rollingthemonkey/build.gradle.ftl b/jme3-templates/src/com/jme3/gde/templates/rollingthemonkey/build.gradle.ftl index 94e41ae1c..11e718423 100644 --- a/jme3-templates/src/com/jme3/gde/templates/rollingthemonkey/build.gradle.ftl +++ b/jme3-templates/src/com/jme3/gde/templates/rollingthemonkey/build.gradle.ftl @@ -3,17 +3,20 @@ plugins { id 'application' } -group 'com.rollingthemonkey' -version '1.0' +group = 'com.rollingthemonkey' +version = '1.0' -mainClassName = "com.rollingthemonkey.RollingTheMonkey" +application { + applicationName = '${name}' + mainClass = 'com.rollingthemonkey.RollingTheMonkey' +} repositories { mavenCentral() } project.ext { - jmeVer = '3.7.0-stable' + jmeVer = '3.9.0-stable' } project(":assets") { @@ -31,35 +34,35 @@ project(":assets") { java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) } } } java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) } } dependencies { - implementation "org.jmonkeyengine:jme3-core:$jmeVer" - implementation "org.jmonkeyengine:jme3-desktop:$jmeVer" - implementation "org.jmonkeyengine:jme3-lwjgl:$jmeVer" - implementation "org.jmonkeyengine:jme3-lwjgl:$jmeVer" - implementation "com.github.stephengold:Heart:9.0.0" - implementation "com.github.stephengold:Minie:8.0.0" - implementation project("assets") + implementation "org.jmonkeyengine:jme3-core:$jmeVer" + implementation "org.jmonkeyengine:jme3-desktop:$jmeVer" + implementation "org.jmonkeyengine:jme3-lwjgl:$jmeVer" + implementation "org.jmonkeyengine:jme3-lwjgl:$jmeVer" + implementation "com.github.stephengold:Heart:9.3.0" + implementation "com.github.stephengold:Minie:9.0.3" + implementation project("assets") } jar { manifest { - attributes 'Main-Class': "$mainClassName" + attributes 'Main-Class': application.mainClass } } wrapper { - gradleVersion = '8.6' + gradleVersion = '9.2.1' } diff --git a/jme3-terrain-editor/nbproject/project.properties b/jme3-terrain-editor/nbproject/project.properties index 770164f42..3e2af497c 100644 --- a/jme3-terrain-editor/nbproject/project.properties +++ b/jme3-terrain-editor/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-tests-template/nbproject/project.properties b/jme3-tests-template/nbproject/project.properties index d1eea1307..d3b5d59aa 100644 --- a/jme3-tests-template/nbproject/project.properties +++ b/jme3-tests-template/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:48 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-texture-editor/nbproject/project.properties b/jme3-texture-editor/nbproject/project.properties index 0d3d78ac3..986a010e9 100644 --- a/jme3-texture-editor/nbproject/project.properties +++ b/jme3-texture-editor/nbproject/project.properties @@ -1,5 +1,5 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/jme3-vehicle-creator/nbproject/project.properties b/jme3-vehicle-creator/nbproject/project.properties index 83a56fe66..de6f8c63f 100644 --- a/jme3-vehicle-creator/nbproject/project.properties +++ b/jme3-vehicle-creator/nbproject/project.properties @@ -1,4 +1,4 @@ #Thu, 25 Aug 2011 20:26:50 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial spec.version.base=3.5.2 diff --git a/jme3-wavefront/nbproject/platform.properties b/jme3-wavefront/nbproject/platform.properties index 67ee64ae7..2fc4baf25 100644 --- a/jme3-wavefront/nbproject/platform.properties +++ b/jme3-wavefront/nbproject/platform.properties @@ -129,8 +129,8 @@ nbplatform.active=default #need these in the file for all dependencies to resolve when using command line #ant and a download of the platform, same as those generated by netbeans platform #under ${user.properties.file} (defined in platform-private.properties) -default.javac.source=21 -default.javac.target=21 +default.javac.source=25 +default.javac.target=25 libs.absolutelayout.classpath=${nbplatform.default.netbeans.dest.dir}/java/modules/ext/AbsoluteLayout.jar libs.absolutelayout.javadoc= libs.absolutelayout.maven-pom= diff --git a/jme3-wavefront/nbproject/project.properties b/jme3-wavefront/nbproject/project.properties index 8555c2630..fe985af70 100644 --- a/jme3-wavefront/nbproject/project.properties +++ b/jme3-wavefront/nbproject/project.properties @@ -1,4 +1,4 @@ #Thu, 25 Aug 2011 20:26:49 +0200 -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint\:-serial spec.version.base=3.5.2 diff --git a/jme3-welcome-screen/nbproject/project.properties b/jme3-welcome-screen/nbproject/project.properties index d0f8fa4cb..89810e73c 100644 --- a/jme3-welcome-screen/nbproject/project.properties +++ b/jme3-welcome-screen/nbproject/project.properties @@ -1,4 +1,4 @@ -javac.source=21 +javac.source=25 javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt nbm.homepage=https://www.jmonkeyengine.org diff --git a/nbproject/platform.properties b/nbproject/platform.properties index 67ee64ae7..2fc4baf25 100644 --- a/nbproject/platform.properties +++ b/nbproject/platform.properties @@ -129,8 +129,8 @@ nbplatform.active=default #need these in the file for all dependencies to resolve when using command line #ant and a download of the platform, same as those generated by netbeans platform #under ${user.properties.file} (defined in platform-private.properties) -default.javac.source=21 -default.javac.target=21 +default.javac.source=25 +default.javac.target=25 libs.absolutelayout.classpath=${nbplatform.default.netbeans.dest.dir}/java/modules/ext/AbsoluteLayout.jar libs.absolutelayout.javadoc= libs.absolutelayout.maven-pom= diff --git a/readme.md b/readme.md index 582b2c460..ef777c780 100644 --- a/readme.md +++ b/readme.md @@ -27,7 +27,7 @@ Thus the prefered download is `jmonkeyplatform-windows-x64.exe` which essentiall After the SDK is up and running. A good starting point is to look at the jME examples. Under *File | New project | JME3 Tests* you can create a new project, populated with the jME build in examples. You can freely mess around with these and try out stuff. Your changes can always be reverted by simply creating a new *JME3 Tests* project. Once you are all comfortable and ready to embark on your own exciting journey, *File | New project | Basic game (with Gradle)* is the recommended starting point. ## Building the SDK -Building the SDK is an easy process basically, but it depends on what kind of distribution you want to build. Currently the SDK requires __JDK 21__ to build. +Building the SDK is an easy process basically, but it depends on what kind of distribution you want to build. Currently the SDK requires __JDK 25__ to build. You also have to know that the build process changes from time to time, so have a look at the `.github/workflows/gradle.yml` file, or related, you will see how we build our releases then. Technically the gradle task `buildSdk` is the main task which builds the sdk (Invoking `./gradlew buildSdk` or `gradlew.bat buildSdk` on Windows).