Skip to content

Commit eaf15c8

Browse files
toniheletonihele
authored
Merge pull request #473 from tonihele/feature/issue-471
SDK to use and bundle JDK 17
2 parents 472629c + c8a44d4 commit eaf15c8

File tree

46 files changed

+101
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+101
-87
lines changed

‎.github/workflows/gradle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v2
15-
- name: Set up JDK 11
15+
- name: Set up JDK 17
1616
uses: actions/setup-java@v1
1717
with:
18-
java-version: 11
18+
java-version: 17
1919

2020
- name: Grant execute permission for gradle
2121
run: chmod +x gradlew

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v2
12-
- name: Set up JDK 11
12+
- name: Set up JDK 17
1313
uses: actions/setup-java@v3
1414
with:
1515
distribution: temurin
16-
java-version: 11
16+
java-version: 17
1717
- name: Grant execute permission for gradle
1818
run: chmod +x gradlew
1919
- name: Build the SDK

‎BasicGameTemplate/nbproject/project.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ javac.compilerargs=
4848
javac.deprecation=false
4949
javac.processorpath=\
5050
${javac.classpath}
51-
javac.source=11
52-
javac.target=11
51+
javac.source=17
52+
javac.target=17
5353
javac.test.classpath=\
5454
${javac.classpath}:\
5555
${build.classes.dir}
@@ -65,7 +65,7 @@ javadoc.use=true
6565
javadoc.version=false
6666
javadoc.windowtitle=
6767
jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
68-
jme.project.version=3.4.1
68+
jme.project.version=3.5.2
6969
jnlp.codebase.type=local
7070
jnlp.descriptor=application
7171
jnlp.enabled=false

‎JME3TestsTemplate/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ javac.classpath=\
4040
# Space-separated list of extra javac options
4141
javac.compilerargs=
4242
javac.deprecation=false
43-
javac.source=11
44-
javac.target=11
43+
javac.source=17
44+
javac.target=17
4545
javac.test.classpath=\
4646
${javac.classpath}:\
4747
${build.classes.dir}

‎build.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
<property name="jdkhome.string" value='#jdkhome="/path/to/jdk"'/>
3838
<copy file="${harness.dir}/etc/app.conf" tofile="build/launcher/etc/${app.name}.conf" overwrite="true">
3939
<filterchain>
40-
<replacestring from="$${branding.token}" to="${branding.token}"/>
41-
<replacestring from="$${APPNAME}/dev" to="$${APPNAME}/${app.version}"/>
42-
<replacestring from="-J-Xmx64m" to="${run.args.extra}"/>
40+
<replacestring from="$${branding.token}" to="${branding.token} ${run.args.extra}"/>
4341
<replacestring from='#jdkhome="/path/to/jdk"' to ='${jdkhome.string}'/>
4442
</filterchain>
4543
</copy>
@@ -222,7 +220,7 @@
222220
</and>
223221
<then>
224222
<echo message="No platform specified, building all platforms"/>
225-
<property name="generate.installer.for.platforms" value="windows-x86 windows-x64 linux-x86 linux-x64 macosx"/>
223+
<property name="generate.installer.for.platforms" value="windows-x86 windows-x64 linux-x64 macosx"/>
226224
</then>
227225
<else>
228226
<if>

‎jdks/download-jdks.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
set -e # Quit on Error
1212

13-
jdk_major_version="11"
14-
jdk_version="0.17"
15-
jdk_build_version="8"
13+
jdk_major_version="17"
14+
jdk_version="0.6"
15+
jdk_build_version="10"
1616
platforms=( "x64_linux" "x86-32_windows" "x64_windows" "x64_mac" )
1717

1818
# DEPRECATED (not required anymore)

‎jme3-android/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#Updated by build script
22
#Thu, 25 Aug 2011 21:00:54 +0200
3-
javac.source=11
3+
javac.source=17
44
javac.compilerargs=-Xlint -Xlint:-serial
55
license.file=../license-jme.txt
66
nbm.homepage=https://www.jmonkeyengine.org
77
nbm.module.author=Normen Hansen
88
nbm.needs.restart=true
9-
spec.version.base=3.4.0
9+
spec.version.base=3.5.2

‎jme3-angelfont/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu, 25 Aug 2011 20:26:50 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
nbm.homepage=https://www.jmonkeyengine.org
55
nbm.module.author=Normen Hansen
6-
spec.version.base=3.4.0
6+
spec.version.base=3.5.2

‎jme3-assetpack-support/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:49 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=Normen Hansen
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-blender/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:50 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=Kaelthas
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-cinematics/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:50 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=R\u00e9my Bouquet
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-code-check/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Thu, 25 Aug 2011 20:26:50 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=Normen Hansen
7-
spec.version.base=3.4.0
7+
spec.version.base=3.5.2

‎jme3-codepalette/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:49 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=Normen Hansen
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-core-baselibs/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
javac.source=11
1+
javac.source=17
22
javac.compilerargs=-Xlint -Xlint\:-serial
33
license.file=../license-jme.txt
44
nbm.homepage=https://www.jmonkeyengine.org
55
nbm.module.author=jMonkeyEngine
66
nbm.needs.restart=true
7-
spec.version.base=3.4.0
7+
spec.version.base=3.5.2

‎jme3-core-libraries/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:48 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=jMonkeyEngine
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-core-updatecenters/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#Thu, 25 Aug 2011 20:26:49 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
4-
spec.version.base=3.4.0
4+
spec.version.base=3.5.2

‎jme3-core/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#Thu, 25 Aug 2011 20:26:48 +0200
22
file.reference.DDSUtils.jar=release/modules/ext/DDSUtils.jar
33
#Thu, 25 Aug 2011 19:32:54 +0200
4-
javac.source=11
4+
javac.source=17
55
javac.compilerargs=-Xlint -Xlint\:-serial
66
license.file=../license-jme.txt
77
nbm.homepage=https://www.jmonkeyengine.org
88
nbm.module.author=Normen Hansen
99
nbm.needs.restart=true
1010
project.license=jme
11-
spec.version.base=3.4.0
11+
spec.version.base=3.5.2

‎jme3-dark-laf/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
file.reference.nimrodlf.jar=release/modules/ext/nimrodlf.jar
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=Charles Anderson, R\u00e9my Bouquet
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-desktop-executables/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:49 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=Normen Hansen
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-documentation/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
javac.source=11
1+
javac.source=17
22
javac.compilerargs=-Xlint -Xlint:-serial
33
license.file=../license-jme.txt
44
nbm.homepage=https://www.jmonkeyengine.org
55
nbm.module.author=Normen Hansen, Ruth Kusterer, many others
6-
spec.version.base=3.4.0
6+
spec.version.base=3.5.2

‎jme3-glsl-highlighter/nbproject/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
javac.source=11
1+
javac.source=17
22
javac.compilerargs=-Xlint -Xlint:-serial
33
project.license=jme license

‎jme3-gui/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ file.reference.slf4j-simple-1.7.7.jar=release/modules/ext/slf4j-simple-1.7.7.jar
99
file.reference.swingtonifty.jar=release/modules/ext/swingtonifty.jar
1010
file.reference.xsom-20110101-SNAPSHOT.jar=release/modules/ext/xsom-20110101-SNAPSHOT.jar
1111
#Thu, 25 Aug 2011 20:26:49 +0200
12-
javac.source=11
12+
javac.source=17
1313
javac.compilerargs=-Xlint -Xlint:-serial
1414
license.file=../license-jme.txt
1515
nbm.homepage=https://www.jmonkeyengine.org
1616
nbm.module.author=Relucri
1717
nbm.needs.restart=true
18-
spec.version.base=3.4.0
18+
spec.version.base=3.5.2

‎jme3-lwjgl-applet/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:49 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=Normen Hansen
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-materialeditor/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:49 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=Normen Hansen
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-model-importer/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:49 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=Normen Hansen
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-navmesh-gen/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
javac.source=11
1+
javac.source=17
22
javac.compilerargs=-Xlint -Xlint:-serial
33
license.file=../license-jme.txt
44
nbm.homepage=https://www.jmonkeyengine.org
55
nbm.module.author=Brent Owens
6-
spec.version.base=3.4.0
6+
spec.version.base=3.5.2

‎jme3-obfuscate/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:50 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https\://proguard.sourceforge.net/
66
nbm.module.author=Normen Hansen
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-project-baselibs/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:48 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=jMonkeyEngine
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-project-libraries/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:48 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=jMonkeyEngine
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-project-testdata/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:48 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=jMonkeyEngine
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-scenecomposer/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:49 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=Normen Hansen
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-templates/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Thu, 25 Aug 2011 20:26:48 +0200
2-
javac.source=11
2+
javac.source=17
33
javac.compilerargs=-Xlint -Xlint\:-serial
44
license.file=../license-jme.txt
55
nbm.homepage=https://www.jmonkeyengine.org
66
nbm.module.author=jMonkeyEngine
77
nbm.needs.restart=true
8-
spec.version.base=3.4.0
8+
spec.version.base=3.5.2

‎jme3-templates/src/com/jme3/gde/templates/GradleDesktopGameProject.zip

2.6 KB
Binary file not shown.

‎jme3-templates/src/com/jme3/gde/templates/files/freemarker/build.gradle.ftl

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ project(":assets") {
3131
}
3232
}
3333
}
34+
35+
java {
36+
toolchain {
37+
languageVersion = JavaLanguageVersion.of(17)
38+
}
39+
}
3440
}
3541

3642
dependencies {
@@ -92,4 +98,14 @@ jar {
9298
manifest {
9399
attributes 'Main-Class': "$mainClassName"
94100
}
101+
}
102+
103+
java {
104+
toolchain {
105+
languageVersion = JavaLanguageVersion.of(17)
106+
}
107+
}
108+
109+
wrapper {
110+
gradleVersion = '7.6'
95111
}

0 commit comments

Comments
 (0)