Explicitly compile for Java 11

openjdk · Jun 11, 2021 · fdef402 · fdef402
1 parent d3e4755
commit fdef402
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/make/nashorn/build.xml b/make/nashorn/build.xml
@@ -188,7 +188,8 @@
            destdir="${nashorn.module.classes.dir}"
            debug="${javac.debug}"
            encoding="${javac.encoding}"
-           includeantruntime="false" fork="true">
+           includeantruntime="false" fork="true"
+           release="${nashorn.target.java.version}">
       <compilerarg line="--module-path ${deps.dir}"/>
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-XDignore.symbol.file"/>
@@ -216,7 +217,8 @@
            destdir="${nashorn.shell.module.classes.dir}"
            debug="${javac.debug}"
            encoding="${javac.encoding}"
-           includeantruntime="false" fork="true">
+           includeantruntime="false" fork="true"
+           source="${nashorn.target.java.version}" target="${nashorn.target.java.version}">
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-XDignore.symbol.file"/>
       <compilerarg value="-Xdiags:verbose"/>

diff --git a/make/nashorn/project.properties b/make/nashorn/project.properties
@@ -44,6 +44,9 @@ javadoc.option=\
     -tag "implNote:a:Implementation Note:" \
     -tag "moduleGraph:a:Module Graph"
 
+# Version of Java we're targeting
+nashorn.target.java.version=11
+
 # nashorn version information
 nashorn.version=15.2
 nashorn.fullversion=15.2