diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 1aa07cd44..f622161d6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -73,18 +73,16 @@ jobs: validate-wrappers: false gradle-version: "8.11" - - name: Build JRE JAR files + - name: Run scripts run: | ./scripts/languagelist_updater.sh - mkdir out - # Build JRE JAR files (security manager, etc...) - gradle :jre_lwjgl3glfw:build --no-daemon + - name: Build Release .apk run: | # Build the launcher gradle :app_pojavlauncher:assembleRelease - mv app_pojavlauncher/build/outputs/apk/release/app_pojavlauncher-release.apk out/app-release.apk + mv app_pojavlauncher/build/outputs/apk/release/app_pojavlauncher-release-unsigned.apk out/app-release.apk - name: Gen md5sums run: | diff --git a/app_pojavlauncher/build.gradle b/app_pojavlauncher/build.gradle index c98c9c5ef..d3c98dd55 100644 --- a/app_pojavlauncher/build.gradle +++ b/app_pojavlauncher/build.gradle @@ -233,4 +233,6 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) + implementation "net.java.dev.jna:jna:5.13.0@aar" + } diff --git a/app_pojavlauncher/libs/HolyGL4ES-release.aar b/app_pojavlauncher/libs/HolyGL4ES-release.aar index 287f94337..bd9c13123 100644 Binary files a/app_pojavlauncher/libs/HolyGL4ES-release.aar and b/app_pojavlauncher/libs/HolyGL4ES-release.aar differ diff --git a/app_pojavlauncher/libs/MobileGlues-release.aar b/app_pojavlauncher/libs/MobileGlues-release.aar index d1331ea44..f2f7b1945 100644 Binary files a/app_pojavlauncher/libs/MobileGlues-release.aar and b/app_pojavlauncher/libs/MobileGlues-release.aar differ diff --git a/app_pojavlauncher/libs/SDL-release.aar b/app_pojavlauncher/libs/SDL-release.aar index 11af47948..68190f7c6 100644 Binary files a/app_pojavlauncher/libs/SDL-release.aar and b/app_pojavlauncher/libs/SDL-release.aar differ diff --git a/app_pojavlauncher/libs/angle-release.aar b/app_pojavlauncher/libs/angle-release.aar new file mode 100644 index 000000000..cc22015d6 Binary files /dev/null and b/app_pojavlauncher/libs/angle-release.aar differ diff --git a/app_pojavlauncher/libs/imgui-java-release.aar b/app_pojavlauncher/libs/imgui-java-release.aar new file mode 100644 index 000000000..fd184eb7b Binary files /dev/null and b/app_pojavlauncher/libs/imgui-java-release.aar differ diff --git a/app_pojavlauncher/libs/kopper-zink-release.aar b/app_pojavlauncher/libs/kopper-zink-release.aar index ced5021e6..3810944fb 100644 Binary files a/app_pojavlauncher/libs/kopper-zink-release.aar and b/app_pojavlauncher/libs/kopper-zink-release.aar differ diff --git a/app_pojavlauncher/libs/lwjgl-build-release.aar b/app_pojavlauncher/libs/lwjgl-build-release.aar new file mode 100644 index 000000000..d4d24d8af Binary files /dev/null and b/app_pojavlauncher/libs/lwjgl-build-release.aar differ diff --git a/app_pojavlauncher/libs/openal-soft-release.aar b/app_pojavlauncher/libs/openal-soft-release.aar new file mode 100644 index 000000000..c784e86c5 Binary files /dev/null and b/app_pojavlauncher/libs/openal-soft-release.aar differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libEGL_angle.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libEGL_angle.so deleted file mode 100644 index f06e88ad3..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libEGL_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libGLESv1_CM_angle.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libGLESv1_CM_angle.so deleted file mode 100644 index 8c422b8ee..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libGLESv1_CM_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libGLESv2_angle.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libGLESv2_angle.so deleted file mode 100644 index 1d8235da9..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libGLESv2_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libfreetype.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libfreetype.so deleted file mode 100644 index b04046acb..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libfreetype.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libjnidispatch.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libjnidispatch.so deleted file mode 100644 index cd7e6716f..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libjnidispatch.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl.so deleted file mode 100644 index 423f255b3..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so deleted file mode 100644 index 72ad0b9be..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so deleted file mode 100644 index 1746e44f2..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so deleted file mode 100644 index c1ced3177..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so deleted file mode 100644 index 5b4c57221..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libopenal.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libopenal.so deleted file mode 100644 index 5df7d5dad..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libopenal.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libEGL_angle.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libEGL_angle.so deleted file mode 100644 index f681d1085..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libEGL_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libGLESv1_CM_angle.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libGLESv1_CM_angle.so deleted file mode 100644 index d22f6b4bb..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libGLESv1_CM_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libGLESv2_angle.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libGLESv2_angle.so deleted file mode 100644 index 8dada51ab..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libGLESv2_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libfreetype.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libfreetype.so deleted file mode 100644 index 09efa57d1..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libfreetype.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libjnidispatch.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libjnidispatch.so deleted file mode 100644 index 603883efa..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libjnidispatch.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl.so deleted file mode 100644 index 373f81894..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_nanovg.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_nanovg.so deleted file mode 100644 index 2230dece7..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_nanovg.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_opengl.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_opengl.so deleted file mode 100644 index c801c851c..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_opengl.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_stb.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_stb.so deleted file mode 100644 index dbea67324..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_stb.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_tinyfd.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_tinyfd.so deleted file mode 100644 index fba227cbc..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_tinyfd.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libopenal.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libopenal.so deleted file mode 100644 index a91e55c85..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libopenal.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/libEGL_angle.so b/app_pojavlauncher/src/main/jniLibs/x86/libEGL_angle.so deleted file mode 100644 index a67772c78..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/libEGL_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/libGLESv1_CM_angle.so b/app_pojavlauncher/src/main/jniLibs/x86/libGLESv1_CM_angle.so deleted file mode 100644 index 43bbb1a57..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/libGLESv1_CM_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/libGLESv2_angle.so b/app_pojavlauncher/src/main/jniLibs/x86/libGLESv2_angle.so deleted file mode 100644 index 357370abd..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/libGLESv2_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/libfreetype.so b/app_pojavlauncher/src/main/jniLibs/x86/libfreetype.so deleted file mode 100644 index 28a395cd4..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/libfreetype.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/libjnidispatch.so b/app_pojavlauncher/src/main/jniLibs/x86/libjnidispatch.so deleted file mode 100644 index e9094b68b..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/libjnidispatch.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl.so b/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl.so deleted file mode 100644 index 5b8a09c0a..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_nanovg.so b/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_nanovg.so deleted file mode 100644 index 15edc692d..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_nanovg.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_opengl.so b/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_opengl.so deleted file mode 100644 index 440069c44..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_opengl.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_stb.so b/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_stb.so deleted file mode 100644 index d94db2383..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_stb.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_tinyfd.so b/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_tinyfd.so deleted file mode 100644 index 9793d5ca4..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_tinyfd.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86/libopenal.so b/app_pojavlauncher/src/main/jniLibs/x86/libopenal.so deleted file mode 100644 index 367526b87..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86/libopenal.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libEGL_angle.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libEGL_angle.so deleted file mode 100644 index d890e703c..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/libEGL_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libGLESv1_CM_angle.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libGLESv1_CM_angle.so deleted file mode 100644 index 39247d310..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/libGLESv1_CM_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libGLESv2_angle.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libGLESv2_angle.so deleted file mode 100644 index 64d9cc950..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/libGLESv2_angle.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libfreetype.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libfreetype.so deleted file mode 100644 index 4f90761f8..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/libfreetype.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libjnidispatch.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libjnidispatch.so deleted file mode 100644 index e594b8882..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/libjnidispatch.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl.so b/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl.so deleted file mode 100644 index 6df879008..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_nanovg.so b/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_nanovg.so deleted file mode 100644 index 8e4509a3e..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_nanovg.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_opengl.so b/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_opengl.so deleted file mode 100644 index 8f0f3c9b5..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_opengl.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_stb.so b/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_stb.so deleted file mode 100644 index e03cfb419..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_stb.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_tinyfd.so b/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_tinyfd.so deleted file mode 100644 index 2112fc31f..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_tinyfd.so and /dev/null differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libopenal.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libopenal.so deleted file mode 100644 index 97198bec5..000000000 Binary files a/app_pojavlauncher/src/main/jniLibs/x86_64/libopenal.so and /dev/null differ