From 0105adc9365699463bd9ded0003762dc23acc14b Mon Sep 17 00:00:00 2001
From: Adam Szewera <adam.szewe@gmail.com>
Date: Tue, 5 Dec 2023 22:02:54 +0100
Subject: [PATCH 1/2] Upgrade gradle wrapper to version 8.5

---
 gradle/wrapper/gradle-wrapper.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5742520f5..559efb4c8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Oct 05 14:20:28 EEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip

From 1937a3b07692d4204bf9b8dc76c598e4766c8c0b Mon Sep 17 00:00:00 2001
From: Adam Szewera <adam.szewe@gmail.com>
Date: Fri, 5 Jan 2024 21:54:12 +0100
Subject: [PATCH 2/2] Make the :syncthing:buildNative task depend explicitly on
 :app:mergeReleaseJniLibFolders

---
 app/build.gradle.kts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index af6c8a29c..e74934fbe 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.configurationcache.extensions.capitalized
+
 plugins {
     id("com.android.application")
     id("com.github.ben-manes.versions")
@@ -108,3 +110,11 @@ tasks.register<Delete>("deleteUnsupportedPlayTranslations") {
         "src/main/play/listings/ta/",
     )
 }
+
+project.afterEvaluate {
+    android.buildTypes.forEach {
+        tasks.named("merge${it.name.capitalized()}JniLibFolders") {
+            dependsOn(":syncthing:buildNative")
+        }
+    }
+}