Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java 21 #572

Merged
merged 3 commits into from
Mar 2, 2024
Merged

Java 21 #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d130d58
Set JDK 21
tonihele Mar 2, 2024
dfa2e72
Set to Java 21
tonihele Mar 2, 2024
37a8d49
Update license years and remove Blender license
tonihele Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v1
with:
java-version: 17
java-version: 21

- name: Grant execute permission for gradle
run: chmod +x gradlew
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17
java-version: 21
- name: Grant execute permission for gradle
run: chmod +x gradlew
- name: Build the SDK
Expand Down
4 changes: 2 additions & 2 deletions BasicGameTemplate/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ javac.compilerargs=
javac.deprecation=false
javac.processorpath=\
${javac.classpath}
javac.source=17
javac.target=17
javac.source=21
javac.target=21
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
Expand Down
4 changes: 2 additions & 2 deletions JME3TestsTemplate/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ javac.classpath=\
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.source=17
javac.target=17
javac.source=21
javac.target=21
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
Expand Down
12 changes: 3 additions & 9 deletions jdks/download-jdks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,16 @@

set -e # Quit on Error

jdk_major_version="17"
jdk_version="0.9"
jdk_build_version="9"
# JDK 17.0.9 seems to have botched up release causing download URL to vary and platform versions not on the same step
jdk_build_tmp_version="9.1"
jdk_major_version="21"
jdk_version="0.2"
jdk_build_version="13"

function download_jdk {
echo ">>> Downloading the JDK for $1"

if [ -f downloads/jdk-$1$2 ];
then
echo "<<< Already existing, SKIPPING."
elif [[ "$1" == *windows ]];
then
curl -# -o downloads/jdk-$1$2 -L https://github.com/adoptium/temurin$jdk_major_version-binaries/releases/download/jdk-$jdk_major_version.$jdk_version+$jdk_build_tmp_version/OpenJDK${jdk_major_version}U-jdk_$1_hotspot_$jdk_major_version.${jdk_version}_$jdk_build_version$2
echo "<<< OK!"
else
curl -# -o downloads/jdk-$1$2 -L https://github.com/adoptium/temurin$jdk_major_version-binaries/releases/download/jdk-$jdk_major_version.$jdk_version+$jdk_build_version/OpenJDK${jdk_major_version}U-jdk_$1_hotspot_$jdk_major_version.${jdk_version}_$jdk_build_version$2
echo "<<< OK!"
Expand Down
2 changes: 1 addition & 1 deletion jme3-android/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Updated by build script
#Thu, 25 Aug 2011 21:00:54 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-angelfont/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:50 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
Expand Down
2 changes: 1 addition & 1 deletion jme3-assetbrowser/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-assetpack-support/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-blender/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:50 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-cinematics/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:50 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-code-check/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:50 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-codepalette/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-core-baselibs/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-core-libraries/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:48 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-core-updatecenters/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
spec.version.base=3.5.2
2 changes: 1 addition & 1 deletion jme3-core/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-dark-laf/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
file.reference.nimrodlf.jar=release/modules/ext/nimrodlf.jar
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-desktop-executables/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-documentation/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-glsl-highlighter/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint:-serial
project.license=jme license
2 changes: 1 addition & 1 deletion jme3-gui/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=17
javac.source=21
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-lwjgl-applet/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-materialeditor/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-model-importer/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-navmesh-gen/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-obfuscate/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:50 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https\://proguard.sourceforge.net/
Expand Down
2 changes: 1 addition & 1 deletion jme3-project-baselibs/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:48 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-project-libraries/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:48 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-project-testdata/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:48 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-scenecomposer/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-templates/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:48 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-terrain-editor/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-tests-template/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:48 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-texture-editor/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion jme3-vehicle-creator/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Thu, 25 Aug 2011 20:26:50 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
spec.version.base=3.5.2
2 changes: 1 addition & 1 deletion jme3-wavefront/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
spec.version.base=3.5.2
2 changes: 1 addition & 1 deletion jme3-welcome-screen/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
javac.source=17
javac.source=21
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
Expand Down
2 changes: 1 addition & 1 deletion license-jme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2003-2023 jMonkeyEngine
Copyright (c) 2003-2024 jMonkeyEngine
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
Loading