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.

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

SDK to use and bundle JDK 17 #473

Merged
merged 15 commits into from
Feb 21, 2023
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
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 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Grant execute permission for gradle
run: chmod +x gradlew
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
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 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17
- name: Grant execute permission for gradle
run: chmod +x gradlew
- name: Build the SDK
Expand Down
6 changes: 3 additions & 3 deletions BasicGameTemplate/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ javac.compilerargs=
javac.deprecation=false
javac.processorpath=\
${javac.classpath}
javac.source=11
javac.target=11
javac.source=17
javac.target=17
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
Expand All @@ -65,7 +65,7 @@ javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
jme.project.version=3.4.1
jme.project.version=3.5.2
jnlp.codebase.type=local
jnlp.descriptor=application
jnlp.enabled=false
Expand Down
4 changes: 2 additions & 2 deletions JME3TestsTemplate/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ javac.classpath=\
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.source=11
javac.target=11
javac.source=17
javac.target=17
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
Expand Down
6 changes: 2 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@
<property name="jdkhome.string" value='#jdkhome="/path/to/jdk"'/>
<copy file="${harness.dir}/etc/app.conf" tofile="build/launcher/etc/${app.name}.conf" overwrite="true">
<filterchain>
<replacestring from="$${branding.token}" to="${branding.token}"/>
<replacestring from="$${APPNAME}/dev" to="$${APPNAME}/${app.version}"/>
<replacestring from="-J-Xmx64m" to="${run.args.extra}"/>
<replacestring from="$${branding.token}" to="${branding.token} ${run.args.extra}"/>
<replacestring from='#jdkhome="/path/to/jdk"' to ='${jdkhome.string}'/>
</filterchain>
</copy>
Expand Down Expand Up @@ -222,7 +220,7 @@
</and>
<then>
<echo message="No platform specified, building all platforms"/>
<property name="generate.installer.for.platforms" value="windows-x86 windows-x64 linux-x86 linux-x64 macosx"/>
<property name="generate.installer.for.platforms" value="windows-x86 windows-x64 linux-x64 macosx"/>
</then>
<else>
<if>
Expand Down
6 changes: 3 additions & 3 deletions jdks/download-jdks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

set -e # Quit on Error

jdk_major_version="11"
jdk_version="0.17"
jdk_build_version="8"
jdk_major_version="17"
jdk_version="0.6"
jdk_build_version="10"
platforms=( "x64_linux" "x86-32_windows" "x64_windows" "x64_mac" )

# DEPRECATED (not required anymore)
Expand Down
4 changes: 2 additions & 2 deletions jme3-android/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#Updated by build script
#Thu, 25 Aug 2011 21:00:54 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-angelfont/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu, 25 Aug 2011 20:26:50 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-assetpack-support/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-blender/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:50 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Kaelthas
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-cinematics/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:50 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=R\u00e9my Bouquet
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-code-check/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Thu, 25 Aug 2011 20:26:50 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-codepalette/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-core-baselibs/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=jMonkeyEngine
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-core-libraries/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:48 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=jMonkeyEngine
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-core-updatecenters/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-core/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#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=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
project.license=jme
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-dark-laf/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
file.reference.nimrodlf.jar=release/modules/ext/nimrodlf.jar
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Charles Anderson, R\u00e9my Bouquet
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-desktop-executables/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-documentation/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen, Ruth Kusterer, many others
spec.version.base=3.4.0
spec.version.base=3.5.2
2 changes: 1 addition & 1 deletion jme3-glsl-highlighter/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint:-serial
project.license=jme license
4 changes: 2 additions & 2 deletions jme3-gui/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ 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=11
javac.source=17
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Relucri
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-lwjgl-applet/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-materialeditor/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-model-importer/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-navmesh-gen/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Brent Owens
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-obfuscate/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:50 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https\://proguard.sourceforge.net/
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-project-baselibs/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:48 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=jMonkeyEngine
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-project-libraries/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:48 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=jMonkeyEngine
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-project-testdata/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:48 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=jMonkeyEngine
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-scenecomposer/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
4 changes: 2 additions & 2 deletions jme3-templates/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Thu, 25 Aug 2011 20:26:48 +0200
javac.source=11
javac.source=17
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=jMonkeyEngine
nbm.needs.restart=true
spec.version.base=3.4.0
spec.version.base=3.5.2
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ project(":assets") {
}
}
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}
}

dependencies {
Expand Down Expand Up @@ -92,4 +98,14 @@ jar {
manifest {
attributes 'Main-Class': "$mainClassName"
}
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}

wrapper {
gradleVersion = '7.6'
}
Loading