Update Dockerfile

Dockerfile

@@ -1,109 +1,66 @@
 FROM python:3.10-slim
 
-# 1. Инструменты
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    curl \
-    unzip \
-    git \
-    default-jdk-headless \
-    && rm -rf /var/lib/apt/lists/*
+# 1. Устанавливаем JDK и инструменты
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    curl unzip git default-jdk-headless && rm -rf /var/lib/apt/lists/*
 
-# 2. Gradio
-RUN pip install --no-cache-dir gradio
-
-# -----------------------------------------------------------------------------
-# Android SDK (Build Tools 28.0.3 - Эпоха DX)
-# -----------------------------------------------------------------------------
+# 2. Настройка Android SDK (для d8)
 ENV ANDROID_SDK_ROOT=/opt/android-sdk
-ENV CMDLINE_TOOLS_URL=https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
-
 RUN mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools && \
-    curl -o tools.zip ${CMDLINE_TOOLS_URL} && \
-    unzip -q tools.zip && \
-    mv cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest && \
-    rm tools.zip
-
+    curl -o tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip && \
+    unzip -q tools.zip && mv cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest && rm tools.zip
 ENV PATH=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${PATH}
-
-# Ставим 28.0.3, чтобы получить настоящий DX
-RUN yes | sdkmanager --licenses >/dev/null && \
-    sdkmanager "build-tools;28.0.3" "platforms;android-28"
-
-# -----------------------------------------------------------------------------
-# Сборка
-# -----------------------------------------------------------------------------
-WORKDIR /app
-
-# 1. Клонируем
-RUN git clone https://github.com/gudzpoz/luajava.git
-
-WORKDIR /app/luajava
-
-# 2. ЧИСТКА
-RUN rm -rf jpms-example example android src/test \
-    lua51 lua52 lua53 luajit luaj jsr223 \
-    luajava/src/main/java/party/iroiro/luajava/util/GlobalLibraryLoader.java \
-    && find . -name "module-info.java" -delete
-
-# 3. FIX: Заглушка GlobalLibraryLoader
-RUN mkdir -p luajava/src/main/java/party/iroiro/luajava/util && \
-    echo 'package party.iroiro.luajava.util;' > luajava/src/main/java/party/iroiro/luajava/util/GlobalLibraryLoader.java && \
-    echo 'public class GlobalLibraryLoader {' >> luajava/src/main/java/party/iroiro/luajava/util/GlobalLibraryLoader.java && \
-    echo '    public static String load(String name) { return null; }' >> luajava/src/main/java/party/iroiro/luajava/util/GlobalLibraryLoader.java && \
-    echo '    public static void register(Class<?> c, boolean b) {}' >> luajava/src/main/java/party/iroiro/luajava/util/GlobalLibraryLoader.java && \
-    echo '}' >> luajava/src/main/java/party/iroiro/luajava/util/GlobalLibraryLoader.java
-
-# 4. FIX: Рефакторинг LuaException/LuaError (оставляем, это хороший тон)
-RUN rm luajava/src/main/java/party/iroiro/luajava/LuaException.java
-RUN echo 'package party.iroiro.luajava;' > luajava/src/main/java/party/iroiro/luajava/LuaError.java && \
-    echo 'public enum LuaError { OK, YIELD, RUNTIME, SYNTAX, MEMORY, GC, ERR, FILE, HANDLER, JAVA; ' >> luajava/src/main/java/party/iroiro/luajava/LuaError.java && \
-    echo 'public int code() { return ordinal(); } }' >> luajava/src/main/java/party/iroiro/luajava/LuaError.java
-RUN echo 'package party.iroiro.luajava;' > luajava/src/main/java/party/iroiro/luajava/LuaException.java && \
-    echo 'public class LuaException extends RuntimeException {' >> luajava/src/main/java/party/iroiro/luajava/LuaException.java && \
-    echo '    public LuaException(String msg) { super(msg); }' >> luajava/src/main/java/party/iroiro/luajava/LuaException.java && \
-    echo '    public LuaException(Throwable cause) { super(cause); }' >> luajava/src/main/java/party/iroiro/luajava/LuaException.java && \
-    echo '    public LuaException(LuaError error, String msg) { super(error.toString() + ": " + msg); }' >> luajava/src/main/java/party/iroiro/luajava/LuaException.java && \
-    echo '}' >> luajava/src/main/java/party/iroiro/luajava/LuaException.java
-
-# ПРИМЕНЯЕМ ФИКСЫ В КОДЕ
-RUN find . -name "*.java" -exec sed -i 's/LuaException\.LuaError/LuaError/g' {} +
-RUN find . -name "*.java" -exec sed -i '/^package /a import party.iroiro.luajava.LuaError;' {} +
-
-# 5. Чистим аннотации
-RUN find . -name "*.java" -exec sed -i 's/@NotNull//g' {} + && \
-    find . -name "*.java" -exec sed -i 's/@Nullable//g' {} + && \
-    find . -name "*.java" -exec sed -i '/import org.jetbrains.annotations/d' {} + && \
-    find . -name "*.java" -exec sed -i '/import party.iroiro.luajava.LuaException.LuaError;/d' {} +
-
-# 6. Компиляция
-RUN mkdir classes
-RUN javac -source 1.8 -target 1.8 -d classes $(find . -name "*.java")
-
-# 7. Сборка DEX через DX (Legacy)
-# dx гораздо надежнее для таких задач
-RUN ${ANDROID_SDK_ROOT}/build-tools/28.0.3/dx \
-    --dex --output=classes.dex \
-    classes && \
-    mv classes.dex /app/luajava_wrapper.dex
-
-WORKDIR /app
-
-# -----------------------------------------------------------------------------
-# Запуск
-# -----------------------------------------------------------------------------
-RUN echo 'import gradio as gr' > app.py && \
-    echo 'import os' >> app.py && \
-    echo '' >> app.py && \
-    echo 'file_path = "/app/luajava_wrapper.dex"' >> app.py && \
-    echo '' >> app.py && \
-    echo 'with gr.Blocks() as demo:' >> app.py && \
-    echo '    gr.Markdown("# Download LuaJava DEX")' >> app.py && \
-    echo '    gr.Markdown("Compilation SUCCESS! (Built with Legacy DX)")' >> app.py && \
-    echo '    gr.File(value=file_path, label="luajava_wrapper.dex", interactive=False)' >> app.py && \
-    echo '' >> app.py && \
-    echo 'demo.launch(server_name="0.0.0.0", server_port=7860)' >> app.py
+RUN yes | sdkmanager "build-tools;34.0.0" "platforms;android-34"
+
+WORKDIR /build
+
+# 3. Скачиваем библиотеки LuaJava
+RUN curl -L -o luajava.jar https://repo1.maven.org/maven2/party/iroiro/luajava/luajava/4.0.2/luajava-4.0.2.jar
+RUN curl -L -o lua54.jar https://repo1.maven.org/maven2/party/iroiro/luajava/lua54/4.0.2/lua54-4.0.2.jar
+
+# 4. Создаем наш Java-мост (PizdunBridge)
+RUN mkdir -p org/mandre/lua
+RUN echo 'package org.mandre.lua; \
+import party.iroiro.luajava.lua54.Lua54; \
+import android.util.Log; \
+public class MandreLuaBridge { \
+    public static Lua54 L; \
+    public static boolean init(String libLua, String libJni) { \
+        try { \
+            System.load(libLua); \
+            System.load(libJni); \
+            L = new Lua54(); \
+            L.openLibraries(); \
+            Log.i("MandreLua", "DEX Bridge: All libraries linked successfully!"); \
+            return true; \
+        } catch (Throwable e) { \
+            Log.e("MandreLua", "DEX Bridge Error: " + e.getMessage()); \
+            return false; \
+        } \
+    } \
+    public static void run(String code) { \
+        try { if (L != null) L.run(code); } \
+        catch (Throwable e) { Log.e("MandreLua", "Lua Runtime Error: " + e.getMessage()); } \
+    } \
+}' > org/mandre/lua/MandreLuaBridge.java
+
+# 5. Компилируем
+RUN javac -cp "luajava.jar:lua54.jar:$(find /opt/android-sdk/platforms/ -name android.jar | head -n 1)" org/mandre/lua/MandreLuaBridge.java
+
+# 6. Собираем всё в один жирный DEX
+RUN ${ANDROID_SDK_ROOT}/build-tools/34.0.0/d8 \
+    --lib $(find /opt/android-sdk/platforms/ -name android.jar | head -n 1) \
+    --release --min-api 26 \
+    --output mandre_lua.dex \
+    luajava.jar lua54.jar org/mandre/lua/MandreLuaBridge.class
+
+# 7. Финал
+RUN pip install gradio
+RUN echo "import gradio as gr; \
+with gr.Blocks() as demo: \
+    gr.Markdown('# Download your mandre_lua.dex'); \
+    gr.File(value='mandre_lua.dex'); \
+demo.launch(server_name='0.0.0.0', server_port=7860)" > app.py
 
 EXPOSE 7860
-
 CMD ["python3", "app.py"]