File tree Expand file tree Collapse file tree 8 files changed +16
-14
lines changed Expand file tree Collapse file tree 8 files changed +16
-14
lines changed Original file line number Diff line number Diff line change @@ -89,6 +89,7 @@ local.properties
8989* .iml
9090.gradletasknamecache
9191project.properties
92+ platform /android /java /build /
9293platform /android /java /* /.cxx /
9394platform /android /java /* /build /
9495platform /android /java /* /libs /
Original file line number Diff line number Diff line change @@ -283,7 +283,7 @@ static const char *AAB_ASSETS_DIRECTORY = "assetPacks/installTime/src/main/asset
283283
284284static const int OPENGL_MIN_SDK_VERSION = 21 ; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
285285static 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
289289void EditorExportPlatformAndroid::_check_for_changes_poll_thread (void *ud) {
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 11ext. 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
Original file line number Diff line number Diff line change @@ -15,4 +15,5 @@ pluginManagement {
1515 }
1616}
1717
18- include ' :assetPacks:installTime'
18+ include ' :assetPacksInstallTime'
19+ project(' :assetPacksInstallTime' ). projectDir = file(" assetPacks/installTime" )
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 11# Wed Jan 17 12:08:26 PST 2024
22distributionBase =GRADLE_USER_HOME
33distributionPath =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
55zipStoreBase =GRADLE_USER_HOME
66zipStorePath =wrapper/dists
Original file line number Diff line number Diff line change @@ -25,5 +25,5 @@ include ':lib'
2525include ' :nativeSrcsConfigs'
2626include ' :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" )
You can’t perform that action at this time.
0 commit comments