From fee2e3ee27a36c9a33e3cd75c676a0edc33ccac5 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Thu, 23 Feb 2023 11:32:42 +0100
Subject: Fix task ordering and more in Gradle Android build

---
 android/native/build.gradle | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'android/native')

diff --git a/android/native/build.gradle b/android/native/build.gradle
index 6caec1379..452005164 100644
--- a/android/native/build.gradle
+++ b/android/native/build.gradle
@@ -52,18 +52,23 @@ android {
 
 // get precompiled deps
 task downloadDeps(type: Download) {
+	def depsDir = new File(buildDir.parent, 'deps')
+	def depsZip = new File(buildDir, 'deps.zip')
+
 	src 'https://github.com/minetest/minetest_android_deps/releases/download/latest/deps.zip'
-	dest new File(buildDir, 'deps.zip')
+	dest depsZip
 	overwrite false
-}
 
-task getDeps(dependsOn: downloadDeps, type: Copy) {
-	def deps = new File(buildDir.parent, 'deps')
-	if (!deps.exists()) {
-		deps.mkdir()
-		from zipTree(downloadDeps.dest)
-		into deps
+	task getDeps(dependsOn: downloadDeps, type: Copy) {
+		depsDir.mkdir()
+		from zipTree(depsZip)
+		into depsDir
+		doFirst { logger.lifecycle('Extracting to {}', depsDir) }
 	}
 }
 
 preBuild.dependsOn getDeps
+
+clean {
+	delete new File(buildDir.parent, 'deps')
+}
-- 
cgit v1.2.3