Skip to content

Commit 4b4144c

Browse files
committed
Annual versions bump for the Android platform
- gradle: 8.2 -> 8.11.1 - androidx.constraintlayout:constraintlayout: 2.1.4 -> 2.2.1 - Android gradle plugin: 8.2.0 -> 8.6.1 - Android compile sdk: 34 -> 35 - Android target sdk: 34 -> 35 - Android build tools: 34.0.0 -> 35.0.0 - kotlin: 1.9.20 -> 2.1.20 - androidx.fragment:fragment: 1.7.1 -> 1.8.6 - OpenXR vendors plugin: 3.1.2-stable -> 4.0.0-stable
1 parent 6a6a116 commit 4b4144c

File tree

8 files changed

+16
-14
lines changed

8 files changed

+16
-14
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ local.properties
8989
*.iml
9090
.gradletasknamecache
9191
project.properties
92+
platform/android/java/build/
9293
platform/android/java/*/.cxx/
9394
platform/android/java/*/build/
9495
platform/android/java/*/libs/

platform/android/export/export_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ static const char *AAB_ASSETS_DIRECTORY = "assetPacks/installTime/src/main/asset
283283

284284
static const int OPENGL_MIN_SDK_VERSION = 21; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
285285
static const int VULKAN_MIN_SDK_VERSION = 24;
286-
static const int DEFAULT_TARGET_SDK_VERSION = 34; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
286+
static const int DEFAULT_TARGET_SDK_VERSION = 35; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
287287

288288
#ifndef ANDROID_ENABLED
289289
void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {

platform/android/java/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ android {
9090
jvmTarget = versions.javaVersion
9191
}
9292

93-
assetPacks = [":assetPacks:installTime"]
93+
assetPacks = [":assetPacksInstallTime"]
9494

9595
namespace = 'com.godot.game'
9696

platform/android/java/app/config.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
ext.versions = [
2-
androidGradlePlugin: '8.2.0',
3-
compileSdk : 34,
2+
androidGradlePlugin: '8.6.1',
3+
compileSdk : 35,
44
// Also update 'platform/android/export/export_plugin.cpp#OPENGL_MIN_SDK_VERSION'
55
minSdk : 21,
66
// Also update 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION'
7-
targetSdk : 34,
8-
buildTools : '34.0.0',
9-
kotlinVersion : '1.9.20',
10-
fragmentVersion : '1.7.1',
7+
targetSdk : 35,
8+
buildTools : '35.0.0',
9+
kotlinVersion : '2.1.20',
10+
fragmentVersion : '1.8.6',
1111
nexusPublishVersion: '1.3.0',
1212
javaVersion : JavaVersion.VERSION_17,
1313
// Also update 'platform/android/detect.py#get_ndk_version()' when this is updated.
1414
ndkVersion : '27.2.12479018',
1515
splashscreenVersion: '1.0.1',
16-
openxrVendorsVersion: '3.1.2-stable'
16+
openxrVendorsVersion: '4.0.0-stable'
1717

1818
]
1919

platform/android/java/app/settings.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ pluginManagement {
1515
}
1616
}
1717

18-
include ':assetPacks:installTime'
18+
include ':assetPacksInstallTime'
19+
project(':assetPacksInstallTime').projectDir = file("assetPacks/installTime")

platform/android/java/editor/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ dependencies {
186186

187187
implementation "androidx.window:window:1.3.0"
188188
implementation "androidx.core:core-splashscreen:$versions.splashscreenVersion"
189-
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
189+
implementation "androidx.constraintlayout:constraintlayout:2.2.1"
190190
implementation "org.bouncycastle:bcprov-jdk15to18:1.78"
191191

192192
// Meta dependencies
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Jan 17 12:08:26 PST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

platform/android/java/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ include ':lib'
2525
include ':nativeSrcsConfigs'
2626
include ':editor'
2727

28-
include ':assetPacks:installTime'
29-
project(':assetPacks:installTime').projectDir = file("app/assetPacks/installTime")
28+
include ':assetPacksInstallTime'
29+
project(':assetPacksInstallTime').projectDir = file("app/assetPacks/installTime")

0 commit comments

Comments
 (0)