[Scummvm-git-logs] scummvm master -> f928dae6d976ac7e9f1a86da5e84b4d4f23053e6
lephilousophe
noreply at scummvm.org
Sat Jan 24 11:44:59 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
8e263bcb4c ANDROID: Update Gradle and Android Gradle Plugin
f928dae6d9 ANDROID: Various cleanups
Commit: 8e263bcb4c0a8b7f0944d33a1568e61eb55162b0
https://github.com/scummvm/scummvm/commit/8e263bcb4c0a8b7f0944d33a1568e61eb55162b0
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-01-24T12:44:54+01:00
Commit Message:
ANDROID: Update Gradle and Android Gradle Plugin
Also modernize build files to make them match what Google does now.
Enable the minimizer to remove Kotlin code (drawn from Androidx
annotations) from the resulting binary.
Changed paths:
A dists/android/proguard-rules.pro
dists/android/build.gradle
dists/android/gradle.properties
dists/android/gradle/wrapper/gradle-wrapper.properties
dists/android/gradlew
dists/android/mainAssets.gradle
dists/android/settings.gradle
diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index 451e176c771..445e20a4a82 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -1,19 +1,5 @@
-buildscript {
- repositories {
- gradlePluginPortal()
- google()
- mavenCentral()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:8.13.1'
- }
-}
-
-dependencies {
- repositories {
- google()
- mavenCentral()
- }
+plugins {
+ id('com.android.application') version '9.0.0'
}
// Load our source dependent properties
@@ -27,21 +13,25 @@ tasks.withType(JavaCompile).configureEach {
//gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS_FULL
-apply plugin: 'com.android.application'
-
android {
- compileSdk = 36
- ndkVersion = "23.2.8568313"
-
namespace = "org.scummvm.scummvm"
+ //targetSdkVersion defaults to compileSdk
+ compileSdk {
+ version = release(36)
+ }
+ ndkVersion = "23.2.8568313"
+ enableKotlin = false
+
defaultConfig {
applicationId "org.scummvm.scummvm"
- base.archivesName = "ScummVM"
-
minSdkVersion 16
- targetSdkVersion 36
+
+ // Includes the default ProGuard rules files that are packaged with
+ // the Android Gradle plugin. To learn more, go to the section about
+ // R8 configuration files.
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), srcProperties['srcdir'] + '/dists/android/proguard-rules.pro'
versionName "2026.1.1"
versionCode 26011000
@@ -93,8 +83,8 @@ android {
// ScummVM 1.9.0.1: 25 - 28
// ScummVM 1.9.0: 19
// ScummVM 1.8.1: 15
-
}
+
buildTypes {
debug{
applicationIdSuffix ".debug"
@@ -106,16 +96,12 @@ android {
debuggable false
// Enables code shrinking, obfuscation, and optimization for only
// your project's release build type.
- minifyEnabled false
+ minifyEnabled true
// Enables resource shrinking, which is performed by the
// Android Gradle plugin.
- //shrinkResources true
+ shrinkResources true
- // Includes the default ProGuard rules files that are packaged with
- // the Android Gradle plugin. To learn more, go to the section about
- // R8 configuration files.
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
sourceSets {
@@ -136,9 +122,8 @@ android {
if (project.hasProperty('splitAssets')) {
assetPacks = [':mainAssets']
}
-
}
dependencies {
- implementation "androidx.annotation:annotation:1.7.1"
+ implementation "androidx.annotation:annotation:1.9.1"
}
diff --git a/dists/android/gradle.properties b/dists/android/gradle.properties
index 43caf404b82..8fe20ee35b0 100644
--- a/dists/android/gradle.properties
+++ b/dists/android/gradle.properties
@@ -1,3 +1 @@
org.gradle.jvmargs=-Xmx4096m
-android.useAndroidX=true
-android.enableJetifier=false
diff --git a/dists/android/gradle/wrapper/gradle-wrapper.properties b/dists/android/gradle/wrapper/gradle-wrapper.properties
index 2a84e188b85..19a6bdeb848 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-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/dists/android/gradlew b/dists/android/gradlew
index 23d15a93670..ef07e0162b1 100755
--- a/dists/android/gradlew
+++ b/dists/android/gradlew
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/dists/android/mainAssets.gradle b/dists/android/mainAssets.gradle
index 9425b4c30b8..e452714c2f9 100644
--- a/dists/android/mainAssets.gradle
+++ b/dists/android/mainAssets.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'com.android.asset-pack'
+ id('com.android.asset-pack')
}
if (project.hasProperty('splitAssets')) {
diff --git a/dists/android/proguard-rules.pro b/dists/android/proguard-rules.pro
new file mode 100644
index 00000000000..e9caf6359a5
--- /dev/null
+++ b/dists/android/proguard-rules.pro
@@ -0,0 +1 @@
+-dontobfuscate
diff --git a/dists/android/settings.gradle b/dists/android/settings.gradle
index 2ee4eee0d99..544536e8834 100644
--- a/dists/android/settings.gradle
+++ b/dists/android/settings.gradle
@@ -1 +1,23 @@
+pluginManagement {
+ repositories {
+ google {
+ content {
+ includeGroupByRegex("com\\.android.*")
+ includeGroupByRegex("com\\.google.*")
+ includeGroupByRegex("androidx.*")
+ }
+ }
+ mavenCentral()
+ gradlePluginPortal()
+ }
+}
+dependencyResolutionManagement {
+ repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+ repositories {
+ google()
+ mavenCentral()
+ }
+}
+
+rootProject.name = "ScummVM"
include ':mainAssets'
Commit: f928dae6d976ac7e9f1a86da5e84b4d4f23053e6
https://github.com/scummvm/scummvm/commit/f928dae6d976ac7e9f1a86da5e84b4d4f23053e6
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-01-24T12:44:54+01:00
Commit Message:
ANDROID: Various cleanups
- Add code regions to allow for easy folding
- Sort permissions and features and add new ones.
Changed paths:
backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
dists/android/AndroidManifest.xml
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
index 7f5b304adfb..41725a0a30c 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
@@ -128,7 +128,6 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
public View _screenKeyboard = null;
private boolean keyboardWithoutTextInputShown = false;
-// boolean _isPaused = false;
private InputMethodManager _inputManager = null;
// Set to true in onDestroy
@@ -1374,17 +1373,6 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
}
}
-// // Shows the system bars by removing all the flags
-// // except for the ones that make the content appear under the system bars.
-// @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-// private void showSystemUI() {
-// View decorView = getWindow().getDecorView();
-// decorView.setSystemUiVisibility(
-// View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-// | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-// | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-// }
-
// // Show or hide the Android keyboard.
// // Called by the override of showVirtualKeyboard()
// @TargetApi(Build.VERSION_CODES.CUPCAKE)
@@ -1474,6 +1462,9 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
return getWindowManager().getDefaultDisplay().getPixelFormat();
}
+ // region Configuration migration and internal folder init
+ // -------------------------------------------------------------------------------------------
+
// Auxiliary function to overwrite a file (used for overwriting the scummvm.ini file with an existing other one)
private static void copyFileUsingStream(File source, File dest) throws IOException {
try (InputStream is = new FileInputStream(source); OutputStream os = new FileOutputStream(dest)) {
@@ -2042,6 +2033,11 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
return true;
}
+ // endregion
+
+ // region Assets extraction and update
+ // -------------------------------------------------------------------------------------------
+
// Deletes recursively a directory and its contents
private static void deleteDir(File dir) {
for (File child : dir.listFiles()) {
@@ -2306,8 +2302,9 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
}
}
- // -------------------------------------------------------------------------------------------
- // Start of SAF enabled code
+ // endregion
+
+ // region Start of SAF enabled code
// -------------------------------------------------------------------------------------------
public void onActivityResult(int requestCode, int resultCode, Intent resultData) {
synchronized(safSyncObject) {
@@ -2397,9 +2394,7 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
return resultURI;
}
- // -------------------------------------------------------------------------------------------
- // End of SAF enabled code
- // -------------------------------------------------------------------------------------------
+ // endregion
} // end of ScummVMActivity
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 8c0cff19433..5f8efb50b9e 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -7,25 +7,40 @@
android:sharedUserMaxSdkVersion="32"
tools:targetApi="tiramisu">
- <uses-permission
- android:name="android.permission.WRITE_EXTERNAL_STORAGE"
- tools:ignore="ScopedStorage" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+ <uses-permission android:name="android.permission.INTERNET" />
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"
android:maxSdkVersion="32" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission
+ android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+ tools:ignore="ScopedStorage" />
<uses-feature
- android:name="android.hardware.wifi"
+ android:name="android.hardware.audio.low_latency"
+ android:required="false" />
+ <uses-feature
+ android:name="android.hardware.audio.output"
+ android:required="false" />
+ <uses-feature
+ android:name="android.hardware.gamepad"
android:required="false" />
<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />
+ <uses-feature
+ android:name="android.hardware.touchscreen.multitouch.distinct"
+ android:required="false" />
+ <uses-feature
+ android:name="android.hardware.wifi"
+ android:required="false" />
<uses-feature
android:name="android.software.leanback"
android:required="false" />
+ <uses-feature
+ android:name="android.software.app_widgets"
+ android:required="false" />
<uses-feature
android:glEsVersion="0x00020000"
android:required="true" />
More information about the Scummvm-git-logs
mailing list