Update AGP, work on Android 14 support

Author: thejudge156

build.gradle

@@ -1,15 +1,16 @@
 plugins {
-    id("com.android.library") version("7.4.2")
+    id("com.android.library") version('8.9.1')
 }
 
 android {
-    ndkVersion = "26.1.10909125"
-    compileSdkVersion = "android-34"
+    namespace 'pojlib'
+    ndkVersion = "27.2.12479018"
+    compileSdkVersion = "android-35"
     defaultConfig {
         minSdk 29
         multiDexEnabled true
         ndk.stl = "c++_shared"
-        targetSdk 34
+        targetSdk 35
     }
 
     buildTypes {
@@ -27,13 +28,19 @@ android {
         }
     }
 
-    buildToolsVersion = "30.0.3"
+    buildToolsVersion = '35.0.0'
 }
 
 build {
     //finalizedBy(':wrapper:launcher:build')
 }
 
+afterEvaluate {
+    // Explicit dependencies for which the apk relies on
+    tasks.mergeDebugAssets.dependsOn(":jre_lwjgl3glfw:jar")
+    tasks.mergeReleaseAssets.dependsOn(":jre_lwjgl3glfw:jar")
+}
+
 dependencies {
     // This dependency is exported to consumers, that is to say found on their compile classpath.
     api("org.apache.commons:commons-math3:3.6.1")

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Jun 04 16:34:57 EDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/AndroidManifest.xml

@@ -1,5 +1,12 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="pojlib.android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <application android:allowNativeHeapPointerTagging="false"/>
+    <application android:allowNativeHeapPointerTagging="false"
+        tools:targetApi="30">
+        <activity
+            android:name=".GameActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|keyboard|navigation|uiMode"
+            android:launchMode="singleTop"
+            android:process=":game" />
+    </application>
 </manifest>

src/main/assets/lwjgl/lwjgl-glfw-classes.jar

@@ -1 +1 @@
-1738988056798
+1743052786968

src/main/assets/lwjgl/version

@@ -0,0 +1,30 @@
+package pojlib;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+
+import androidx.annotation.Nullable;
+
+public class GameActivity extends Service {
+    private final Binder mLocalBinder = new Binder();
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mLocalBinder;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public void onTaskRemoved(Intent rootIntent) {
+        //At this point in time  only the game runs and the user poofed the window, time to die
+        stopSelf();
+        android.os.Process.killProcess(android.os.Process.myPid());
+    }
+}

src/main/java/pojlib/GameActivity.java

@@ -1,6 +1,8 @@
 package pojlib;
 
 import android.app.Activity;
+import android.content.Intent;
+import android.content.ServiceConnection;
 
 import com.google.common.collect.Lists;
 
@@ -283,14 +285,14 @@ public static boolean delete(MinecraftInstances instances, MinecraftInstances.In
         return true;
     }
 
+    public static MinecraftAccount currentAcc;
+
     public static void launchInstance(Activity activity, MinecraftAccount account, MinecraftInstances.Instance instance) {
-        try {
-            API.currentInstance = instance;
-            JREUtils.redirectAndPrintJRELog();
-            VLoader.setAndroidInitInfo(activity);
-            JREUtils.launchJavaVM(activity, instance.generateLaunchArgs(account), instance);
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
+        API.currentInstance = instance;
+        currentAcc = account;
+
+        Intent game = new Intent(activity, GameActivity.class);
+        activity.startService(game);
+        activity.bindService(game, (ServiceConnection) activity, 0);
     }
 }

src/main/java/pojlib/InstanceHandler.java

@@ -12,11 +12,14 @@
 import android.app.ActivityManager;
 import android.content.ClipData;
 import android.content.ClipboardManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.IBinder;
 import android.os.Process;
 import android.util.DisplayMetrics;
 import android.view.InputDevice;
@@ -48,11 +51,13 @@
 import pojlib.input.gamepad.Gamepad;
 import pojlib.util.Constants;
 import pojlib.util.FileUtil;
+import pojlib.util.JREUtils;
 import pojlib.util.Logger;
+import pojlib.util.VLoader;
 import pojlib.util.download.DownloadManager;
 import pojlib.util.download.DownloadUtils;
 
-public class UnityPlayerActivity extends ActivityGroup implements IUnityPlayerLifecycleEvents, GrabListener
+public class UnityPlayerActivity extends ActivityGroup implements IUnityPlayerLifecycleEvents, GrabListener, ServiceConnection
 {
     protected UnityPlayer mUnityPlayer; // don't change the name of this variable; referenced from native code
     public static volatile ClipboardManager GLOBAL_CLIPBOARD;
@@ -99,6 +104,7 @@ protected String updateUnityCommandLineArguments(String cmdLine)
         updateWindowSize(this);
         GLOBAL_CLIPBOARD = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
 
+        /*
         mInputManager = new RemapperManager(this, new RemapperView.Builder(null)
                 .remapA(true)
                 .remapB(true)
@@ -116,6 +122,7 @@ protected String updateUnityCommandLineArguments(String cmdLine)
                 .remapDpad(true));
 
         CallbackBridge.nativeSetUseInputStackQueue(true);
+         */
     }
 
     public static String installLWJGL(Activity activity) throws IOException {
@@ -222,7 +229,7 @@ public boolean dispatchGenericMotionEvent(MotionEvent event) {
         if(Gamepad.isGamepadEvent(event)){
             if(mGamepad == null) createGamepad(event.getDevice());
 
-            mInputManager.handleMotionEventInput(this, event, mGamepad);
+            //mInputManager.handleMotionEventInput(this, event, mGamepad);
             return true;
         }
 
@@ -307,7 +314,7 @@ public boolean processKeyEvent(KeyEvent event) {
         if(Gamepad.isGamepadEvent(event)){
             if(mGamepad == null) createGamepad(event.getDevice());
 
-            mInputManager.handleKeyEventInput(this, event, mGamepad);
+            // mInputManager.handleKeyEventInput(this, event, mGamepad);
             return true;
         }
 
@@ -473,4 +480,20 @@ public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
     }
     @Override public boolean onTouchEvent(MotionEvent event)          { return mUnityPlayer.injectEvent(event); }
     /*API12*/ public boolean onGenericMotionEvent(MotionEvent event)  { return mUnityPlayer.injectEvent(event); }
+
+    @Override
+    public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
+        try {
+            JREUtils.redirectAndPrintJRELog();
+            VLoader.setAndroidInitInfo(this);
+            JREUtils.launchJavaVM(this, API.currentInstance.generateLaunchArgs(API.currentAcc), API.currentInstance);
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void onServiceDisconnected(ComponentName componentName) {
+        // noop
+    }
 }