Rename catched to caught, execute to eval

- Also fix some Android warnings
gudzpoz · May 24, 2024 · ce23328 · ce23328
1 parent dd434d5
commit ce23328
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 45 deletions.
diff --git a/android/android-test/build.gradle b/android/android-test/build.gradle
@@ -26,8 +26,8 @@ android {
 
     defaultConfig {
         minSdk 21
-        targetSdk 21
-        compileSdk 30
+        targetSdk 34
+        compileSdk 33
         versionCode 1
         versionName '3.1'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -61,7 +61,7 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
     implementation project(':luajava')
     implementation project(':lua51')
     implementation project(':lua52')

diff --git a/android/android-test/src/main/AndroidManifest.xml b/android/android-test/src/main/AndroidManifest.xml
@@ -1,6 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="party.iroiro.luajava">
-
+<manifest>
 </manifest>
diff --git a/android/build.gradle b/android/build.gradle
@@ -18,30 +18,31 @@ ext {
 android {
     namespace = project(':').group
 
-    compileSdk 33
-    buildToolsVersion '30.0.3'
-
     defaultConfig {
         minSdk 21
-        targetSdk 31
+        targetSdk 34
+        compileSdk 33
         versionCode 1
         versionName '3.1'
     }
 
     sourceSets { container ->
-        luaVersions.forEach { ver ->
+        luaVersions.each { v ->
+            String ver = v
             container.create(ver) {
+                namespace "${project(':')}.${ver}"
                 manifest.srcFile 'AndroidManifest.xml'
                 jniLibs.srcDirs = ["${ver}-libs"]
             }
         }
     }
 
-    flavorDimensions 'lua'
+    flavorDimensions += 'lua'
 
     productFlavors { container ->
-        luaVersions.forEach { ver ->
-            container.create(ver) {
+        luaVersions.each { ver ->
+            String v = ver
+            container.create(v) {
                 dimension 'lua'
             }
         }
@@ -53,7 +54,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
-            matchingFallbacks = 'release'
+            matchingFallbacks ['release']
         }
     }
 
@@ -63,7 +64,7 @@ android {
     }
 }
 
-task copyAndroidNatives {
+tasks.register('copyAndroidNatives') {
     doFirst {
         List<String> platforms = ['armeabi-v7a', 'arm64-v8a', 'x86_64', 'x86']
         luaVersions.forEach { ver ->
@@ -82,7 +83,7 @@ task copyAndroidNatives {
     }
 }
 
-tasks.whenTaskAdded { packageTask ->
+tasks.configureEach { packageTask ->
     if (packageTask.name.contains("merge") && packageTask.name.contains("JniLibFolders")) {
         packageTask.dependsOn 'copyAndroidNatives'
     }
@@ -102,9 +103,10 @@ afterEvaluate {
 
     publishing {
         publications {
-            'default'(MavenPublication) { container ->
+            create('default', MavenPublication) { container ->
                 setPom(pom, '')
-                luaVersions.forEach { ver ->
+                luaVersions.each { v ->
+                    String ver = v
                     String path = "${buildDir}/outputs/aar/android-${ver}-release.aar"
                     file(path).getParentFile().mkdirs()
                     file(path).createNewFile()
@@ -140,7 +142,7 @@ afterEvaluate {
     }
 }
 
-tasks.whenTaskAdded { packageTask ->
+tasks.configureEach { packageTask ->
     if (packageTask.name.toLowerCase().contains("maven")) {
         packageTask.dependsOn 'assemble'
     }

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="party.iroiro.luajava">
-</manifest>
+<manifest>
+</manifest>
diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,7 @@ ext {
 apply from: 'publish.gradle'
 apply from: 'jacoco.gradle'
 
-task allJavadoc(type: Javadoc) {
+tasks.register('allJavadoc', Javadoc) {
     Set<String> projects = [
             'lua51',
             'lua52',

diff --git a/example/src/test/java/party/iroiro/luajava/luaj/LuaJTest.java b/example/src/test/java/party/iroiro/luajava/luaj/LuaJTest.java
@@ -207,9 +207,9 @@ public void luaJNativesUserDataTest() {
     public void testMath() {
         try (LuaJ L = new LuaJ()) {
             L.openLibraries();
-            double eLog = L.execute("return math.log(" + Math.E + ")")[0].toNumber();
+            double eLog = L.eval("return math.log(" + Math.E + ")")[0].toNumber();
             assertEquals(1., eLog, 0.000001);
-            double tenLog = L.execute("return math.log(100, 10)")[0].toNumber();
+            double tenLog = L.eval("return math.log(100, 10)")[0].toNumber();
             assertEquals(2., tenLog, 0.000001);
         }
     }

diff --git a/example/suite/src/main/java/party/iroiro/luajava/LuaTestSuite.java b/example/suite/src/main/java/party/iroiro/luajava/LuaTestSuite.java
@@ -109,7 +109,7 @@ private void testCoroutineDeadlock() {
             try (T L = constructor.get()) {
                 synchronized (L.getMainState()) {
                     L.openLibrary("coroutine");
-                    Object proxy = L.execute("return { run = function() end }")[0]
+                    Object proxy = L.eval("return { run = function() end }")[0]
                             .toProxy(Runnable.class);
                     L.set("proxy", proxy);
                     L.run("\n" +
@@ -437,7 +437,7 @@ private void testGc() {
             L.createTable(0, 100000);
             L.setGlobal("a");
             L.run("for i = 1, 100000 do a[tostring(i)] = true end");
-            LuaValue beforeGc = L.execute("return collectgarbage('count')")[0];
+            LuaValue beforeGc = L.eval("return collectgarbage('count')")[0];
             L.pushNil();
             L.setGlobal("a");
             L.gc();

diff --git a/example/suite/src/main/java/party/iroiro/luajava/value/LuaValueSuite.java b/example/suite/src/main/java/party/iroiro/luajava/value/LuaValueSuite.java
@@ -40,7 +40,7 @@ public void test() {
 
     @SuppressWarnings("SuspiciousMethodCalls")
     private void tableMapTest() {
-        LuaValue map = L.execute("t = { 1, 2, 3, 4, a = 5, b = 6, c = 7, d = 8 }; return t")[0];
+        LuaValue map = L.eval("t = { 1, 2, 3, 4, a = 5, b = 6, c = 7, d = 8 }; return t")[0];
         assertEquals(8, map.entrySet().size());
         assertEquals(4, map.length());
         assertTrue(map.containsKey("a"));
@@ -54,8 +54,8 @@ private void tableMapTest() {
         assertEquals(10, map.get("b").toInteger());
         assertEquals(1, map.get((Number) 1).toInteger());
 
-        assertThrows(NoSuchElementException.class, () -> L.execute("return {}")[0].entrySet().iterator().next());
-        assertThrows(IllegalStateException.class, () -> L.execute("return {}")[0].entrySet().iterator().remove());
+        assertThrows(NoSuchElementException.class, () -> L.eval("return {}")[0].entrySet().iterator().next());
+        assertThrows(IllegalStateException.class, () -> L.eval("return {}")[0].entrySet().iterator().remove());
 
         L.push(1);
         LuaValue i = L.get();
@@ -95,7 +95,7 @@ private void stringTest() {
     private void luaStateTest() {
         LuaValue value = L.get("java");
         assertEquals(TABLE, value.type());
-        assertThrowsLua(LuaException.LuaError.SYNTAX, () -> L.execute("("));
+        assertThrowsLua(LuaException.LuaError.SYNTAX, () -> L.eval("("));
     }
 
     private void callTest() {
@@ -133,7 +133,7 @@ private void nilTest() {
 
     private void tableTest() {
         int top = L.getTop();
-        LuaValue[] values = L.execute("return {1, 2, 3, a = 'b', c = 'd'}, 1024");
+        LuaValue[] values = L.eval("return {1, 2, 3, a = 'b', c = 'd'}, 1024");
         assertEquals(2, values.length);
         LuaValue value = values[0];
 
@@ -151,7 +151,7 @@ private void tableTest() {
         assertEquals(3., value.get(3).toJavaObject());
         assertEquals("b", value.get("a").toJavaObject());
         assertEquals("d", value.get(L.from("c")).toJavaObject());
-        value = L.execute("return {}")[0];
+        value = L.eval("return {}")[0];
         value.set(1, L.from(1));
         value.set(2, L.from(2));
         value.set(L.from(3), L.from(3));

diff --git a/jni/luajava/jualib.cpp b/jni/luajava/jualib.cpp
@@ -113,7 +113,7 @@ static int javaArray(lua_State * L) {
     JAVA_CLASS_META_REGISTRY, JAVA_OBJECT_META_REGISTRY);
 }
 
-static int javaCatched(lua_State * L) {
+static int javaCaught(lua_State * L) {
   lua_getglobal(L, GLOBAL_THROWABLE);
   return 1;
 }
@@ -150,7 +150,8 @@ const luaL_Reg javalib[] = {
   { "unwrap",    javaUnwrap },
   { "proxy",     javaProxy },
   { "array",     javaArray },
-  { "catched",   javaCatched },
+  { "caught",    javaCaught },
+  { "catched",   javaCaught },
   { "detach",    javaDetach },
   { "loadlib",   javaLoadlib },
   {NULL, NULL}

diff --git a/jsr223/src/main/java/party/iroiro/luajava/jsr223/LuaScriptEngine.java b/jsr223/src/main/java/party/iroiro/luajava/jsr223/LuaScriptEngine.java
@@ -54,7 +54,7 @@ public Object eval(String script, ScriptContext scriptContext) throws ScriptExce
         assertNotNull(scriptContext, "context");
         try (Lua L = getLua()) {
             putContext(L, scriptContext);
-            LuaValue[] values = L.execute(script);
+            LuaValue[] values = L.eval(script);
             return values.length == 0 ? null : values;
         } catch (LuaException e) {
             throw new ScriptException(e);

diff --git a/luaj/src/main/java/party/iroiro/luajava/luaj/JavaLib.java b/luaj/src/main/java/party/iroiro/luajava/luaj/JavaLib.java
@@ -51,14 +51,16 @@ public Varargs invoke(Varargs args) {
                         L.lid, o.m_instance, args.narg() > 2 ? 1 - args.narg() : args.arg(2).checkint()));
             }
         });
-        lib.set("catched", new VarArgFunction() {
+        VarArgFunction javaCaught = new VarArgFunction() {
             @Override
             public Varargs invoke(Varargs args) {
                 LuaJState L = LuaJNatives.instances.get(address);
                 Throwable error = L.getError();
                 return error == null ? LuaValue.NIL : new JavaObject(error, L.jObjectMetatable, L.address);
             }
-        });
+        };
+        lib.set("caught", javaCaught);
+        lib.set("catched", javaCaught);
         lib.set("detach", new OneArgFunction() {
             @Override
             public LuaValue call(LuaValue arg) {

diff --git a/luajava/src/main/java/party/iroiro/luajava/AbstractLua.java b/luajava/src/main/java/party/iroiro/luajava/AbstractLua.java
@@ -1059,7 +1059,7 @@ public void set(String key, Object value) {
     }
 
     @Override
-    public @Nullable LuaValue[] execute(String command) throws LuaException {
+    public LuaValue[] eval(String command) throws LuaException {
         load(command);
         return get().call();
     }

diff --git a/luajava/src/main/java/party/iroiro/luajava/value/LuaThread.java b/luajava/src/main/java/party/iroiro/luajava/value/LuaThread.java
@@ -1,6 +1,5 @@
 package party.iroiro.luajava.value;
 
-import org.jetbrains.annotations.Nullable;
 import party.iroiro.luajava.LuaException;
 
 public interface LuaThread {
@@ -34,8 +33,7 @@ public interface LuaThread {
      * @param command the command
      * @return the return values
      */
-    @Nullable
-    LuaValue[] execute(String command) throws LuaException;
+    LuaValue[] eval(String command) throws LuaException;
 
     /**
      * @return a nil Lua value