From e86050e745ec8b2a2035744cc6a14cbbe2e75e33 Mon Sep 17 00:00:00 2001 From: Fredia Huya-Kouadio Date: Mon, 8 Dec 2025 10:19:40 -0800 Subject: [PATCH] Annual Android versions bump for 2026 --- modules/text_server_adv/text_server_adv.h | 4 ++-- platform/android/detect.py | 2 +- platform/android/export/export_plugin.cpp | 2 +- platform/android/java/app/config.gradle | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/text_server_adv/text_server_adv.h b/modules/text_server_adv/text_server_adv.h index a04c23bdfcb..ae55824f85b 100644 --- a/modules/text_server_adv/text_server_adv.h +++ b/modules/text_server_adv/text_server_adv.h @@ -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 GODOT_GCC_WARNING_POP -#if defined(__EMSCRIPTEN__) || __clang_major__ >= 21 +#if defined(__EMSCRIPTEN__) || (defined(__MINGW32__) && __clang_major__ >= 21) GODOT_CLANG_WARNING_POP #endif diff --git a/platform/android/detect.py b/platform/android/detect.py index a5937657446..a272a632252 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -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'. diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index d4c7f3844df..e20aaec7070 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -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) { diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index 7d6b2108578..167d5d25b53 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -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',