diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 279950573..fc276e628 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -56,9 +56,9 @@ jobs: branch: buildjre17-21 name: jre21-pojav - - uses: gradle/gradle-build-action@v2 + - uses: gradle/actions/setup-gradle@v4 with: - gradle-version: 7.6.1 + gradle-version: "8.11" - name: Build JRE JAR files run: | diff --git a/app_pojavlauncher/build.gradle b/app_pojavlauncher/build.gradle index 19bcb8930..034ff33b6 100644 --- a/app_pojavlauncher/build.gradle +++ b/app_pojavlauncher/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.android.application' version '7.4.2' + id 'com.android.application' version '8.7.2' } static def getDate() { return new Date().format('yyyyMMdd') } @@ -137,6 +137,10 @@ android { minifyEnabled true shrinkResources true } + proguardNoDebug { + initWith proguard + debuggable false + } release { // Don't set to true or java.awt will be a.a or something similar. @@ -182,9 +186,15 @@ android { buildFeatures { prefab true + buildConfig true } - buildToolsVersion = '33.0.2' + buildToolsVersion = '34.0.0' +} + +afterEvaluate { + // Explicit dependencies for which the apk relies on + tasks.mergeDebugAssets.dependsOn(":forge_installer:jar", ":arc_dns_injector:jar", ":jre_lwjgl3glfw:jar") } dependencies { diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CriticalNativeTest.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CriticalNativeTest.java index 434b0e44b..9f72ce919 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CriticalNativeTest.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CriticalNativeTest.java @@ -1,7 +1,10 @@ package net.kdt.pojavlaunch; +import androidx.annotation.Keep; + import dalvik.annotation.optimization.CriticalNative; +@Keep public class CriticalNativeTest { @CriticalNative public static native void testCriticalNative(int arg0, int arg1); diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java index 168f83d14..bcd5fb477 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java @@ -15,6 +15,7 @@ public class Logger { public static native void begin(String logFilePath); /** Small listener for anything listening to the log */ + @Keep public interface eventLogListener { void onEventLogged(String text); } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java index 50eb96e74..92a25e988 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -36,6 +36,7 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.Toast; +import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; import androidx.core.content.ContextCompat; @@ -442,6 +443,7 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe if(touchCharInput != null) touchCharInput.switchKeyboardState(); } + @Keep public static void openLink(String link) { Context ctx = touchpad.getContext(); // no more better way to obtain a context statically ((Activity)ctx).runOnUiThread(() -> { @@ -461,6 +463,7 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe } }); } + @SuppressWarnings("unused") //TODO: actually use it public static void openPath(String path) { Context ctx = touchpad.getContext(); // no more better way to obtain a context statically @@ -473,6 +476,7 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe }); } + @Keep public static void querySystemClipboard() { Tools.runOnUiThread(()->{ ClipData clipData = GLOBAL_CLIPBOARD.getPrimaryClip(); @@ -491,6 +495,7 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe }); } + @Keep public static void putClipboardData(String data, String mimeType) { Tools.runOnUiThread(()-> { ClipData clipData = null; diff --git a/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java index ff553bc03..6a2697c74 100644 --- a/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java +++ b/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java @@ -2,8 +2,10 @@ package org.lwjgl.glfw; import net.kdt.pojavlaunch.*; import android.content.*; +import android.util.Log; import android.view.Choreographer; +import androidx.annotation.Keep; import androidx.annotation.Nullable; import java.util.ArrayList; @@ -102,6 +104,7 @@ public class CallbackBridge { // Called from JRE side @SuppressWarnings("unused") + @Keep public static @Nullable String accessAndroidClipboard(int type, String copy) { switch (type) { case CLIPBOARD_COPY: @@ -164,6 +167,7 @@ public class CallbackBridge { //Called from JRE side @SuppressWarnings("unused") + @Keep private static void onGrabStateChanged(final boolean grabbing) { isGrabbing = grabbing; sChoreographer.postFrameCallbackDelayed((time) -> { @@ -190,17 +194,17 @@ public class CallbackBridge { } } - @CriticalNative public static native void nativeSetUseInputStackQueue(boolean useInputStackQueue); + @Keep @CriticalNative public static native void nativeSetUseInputStackQueue(boolean useInputStackQueue); - @CriticalNative private static native boolean nativeSendChar(char codepoint); + @Keep @CriticalNative private static native boolean nativeSendChar(char codepoint); // GLFW: GLFWCharModsCallback deprecated, but is Minecraft still use? - @CriticalNative private static native boolean nativeSendCharMods(char codepoint, int mods); - @CriticalNative private static native void nativeSendKey(int key, int scancode, int action, int mods); + @Keep @CriticalNative private static native boolean nativeSendCharMods(char codepoint, int mods); + @Keep @CriticalNative private static native void nativeSendKey(int key, int scancode, int action, int mods); // private static native void nativeSendCursorEnter(int entered); - @CriticalNative private static native void nativeSendCursorPos(float x, float y); - @CriticalNative private static native void nativeSendMouseButton(int button, int action, int mods); - @CriticalNative private static native void nativeSendScroll(double xoffset, double yoffset); - @CriticalNative private static native void nativeSendScreenSize(int width, int height); + @Keep @CriticalNative private static native void nativeSendCursorPos(float x, float y); + @Keep @CriticalNative private static native void nativeSendMouseButton(int button, int action, int mods); + @Keep @CriticalNative private static native void nativeSendScroll(double xoffset, double yoffset); + @Keep @CriticalNative private static native void nativeSendScreenSize(int width, int height); public static native void nativeSetWindowAttrib(int attrib, int value); static { System.loadLibrary("pojavexec"); diff --git a/app_pojavlauncher/src/main/jni/input_bridge_v3.c b/app_pojavlauncher/src/main/jni/input_bridge_v3.c index 4bd94f6e1..03bb79f62 100644 --- a/app_pojavlauncher/src/main/jni/input_bridge_v3.c +++ b/app_pojavlauncher/src/main/jni/input_bridge_v3.c @@ -620,6 +620,7 @@ static bool tryCriticalNative(JNIEnv *env) { }; jclass criticalNativeTest = (*env)->FindClass(env, "net/kdt/pojavlaunch/CriticalNativeTest"); if(criticalNativeTest == NULL) { + LOGD("No CriticalNativeTest class found !"); (*env)->ExceptionClear(env); return false; } diff --git a/gradle.properties b/gradle.properties index 7be9b6b00..d3bacf9dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,3 +5,5 @@ android.useAndroidX=true android.bundle.language.enableSplit=false # Increase Gradle daemon RAM allocation org.gradle.jvmargs=-Xmx4096M +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba771..d64cd4917 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 508322917..84410b7f7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,8 @@ +#Fri Dec 06 21:56:04 CET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d421..1aa94a426 100755 --- a/gradlew +++ b/gradlew @@ -83,10 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \