From 44b24b0ce709feecb9b4298c77049618a7886c82 Mon Sep 17 00:00:00 2001
From: Max Rohde <1448524+mxro@users.noreply.github.com>
Date: Thu, 6 Jul 2023 08:54:28 +1000
Subject: [PATCH] Working on upgrading to latest Java version

---
 .classpath                                                | 2 +-
 .settings/org.eclipse.jdt.core.prefs                      | 8 ++++----
 pom.xml                                                   | 4 ++--
 .../java/delight/nashornsandbox/TestAccessFunction.java   | 4 ----
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.classpath b/.classpath
index 3e0c728..67dc756 100644
--- a/.classpath
+++ b/.classpath
@@ -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-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-20">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 1b6e1ef..70bf2fd 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=20
+org.eclipse.jdt.core.compiler.compliance=20
 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=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=20
diff --git a/pom.xml b/pom.xml
index e37c584..ab2270c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,9 +130,9 @@
 
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.11.0</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+				  <release>20</release>
 				</configuration>
 			</plugin>
 
diff --git a/src/test/java/delight/nashornsandbox/TestAccessFunction.java b/src/test/java/delight/nashornsandbox/TestAccessFunction.java
index d0f6894..660c13a 100644
--- a/src/test/java/delight/nashornsandbox/TestAccessFunction.java
+++ b/src/test/java/delight/nashornsandbox/TestAccessFunction.java
@@ -22,10 +22,6 @@ public void test_access_variable() throws ScriptCPUAbuseException, ScriptExcepti
   }
 
     private Object findAndCall(Object _get) {
-        if (NashornDetection.isJDKNashornScriptObjectMirror(_get)) {
-            jdk.nashorn.api.scripting.ScriptObjectMirror scriptObjectMirror = (jdk.nashorn.api.scripting.ScriptObjectMirror) _get;
-            return scriptObjectMirror.call(_get);
-        }
 
         if (NashornDetection.isStandaloneNashornScriptObjectMirror(_get)) {
             org.openjdk.nashorn.api.scripting.ScriptObjectMirror scriptObjectMirror = (org.openjdk.nashorn.api.scripting.ScriptObjectMirror) _get;