From 21230fda3e07712bc9859fdada52a2bf7492a1f0 Mon Sep 17 00:00:00 2001 From: Kyle Szklenski Date: Wed, 9 Jul 2025 08:33:16 -0400 Subject: [PATCH] Update required version numbers for Android (cherry picked from commit 21d73401623085e361f439872246b38725c7d284) --- .gitignore | 1 + platform/android/export/export_plugin.cpp | 6 +++--- .../build.gradle | 2 +- platform/android/java/app/build.gradle | 2 +- platform/android/java/app/config.gradle | 14 +++++++------- platform/android/java/app/settings.gradle | 2 +- .../java/gradle/wrapper/gradle-wrapper.properties | 2 +- platform/android/java/settings.gradle | 4 ++-- 8 files changed, 17 insertions(+), 16 deletions(-) rename platform/android/java/app/{assetPacks/installTime => assetPackInstallTime}/build.gradle (65%) diff --git a/.gitignore b/.gitignore index 267a829d951..dd78613a80a 100644 --- a/.gitignore +++ b/.gitignore @@ -79,6 +79,7 @@ local.properties *.iml .gradletasknamecache project.properties +platform/android/java/build/ platform/android/java/*/.cxx/ platform/android/java/*/build/ platform/android/java/*/libs/ diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index 6999f413ffb..d70a9a56cdc 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -224,10 +224,10 @@ static const int EXPORT_FORMAT_APK = 0; static const int EXPORT_FORMAT_AAB = 1; 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_TARGET_SDK_VERSION = 34; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk' +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 = 35; // 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/assetPacks/installTime/build.gradle b/platform/android/java/app/assetPackInstallTime/build.gradle similarity index 65% rename from platform/android/java/app/assetPacks/installTime/build.gradle rename to platform/android/java/app/assetPackInstallTime/build.gradle index 46fa046ed4f..f10ddb340c7 100644 --- a/platform/android/java/app/assetPacks/installTime/build.gradle +++ b/platform/android/java/app/assetPackInstallTime/build.gradle @@ -3,7 +3,7 @@ plugins { } assetPack { - packName = "installTime" // Directory name for the asset pack + packName = "assetPackInstallTime" // Directory name for the asset pack dynamicDelivery { deliveryType = "install-time" // Delivery mode } diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index d996078026d..b868608c94c 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -101,7 +101,7 @@ android { jvmTarget = versions.javaVersion } - assetPacks = [":assetPacks:installTime"] + assetPacks = [":assetPackInstallTime"] namespace = 'com.godot.game' diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index 7a0c2e2ec42..be1f715d322 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -1,11 +1,11 @@ ext.versions = [ - androidGradlePlugin: '8.2.0', - compileSdk : 34, - minSdk : 19, // 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' - buildTools : '34.0.0', - kotlinVersion : '1.9.20', - fragmentVersion : '1.6.2', + androidGradlePlugin: '8.6.1', + compileSdk : 35, + minSdk : 21, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION' + targetSdk : 35, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION' + buildTools : '35.0.0', + kotlinVersion : '2.1.20', + fragmentVersion : '1.8.6', nexusPublishVersion: '1.3.0', javaVersion : JavaVersion.VERSION_17, ndkVersion : '23.2.8568313' // Also update 'platform/android/detect.py#get_ndk_version' when this is updated. diff --git a/platform/android/java/app/settings.gradle b/platform/android/java/app/settings.gradle index 90537ee7a2a..62fe57ce591 100644 --- a/platform/android/java/app/settings.gradle +++ b/platform/android/java/app/settings.gradle @@ -14,4 +14,4 @@ pluginManagement { } } -include ':assetPacks:installTime' +include ':assetPackInstallTime' diff --git a/platform/android/java/gradle/wrapper/gradle-wrapper.properties b/platform/android/java/gradle/wrapper/gradle-wrapper.properties index 15de90249f9..81aa1c0448a 100644 --- a/platform/android/java/gradle/wrapper/gradle-wrapper.properties +++ b/platform/android/java/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME 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 zipStorePath=wrapper/dists diff --git a/platform/android/java/settings.gradle b/platform/android/java/settings.gradle index 3137e742441..984622216bc 100644 --- a/platform/android/java/settings.gradle +++ b/platform/android/java/settings.gradle @@ -24,5 +24,5 @@ include ':lib' include ':nativeSrcsConfigs' include ':editor' -include ':assetPacks:installTime' -project(':assetPacks:installTime').projectDir = file("app/assetPacks/installTime") +include ':assetPackInstallTime' +project(':assetPackInstallTime').projectDir = file("app/assetPackInstallTime")