Android: minor update

.github/workflows/android.yml

@@ -24,11 +24,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
     - name: Install GNU gettext
       run: sudo apt install gettext
     - name: Build with Gradle

Android/app/build.gradle

@@ -52,10 +52,12 @@ android {
 	}
 
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_17
-		targetCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_17
 	}
 
+	kotlinOptions.jvmTarget = "17"
+
 	buildFeatures {
 		viewBinding true
 	}
@@ -120,7 +122,7 @@ dependencies {
 	/* Third-party libraries */
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.appcompat:appcompat-resources:1.6.1'
-	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
-	implementation 'androidx.work:work-runtime-ktx:2.8.0'
+	implementation 'androidx.work:work-runtime-ktx:2.8.1'
 	implementation 'com.google.android.material:material:1.8.0'
 }

Android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 2;
     private static final int SDL_MINOR_VERSION = 26;
-    private static final int SDL_MICRO_VERSION = 3;
+    private static final int SDL_MICRO_VERSION = 5;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //

Android/app/src/main/java/org/libsdl/app/SDLControllerManager.java

@@ -168,6 +168,32 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
                 arg1Axis = MotionEvent.AXIS_GAS;
             }
 
+            // Make sure the AXIS_Z is sorted between AXIS_RY and AXIS_RZ.
+            // This is because the usual pairing are:
+            // - AXIS_X + AXIS_Y (left stick).
+            // - AXIS_RX, AXIS_RY (sometimes the right stick, sometimes triggers).
+            // - AXIS_Z, AXIS_RZ (sometimes the right stick, sometimes triggers).
+            // This sorts the axes in the above order, which tends to be correct
+            // for Xbox-ish game pads that have the right stick on RX/RY and the
+            // triggers on Z/RZ.
+            //
+            // Gamepads that don't have AXIS_Z/AXIS_RZ but use
+            // AXIS_LTRIGGER/AXIS_RTRIGGER are unaffected by this.
+            //
+            // References:
+            // - https://developer.android.com/develop/ui/views/touch-and-input/game-controllers/controller-input
+            // - https://www.kernel.org/doc/html/latest/input/gamepad.html
+            if (arg0Axis == MotionEvent.AXIS_Z) {
+                arg0Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg0Axis > MotionEvent.AXIS_Z && arg0Axis < MotionEvent.AXIS_RZ) {
+                --arg0Axis;
+            }
+            if (arg1Axis == MotionEvent.AXIS_Z) {
+                arg1Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg1Axis > MotionEvent.AXIS_Z && arg1Axis < MotionEvent.AXIS_RZ) {
+                --arg1Axis;
+            }
+
             return arg0Axis - arg1Axis;
         }
     }

Android/build.gradle

@@ -16,10 +16,10 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.4.1'
+		classpath 'com.android.tools.build:gradle:8.0.1'
 		//noinspection GradleDependency
 		classpath 'de.undercouch:gradle-download-task:4.1.2'
-		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10'
+		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
 	}

Android/gradle.properties

@@ -1,7 +1,7 @@
 <#if isLowMemory>
-org.gradle.jvmargs=-Xmx4G -XX:MaxPermSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 <#else>
-org.gradle.jvmargs=-Xmx16G -XX:MaxPermSize=8G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx16G -XX:MaxMetaspaceSize=8G -XX:+HeapDumpOnOutOfMemoryError
 </#if>
 org.gradle.daemon=true
 org.gradle.parallel=true
@@ -9,3 +9,6 @@ org.gradle.parallel.threads=8
 org.gradle.configureondemand=true
 android.enableJetifier=false
 android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

Android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 05 18:33:37 EET 2022
+#Fri May 05 22:26:30 TRT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

Android/native/build.gradle

@@ -50,7 +50,7 @@ android {
 
 // get precompiled deps
 task downloadDeps(type: Download) {
-	def VERSION = "22022023"
+	def VERSION = "20042023"
 	src "https://github.com/MultiCraft/deps_android/releases/download/$VERSION/deps_android.zip"
 	dest new File(buildDir, 'deps.zip')
 	overwrite false