Skip to content

Commit

Permalink
Merge pull request #146 from javadelight/try-run-with-different-java-…
Browse files Browse the repository at this point in the history
…version

Support Java LTS 17
  • Loading branch information
mxro committed Jul 28, 2023
2 parents a5522cf + 1d41f26 commit 51bb269
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .classpath
Expand Up @@ -13,7 +13,7 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-20">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
# Build with all versions that can load the nashorn standalone Jar:
java: [ 20 ]
java: [ 17, 20 ]
name: Java ${{ matrix.java }} build
steps:
- uses: actions/checkout@v2
Expand All @@ -30,7 +30,7 @@ jobs:
strategy:
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
java: [ 20 ]
java: [ 17, 20 ]
name: Java ${{ matrix.java }} test
steps:
- uses: actions/download-artifact@v2
Expand Down
6 changes: 3 additions & 3 deletions .settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=20
org.eclipse.jdt.core.compiler.compliance=20
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=20
org.eclipse.jdt.core.compiler.source=11
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -112,6 +112,7 @@ for JS evaluation and better handling of monitoring for threads for possible CPU

## Version History

- 0.4.2: Ensure compatibility with Java 17
- 0.4.0: Upgrade to Java 20
- 0.3.2: Updating JSBeautifier dependency ([PR #143](https://github.com/javadelight/delight-nashorn-sandbox/pull/143) by [davejbur](https://github.com/davejbur))
- 0.3.1: Protect against RegEx attacks in sanitising script input by [PR #139](https://github.com/javadelight/delight-nashorn-sandbox/pull/139)
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -5,7 +5,7 @@

<groupId>org.javadelight</groupId>
<artifactId>delight-nashorn-sandbox</artifactId>
<version>0.4.1</version>
<version>0.4.2</version>
<description>A safe sandbox to execute JavaScript code from Nashorn.</description>
<url>https://github.com/javadelight/delight-nashorn-sandbox</url>

Expand Down Expand Up @@ -132,7 +132,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<release>20</release>
<release>11</release>
</configuration>
</plugin>

Expand Down

0 comments on commit 51bb269

Please sign in to comment.