Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 07:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update required version numbers for Android

Browse source
This commit is contained in:
Kyle Szklenski 2025-07-09 08:33:16 -04:00
parent 17b5769d56
commit 21d7340162
8 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -79,6 +79,7 @@ local.properties
*.iml *.iml
.gradletasknamecache .gradletasknamecache
project.properties project.properties
platform/android/java/build/
platform/android/java/*/.cxx/ platform/android/java/*/.cxx/
platform/android/java/*/build/ platform/android/java/*/build/
platform/android/java/*/libs/ platform/android/java/*/libs/

6
platform/android/export/export_plugin.cpp
View file

@ -224,10 +224,10 @@ static const int EXPORT_FORMAT_APK = 0;
static const int EXPORT_FORMAT_AAB = 1; static const int EXPORT_FORMAT_AAB = 1;
static const char *APK_ASSETS_DIRECTORY = "res://android/build/assets"; static const char *APK_ASSETS_DIRECTORY = "res://android/build/assets";
static const char *AAB_ASSETS_DIRECTORY = "res://android/build/assetPacks/installTime/src/main/assets"; static const char *AAB_ASSETS_DIRECTORY = "res://android/build/assetPackInstallTime/src/main/assets";
static const int DEFAULT_MIN_SDK_VERSION = 19; // Should match the value in 'platform/android/java/app/config.gradle#minSdk' static const int DEFAULT_MIN_SDK_VERSION = 21; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
static const int DEFAULT_TARGET_SDK_VERSION = 34; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk' static const int DEFAULT_TARGET_SDK_VERSION = 35; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
#ifndef ANDROID_ENABLED #ifndef ANDROID_ENABLED
void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) { void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {

2
platform/android/java/app/assetPacks/installTime/build.gradle → platform/android/java/app/assetPackInstallTime/build.gradle
View file

@ -3,7 +3,7 @@ plugins {
} }
assetPack { assetPack {
packName = "installTime" // Directory name for the asset pack packName = "assetPackInstallTime" // Directory name for the asset pack
dynamicDelivery { dynamicDelivery {
deliveryType = "install-time" // Delivery mode deliveryType = "install-time" // Delivery mode
} }

2
platform/android/java/app/build.gradle
View file

@ -101,7 +101,7 @@ android {
jvmTarget = versions.javaVersion jvmTarget = versions.javaVersion
} }
assetPacks = [":assetPacks:installTime"] assetPacks = [":assetPackInstallTime"]
namespace = 'com.godot.game' namespace = 'com.godot.game'

14
platform/android/java/app/config.gradle
View file

@ -1,11 +1,11 @@
ext.versions = [ ext.versions = [
androidGradlePlugin: '8.2.0', androidGradlePlugin: '8.6.1',
compileSdk : 34, compileSdk : 35,
minSdk : 19, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION' minSdk : 21, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION'
targetSdk : 34, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION' targetSdk : 35, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION'
buildTools : '34.0.0', buildTools : '35.0.0',
kotlinVersion : '1.9.20', kotlinVersion : '2.1.20',
fragmentVersion : '1.6.2', fragmentVersion : '1.8.6',
nexusPublishVersion: '1.3.0', nexusPublishVersion: '1.3.0',
javaVersion : JavaVersion.VERSION_17, javaVersion : JavaVersion.VERSION_17,
ndkVersion : '23.2.8568313' // Also update 'platform/android/detect.py#get_ndk_version' when this is updated. ndkVersion : '23.2.8568313' // Also update 'platform/android/detect.py#get_ndk_version' when this is updated.

2
platform/android/java/app/settings.gradle
View file

@ -14,4 +14,4 @@ pluginManagement {
} }
} }
include ':assetPacks:installTime' include ':assetPackInstallTime'

2
platform/android/java/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
platform/android/java/settings.gradle
View file

@ -24,5 +24,5 @@ include ':lib'
include ':nativeSrcsConfigs' include ':nativeSrcsConfigs'
include ':editor' include ':editor'
include ':assetPacks:installTime' include ':assetPackInstallTime'
project(':assetPacks:installTime').projectDir = file("app/assetPacks/installTime") project(':assetPackInstallTime').projectDir = file("app/assetPackInstallTime")