From 80d583e2195cff2ad3b1d554069a12024a9a8691 Mon Sep 17 00:00:00 2001
From: Maksym H <Maksym48@pm.me>
Date: Thu, 5 Oct 2023 20:32:47 +0300
Subject: [PATCH] Android: update deps

---
 Android/app/build.gradle                               |  2 +-
 .../app/src/main/java/org/libsdl/app/SDLActivity.java  |  2 +-
 Android/build.gradle                                   |  4 ++--
 Android/gradle/wrapper/gradle-wrapper.properties       |  4 ++--
 Android/native/build.gradle                            | 10 ++++++----
 Android/native/jni/Application.mk                      |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Android/app/build.gradle b/Android/app/build.gradle
index c4da0a6d0..d33816d36 100644
--- a/Android/app/build.gradle
+++ b/Android/app/build.gradle
@@ -125,7 +125,7 @@ dependencies {
 	/* Third-party libraries */
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.appcompat:appcompat-resources:1.6.1'
-	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
 	implementation 'androidx.work:work-runtime-ktx:2.8.1'
 	implementation 'com.google.android.material:material:1.9.0'
 }
diff --git a/Android/app/src/main/java/org/libsdl/app/SDLActivity.java b/Android/app/src/main/java/org/libsdl/app/SDLActivity.java
index 2e25d787e..264fc1842 100644
--- a/Android/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/Android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 2;
     private static final int SDL_MINOR_VERSION = 28;
-    private static final int SDL_MICRO_VERSION = 2;
+    private static final int SDL_MICRO_VERSION = 4;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
diff --git a/Android/build.gradle b/Android/build.gradle
index 82c306301..ffe139e7b 100644
--- a/Android/build.gradle
+++ b/Android/build.gradle
@@ -16,10 +16,10 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:8.1.0'
+		classpath 'com.android.tools.build:gradle:8.1.2'
 		//noinspection GradleDependency
 		classpath 'de.undercouch:gradle-download-task:4.1.2'
-		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
+		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10'
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
 	}
diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties
index 41a26e8e8..e2e3e0d68 100644
--- a/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Aug 21 21:17:06 EEST 2023
+#Thu Oct 05 18:46:10 EEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Android/native/build.gradle b/Android/native/build.gradle
index 8a7cf5181..31a1e2a17 100644
--- a/Android/native/build.gradle
+++ b/Android/native/build.gradle
@@ -50,17 +50,19 @@ android {
 }
 
 // get precompiled deps
+def buildDirectory = layout.buildDirectory.get().asFile
+
 tasks.register('downloadDeps', Download) {
-	def VERSION = "11082023"
-	src "https://gitlab.com/minetest-stuffs/multicraft-deps_androit/-/archive/11082023/multicraft-deps_androit-11082023.zip"
-	dest new File(buildDir, 'deps.zip')
+	def VERSION = "05102023"
+	src "https://github.com/MultiCraft/deps_android/releases/download/$VERSION/deps_android.zip"
+	dest new File(buildDirectory, 'deps.zip')
 	overwrite false
 }
 
 tasks.register('getDeps', Copy) {
 	dependsOn downloadDeps
 	def deps = file('deps')
-	def f = file("$buildDir/deps_android")
+	def f = file("$buildDirectory/deps_android")
 
 	if (!f.exists()) {
 		from zipTree(downloadDeps.dest)
diff --git a/Android/native/jni/Application.mk b/Android/native/jni/Application.mk
index 73e92af84..802476625 100644
--- a/Android/native/jni/Application.mk
+++ b/Android/native/jni/Application.mk
@@ -10,7 +10,7 @@ else
 APP_CFLAGS := -g -D_DEBUG -O1 -fno-omit-frame-pointer
 endif
 
-APP_CFLAGS += -fexceptions
+APP_CFLAGS += -fexceptions -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
 
 APP_CXXFLAGS := $(APP_CFLAGS) -frtti -std=gnu++17 #-Werror=shorten-64-to-32