godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #113761 from m4gr3d/bump_android_version_2026 

Annual Android versions bump for 2026
This commit is contained in:
Thaddeus Crews 2026-01-28 17:58:21 -06:00
parent 63c0e9a9fb e86050e745
commit 6539f7fade
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/text_server_adv/text_server_adv.h
View File

@ -95,7 +95,7 @@ using namespace godot;
// Thirdparty headers.
GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
#if defined(__EMSCRIPTEN__) || __clang_major__ >= 21
#if defined(__EMSCRIPTEN__) || (defined(__MINGW32__) && __clang_major__ >= 21)
GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunnecessary-virtual-specifier")
#endif
@ -113,7 +113,7 @@ GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunnecessary-virtual-specifier")
#include <unicode/utypes.h>
GODOT_GCC_WARNING_POP
#if defined(__EMSCRIPTEN__) || __clang_major__ >= 21
#if defined(__EMSCRIPTEN__) || (defined(__MINGW32__) && __clang_major__ >= 21)
GODOT_CLANG_WARNING_POP
#endif

2
platform/android/detect.py
View File

@ -68,7 +68,7 @@ def get_android_ndk_root(env: "SConsEnvironment"):
# This is kept in sync with the value in 'platform/android/java/app/config.gradle'.
def get_ndk_version():
return "28.1.13356709"
return "29.0.14206865"
# This is kept in sync with the value in 'platform/android/java/app/config.gradle'.

2
platform/android/export/export_plugin.cpp
View File

@ -288,7 +288,7 @@ static const char *APK_ASSETS_DIRECTORY = "src/main/assets";
static const char *AAB_ASSETS_DIRECTORY = "assetPackInstallTime/src/main/assets";
static const int DEFAULT_MIN_SDK_VERSION = 24; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
static const int DEFAULT_TARGET_SDK_VERSION = 35; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
static const int DEFAULT_TARGET_SDK_VERSION = 36; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
#ifndef ANDROID_ENABLED
void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {

12
platform/android/java/app/config.gradle
View File

@ -1,23 +1,23 @@
ext.versions = [
androidGradlePlugin: '8.6.1',
compileSdk : 35,
compileSdk : 36,
// Also update:
// - 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION'
// - 'platform/android/detect.py#get_min_target_api()'
minSdk : 24,
// Also update 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION'
targetSdk : 35,
buildTools : '35.0.1',
kotlinVersion : '2.1.20',
targetSdk : 36,
buildTools : '36.1.0',
kotlinVersion : '2.1.21',
fragmentVersion : '1.8.6',
nexusPublishVersion: '1.3.0',
javaVersion : JavaVersion.VERSION_17,
// Also update 'platform/android/detect.py#get_ndk_version()' when this is updated.
ndkVersion : '28.1.13356709',
ndkVersion : '29.0.14206865',
splashscreenVersion: '1.0.1',
// 'openxrLoaderVersion' should be set to XR_CURRENT_API_VERSION, see 'thirdparty/openxr'
openxrLoaderVersion: '1.1.53',
openxrVendorsVersion: '4.2.2-stable',
openxrVendorsVersion: '4.3.0-stable',
junitVersion : '1.3.0',
espressoCoreVersion: '3.7.0',
kotlinTestVersion : '1.3.11',