Update Android build.

Themaister · May 13, 2024 · 48877c6 · 48877c6
1 parent 7bd6cf7
commit 48877c6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/application/platforms/android/gradle/build.gradle b/application/platforms/android/gradle/build.gradle
@@ -2,18 +2,18 @@ apply plugin: 'com.android.application'
 
 android {
     namespace "$$NAMESPACE$$"
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 34
 
         ndk {
             abiFilters $$ABIS$$
         }
     }
 
-    ndkVersion '25.1.8937393'
+    ndkVersion '26.3.11579264'
 
     buildTypes {
         debug {

diff --git a/application/platforms/android/gradle/toplevel.build.gradle b/application/platforms/android/gradle/toplevel.build.gradle
@@ -6,7 +6,7 @@ buildscript {
 		mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/tools/setup_android_toolchain.sh b/tools/setup_android_toolchain.sh
@@ -15,7 +15,7 @@ fi
 # Grab from https://developer.android.com/studio
 # Adjust as necessary. Not sure if there's a generic way to do this ...
 echo "=== Downloading command line tools for Linux ==="
-VERSION=linux-8512546
+VERSION=linux-11076708
 FILENAME=commandlinetools-${VERSION}_latest.zip
 wget https://dl.google.com/android/repository/$FILENAME || exit 1
 
@@ -30,9 +30,9 @@ mv cmdline-tools/{NOTICE.txt,bin,lib,source.properties} cmdline-tools/tools
 
 export PATH="$PATH:$ANDROID_HOME/cmdline-tools/tools/bin:$ANDROID_HOME/platform-tools"
 
-echo "=== Make sure JDK 11 is enabled (e.g. for Arch) ==="
-echo "  pacman -S jre11-openjdk"
-echo "  archlinux-java set java-11-openjdk"
+echo "=== Make sure JDK 17 is enabled (e.g. for Arch) ==="
+echo "  pacman -S jre17-openjdk"
+echo "  archlinux-java set java-17-openjdk"
 
 echo "=== Automatically accepting all relevant licenses ==="
 yes | sdkmanager --licenses >/dev/null 2>&1 || exit 1

diff --git a/util/dynamic_library.cpp b/util/dynamic_library.cpp
@@ -23,6 +23,7 @@
 #include "dynamic_library.hpp"
 #include "logging.hpp"
 #include <stdexcept>
+#include <utility>
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN