[Scummvm-git-logs] scummvm master -> bb0cb35ecb27e0b8f5fcd9000057e29e65647765

[lephilousophe]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
be549dca1f ANDROID: Update Gradle and Android Gradle Plugin
c1471ff722 ANDROID: Target Android API level 36 (Android 16)
bb0cb35ecb ANDROID: Opt-in for safer Intents


Commit: be549dca1f1c03725771287662f6e1246e63fad7
    https://github.com/scummvm/scummvm/commit/be549dca1f1c03725771287662f6e1246e63fad7
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-08-04T11:56:44+02:00

Commit Message:
ANDROID: Update Gradle and Android Gradle Plugin

Changed paths:
    dists/android/build.gradle
    dists/android/gradle/wrapper/gradle-wrapper.jar
    dists/android/gradle/wrapper/gradle-wrapper.properties
    dists/android/gradlew


diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index cfa6c9c3934..c24de883b3d 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.11.0'
+        classpath 'com.android.tools.build:gradle:8.12.0'
     }
 }
 
diff --git a/dists/android/gradle/wrapper/gradle-wrapper.jar b/dists/android/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c742..1b33c55baab 100644
Binary files a/dists/android/gradle/wrapper/gradle-wrapper.jar and b/dists/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/dists/android/gradle/wrapper/gradle-wrapper.properties b/dists/android/gradle/wrapper/gradle-wrapper.properties
index ff23a68d70f..2a84e188b85 100644
--- a/dists/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dists/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/dists/android/gradlew b/dists/android/gradlew
index faf93008b77..23d15a93670 100755
--- a/dists/android/gradlew
+++ b/dists/android/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.


Commit: c1471ff722cf0d2891ab29759576e9a0764ad8b9
    https://github.com/scummvm/scummvm/commit/c1471ff722cf0d2891ab29759576e9a0764ad8b9
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-08-04T11:56:44+02:00

Commit Message:
ANDROID: Target Android API level 36 (Android 16)

Changed paths:
    dists/android/build.gradle


diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index c24de883b3d..960a0f05d6f 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -30,7 +30,7 @@ tasks.withType(JavaCompile).configureEach {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk = 35
+    compileSdk = 36
     ndkVersion = "23.2.8568313"
 
     namespace = "org.scummvm.scummvm"
@@ -41,7 +41,7 @@ android {
         base.archivesName = "ScummVM"
 
         minSdkVersion 16
-        targetSdkVersion 35
+        targetSdkVersion 36
 
         versionName "2.10.0"
         versionCode 2100000


Commit: bb0cb35ecb27e0b8f5fcd9000057e29e65647765
    https://github.com/scummvm/scummvm/commit/bb0cb35ecb27e0b8f5fcd9000057e29e65647765
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-08-04T11:56:44+02:00

Commit Message:
ANDROID: Opt-in for safer Intents

Nothing else needs to be done.

Changed paths:
    dists/android/AndroidManifest.xml


diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 5aef1b46948..d4e40808636 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -43,6 +43,7 @@
 		android:description="@string/app_desc"
 		android:enableOnBackInvokedCallback="true"
 		android:icon="@mipmap/scummvm"
+		android:intentMatchingFlags="enforceIntentFilter"
 		android:label="@string/app_name${nameSuffix}"
 		android:requestLegacyExternalStorage="true">
 		<activity