diff --git a/Source/utils/stdcompat/shared_ptr_array.hpp b/Source/utils/stdcompat/shared_ptr_array.hpp index b01be4463..597638dd3 100644 --- a/Source/utils/stdcompat/shared_ptr_array.hpp +++ b/Source/utils/stdcompat/shared_ptr_array.hpp @@ -6,7 +6,7 @@ namespace devilution { // Apple Clang 12 has a buggy implementation that fails to compile `std::shared_ptr(new T[size])`. -#if (__cplusplus >= 201611L && (!defined(__clang_major__) || __clang_major__ >= 13)) && !defined(NXDK) +#if (__cplusplus >= 201611L && (!defined(__clang_major__) || __clang_major__ >= 13)) && !defined(NXDK) && !defined(__ANDROID__) template using ArraySharedPtr = std::shared_ptr; diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle index af29fddf9..2dba407ec 100644 --- a/android-project/app/build.gradle +++ b/android-project/app/build.gradle @@ -7,16 +7,14 @@ if (buildAsApplication) { } android { - //ndkVersion '25.0.8775105' - //ndkVersion '24.0.8215888' - ndkVersion '23.2.8568313' - compileSdk 32 + ndkVersion '25.2.9519653' + compileSdk 33 defaultConfig { if (buildAsApplication) { applicationId "org.diasurgical.devilutionx" } minSdkVersion 18 - targetSdkVersion 32 + targetSdkVersion 33 versionCode 26 versionName project.file('../../VERSION').text.trim() externalNativeBuild { diff --git a/android-project/gradle/wrapper/gradle-wrapper.properties b/android-project/gradle/wrapper/gradle-wrapper.properties index 872f008c8..ec908fc33 100644 --- a/android-project/gradle/wrapper/gradle-wrapper.properties +++ b/android-project/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jul 25 04:46:02 CEST 2022 +#Sat Aug 19 20:48:57 CEST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME