From f087e87806eca8ecbaad3f65cbcd396e8e1a66c3 Mon Sep 17 00:00:00 2001 From: UnlegitDqrk Date: Sun, 1 Mar 2026 12:50:46 +0100 Subject: [PATCH] Updated to Java 25 --- core/pom.xml | 4 ++-- jme/pom.xml | 2 +- jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java | 4 ++-- pom.xml | 4 +++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index ba62cddd..0d150632 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,8 +27,8 @@ org.apache.maven.plugins maven-compiler-plugin - 21 - 21 + ${maven.compiler.release} + ${maven.compiler.release} diff --git a/jme/pom.xml b/jme/pom.xml index c0b7eef7..353c634b 100644 --- a/jme/pom.xml +++ b/jme/pom.xml @@ -98,7 +98,7 @@ org.apache.maven.plugins maven-compiler-plugin - 8 + ${maven.compiler.release} -bootclasspath ${env.WTK_HOME}/lib/cldcapi11.jar${path.separator}${env.WTK_HOME}/lib/midpapi20.jar${path.separator}${env.WTK_HOME}/lib/mmapi.jar diff --git a/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java b/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java index 7c85a6e0..8ef45743 100644 --- a/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java +++ b/jse/src/main/java/org/luaj/vm2/script/LuaScriptEngine.java @@ -244,8 +244,8 @@ public class LuaScriptEngine extends AbstractScriptEngine implements ScriptEngin case LuaValue.TSTRING: return luajValue.tojstring(); case LuaValue.TUSERDATA: return luajValue.checkuserdata(Object.class); case LuaValue.TNUMBER: return luajValue.isinttype()? - luajValue.toint(): - luajValue.todouble(); + (Object) Integer.valueOf(luajValue.toint()): + (Object) Double.valueOf(luajValue.todouble()); default: return luajValue; } } diff --git a/pom.xml b/pom.xml index e242bf3b..8b692ccb 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,9 @@ UTF-8 - 8 + 25 + ${maven.compiler.release} + ${maven.compiler.release} jse ${project.version} jme ${project.version}