[Scummvm-git-logs] scummvm branch-2-8 -> eaccc4614e88476f73293dd3ad033ffc76c37ab8

lephilousophe noreply at scummvm.org
Thu Aug 29 15:26:07 UTC 2024 

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

Summary:
e1d61b5abe ANDROID: Add bundle build method
37171162d7 DISTS: ANDROID: Use new schema for version codes
39d299e080 ANDROID: Upgrade to latest Android Gradle Plugin
eaccc4614e ANDROID: Upgrade target SDK level to 34 (Android 14 U)


Commit: e1d61b5abe6f58eb22f1ea1bdc6e979149efe378
    https://github.com/scummvm/scummvm/commit/e1d61b5abe6f58eb22f1ea1bdc6e979149efe378
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-08-29T16:56:39+02:00

Commit Message:
ANDROID: Add bundle build method

Changed paths:
    backends/platform/android/android.mk


diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 838294e0cbf..2274098240e 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -11,6 +11,7 @@ PATH_BUILD_LIBSCUMMVM = $(PATH_BUILD)/lib/$(ABI)/libscummvm.so
 
 APK_MAIN = ScummVM-debug.apk
 APK_MAIN_RELEASE = ScummVM-release-unsigned.apk
+AAB_MAIN_RELEASE = ScummVM-release.aab
 
 DIST_FILES_HELP = $(PATH_DIST)/android-help.zip
 
@@ -60,6 +61,10 @@ $(APK_MAIN_RELEASE): $(PATH_BUILD_GRADLE) $(PATH_BUILD_ASSETS) $(PATH_BUILD_ASSE
 	(cd $(PATH_BUILD); ./gradlew assembleRelease)
 	$(CP) $(PATH_BUILD)/build/outputs/apk/release/$(APK_MAIN_RELEASE) $@
 
+$(AAB_MAIN_RELEASE): $(PATH_BUILD_GRADLE) $(PATH_BUILD_ASSETS) $(PATH_BUILD_ASSETS)/cacert.pem $(PATH_BUILD_LIBSCUMMVM) | $(PATH_BUILD)
+	(cd $(PATH_BUILD); ./gradlew bundleRelease)
+	$(CP) $(PATH_BUILD)/build/outputs/bundle/release/$(AAB_MAIN_RELEASE) $@
+
 all: $(APK_MAIN)
 
 clean: androidclean
@@ -68,6 +73,7 @@ androidclean:
 	@$(RM) -rf $(PATH_BUILD) *.apk
 
 androidrelease: $(APK_MAIN_RELEASE)
+androidbundlerelease: $(AAB_MAIN_RELEASE)
 
 androidtestmain: $(APK_MAIN)
 	(cd $(PATH_BUILD); ./gradlew installDebug)
@@ -96,4 +102,4 @@ androiddistrelease: androidrelease
 		sed 's/$$/\r/' < $$i > release/`basename $$i`.txt; \
 	done
 
-.PHONY: androidrelease androidtest $(PATH_BUILD_SRC)
+.PHONY: androidrelease androidbundlerelease androidtest $(PATH_BUILD_SRC)


Commit: 37171162d7c7309181914fb9c9c7b3b6eb7284cb
    https://github.com/scummvm/scummvm/commit/37171162d7c7309181914fb9c9c7b3b6eb7284cb
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-08-29T16:56:39+02:00

Commit Message:
DISTS: ANDROID: Use new schema for version codes

New version code numbering is indicative of current version, beta build and target architecture

Changed paths:
    dists/android/build.gradle


diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index a45f2282905..462247ee5c0 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -41,8 +41,19 @@ android {
         targetSdkVersion 33
 
         versionName "2.8.0"
-        versionCode 113
+        versionCode 2080001
         // versioncode must be incremented for each market upload
+		// maximum versioncode allowed by Play Store is: 2100000000
+		// After 2.8.0 release the versioncode numbering schema changed to be more immediately helpful.
+		// It now follows the format: M.mm.p[.bb][.a]
+		// (M is major release version number)
+		// (m is minor release version number)
+		// (p is patch/bugfix release number)
+		// (b is beta build number, if beta testing was done on Play Store)
+		// (a is a number indicating the target architecture (ABI):
+		//     (1: arm-v7a, 2: arm64-v8a, 3: x86, 4: x86_64)
+		// eg. ScummVM 2.9.0 builds would have version codes: 2090001 - 2090004
+		// --------------
         // ScummVM 2.8.0:   113 - 116 (arm-v7a, arm64-v8a, x86, x86_64 respectively)
         // ScummVM 2.7.1:   109 - 112 (arm-v7a, arm64-v8a, x86, x86_64 respectively) (release on Play Store)
         // Historical version codes:


Commit: 39d299e080f787425cd02244523b31195b647683
    https://github.com/scummvm/scummvm/commit/39d299e080f787425cd02244523b31195b647683
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-08-29T16:56:39+02:00

Commit Message:
ANDROID: Upgrade to latest Android Gradle Plugin

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


diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index 462247ee5c0..de7621f0a53 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
     }
 }
 
diff --git a/dists/android/gradle/wrapper/gradle-wrapper.properties b/dists/android/gradle/wrapper/gradle-wrapper.properties
index f398c33c4b0..20db9ad5c95 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-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists


Commit: eaccc4614e88476f73293dd3ad033ffc76c37ab8
    https://github.com/scummvm/scummvm/commit/eaccc4614e88476f73293dd3ad033ffc76c37ab8
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-08-29T16:56:44+02:00

Commit Message:
ANDROID: Upgrade target SDK level to 34 (Android 14 U)

Changed paths:
    dists/android/build.gradle


diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index de7621f0a53..9897c847f3f 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -26,8 +26,8 @@ tasks.withType(JavaCompile) {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 33
-    buildToolsVersion "33.0.1"
+    compileSdk 34
+    buildToolsVersion "34.0.0"
     ndkVersion "21.3.6528147"
 
     namespace "org.scummvm.scummvm"
@@ -38,7 +38,7 @@ android {
         setProperty("archivesBaseName", "ScummVM")
 
         minSdkVersion 16
-        targetSdkVersion 33
+        targetSdkVersion 34
 
         versionName "2.8.0"
         versionCode 2080001

More information about the Scummvm-git-logs mailing list