Upgrade to support latest Android API level

This commit is contained in:
Condorra 2026-07-22 22:11:36 +10:00
parent 4a0cf39164
commit 55443e8ea0
7 changed files with 44 additions and 18 deletions

View File

@ -51,14 +51,14 @@ def twaManifest = [
] ]
android { android {
compileSdkVersion 35 compileSdkVersion 36
namespace "org.blastmud.game" namespace "org.blastmud.game"
defaultConfig { defaultConfig {
applicationId "org.blastmud.game" applicationId "org.blastmud.game"
minSdkVersion 19 minSdkVersion 23
targetSdkVersion 35 targetSdkVersion 36
versionCode 16 versionCode 20
versionName "15" versionName "20"
// The name for the application // The name for the application
resValue "string", "appName", twaManifest.name resValue "string", "appName", twaManifest.name
@ -71,6 +71,8 @@ android {
resValue "string", "launchUrl", launchUrl resValue "string", "launchUrl", launchUrl
// The URL the Web Manifest for the Progressive Web App that the TWA points to. This // The URL the Web Manifest for the Progressive Web App that the TWA points to. This
// is used by Chrome OS and Meta Quest to open the Web version of the PWA instead of // is used by Chrome OS and Meta Quest to open the Web version of the PWA instead of
// the TWA, as it will probably give a better user experience for non-mobile devices. // the TWA, as it will probably give a better user experience for non-mobile devices.
@ -145,6 +147,8 @@ android {
resValue "bool", "enableSiteSettingsShortcut", twaManifest.enableSiteSettingsShortcut resValue "bool", "enableSiteSettingsShortcut", twaManifest.enableSiteSettingsShortcut
resValue "string", "orientation", twaManifest.orientation resValue "string", "orientation", twaManifest.orientation
} }
buildTypes { buildTypes {
release { release {
@ -204,6 +208,6 @@ repositories {
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.5.0' implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.6.2'
} }

View File

@ -62,10 +62,17 @@
<activity android:name="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity"> <activity android:name="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity"
<meta-data android:exported="false"
android:name="android.support.customtabs.trusted.MANAGE_SPACE_URL" android:enabled="true"
android:value="@string/launchUrl" /> android:excludeFromRecents="true">
<meta-data
android:name="android.support.customtabs.trusted.MANAGE_SPACE_URL"
android:value="@string/launchUrl" />
<intent-filter>
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity> </activity>
@ -80,6 +87,8 @@
android:name="android.support.customtabs.trusted.STATUS_BAR_COLOR" android:name="android.support.customtabs.trusted.STATUS_BAR_COLOR"
android:resource="@color/colorPrimary" /> android:resource="@color/colorPrimary" />
<meta-data <meta-data
android:name="android.support.customtabs.trusted.STATUS_BAR_COLOR_DARK" android:name="android.support.customtabs.trusted.STATUS_BAR_COLOR_DARK"
android:resource="@color/colorPrimaryDark" /> android:resource="@color/colorPrimaryDark" />
@ -128,6 +137,8 @@
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
@ -138,10 +149,14 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE"/> <category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="https" <data android:scheme="https"
android:host="@string/hostName"/> android:host="@string/hostName"
/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="com.google.androidbrowserhelper.trusted.FocusActivity" /> <activity android:name="com.google.androidbrowserhelper.trusted.FocusActivity" />

View File

@ -17,6 +17,12 @@
<resources> <resources>
<!--
The "fullscreen" and "fullscreen-sticky" TWA manifest values correspond to "immersive" and "sticky-immersive"
AndroidManifest values.
-->
<!-- <!--
This variable below expresses the relationship between the app and the site, This variable below expresses the relationship between the app and the site,
as documented in the TWA documentation at as documented in the TWA documentation at

View File

@ -23,7 +23,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.5.0' classpath 'com.android.tools.build:gradle:8.9.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

View File

@ -2,6 +2,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true

View File

@ -1 +1 @@
296fb7d46fa04c54a902abeb542c47a244d2f860 1b4cde22094066256ef46b78ab04c2a1e70d99bf

View File

@ -20,8 +20,8 @@
"path": "../../../android.keystore", "path": "../../../android.keystore",
"alias": "upload" "alias": "upload"
}, },
"appVersionName": "15", "appVersionName": "20",
"appVersionCode": 16, "appVersionCode": 20,
"shortcuts": [], "shortcuts": [],
"generatorApp": "bubblewrap-cli", "generatorApp": "bubblewrap-cli",
"webManifestUrl": "https://www.blastmud.org/manifest.json", "webManifestUrl": "https://www.blastmud.org/manifest.json",
@ -34,10 +34,11 @@
"isChromeOSOnly": false, "isChromeOSOnly": false,
"isMetaQuest": false, "isMetaQuest": false,
"fullScopeUrl": "https://www.blastmud.org/", "fullScopeUrl": "https://www.blastmud.org/",
"minSdkVersion": 19, "minSdkVersion": 23,
"orientation": "user", "orientation": "user",
"fingerprints": [], "fingerprints": [],
"additionalTrustedOrigins": [], "additionalTrustedOrigins": [],
"retainedBundles": [], "retainedBundles": [],
"appVersion": "15" "displayOverride": [],
"appVersion": "20"
} }