From c1fe810f011cd29ff3ca49c8eb7b1feecaa6767c Mon Sep 17 00:00:00 2001
From: Fabian Freund <github@fabi.online>
Date: Mon, 20 Oct 2025 16:42:17 +0200
Subject: [PATCH] try to restore fdroid compat

---
 app/pubspec.yaml                                         | 9 ++++++++-
 packages/pluggable_transports_proxy/android/build.gradle | 4 ++--
 .../android/gradle/wrapper/gradle-wrapper.properties     | 2 +-
 packages/tor/android/build.gradle                        | 6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 41a99f1f..0ad2dade 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -43,9 +43,9 @@ dependencies:
   lexo_rank:
     git:
       url: https://github.com/FaFre/lexo_rank.git
+  local_auth: ^3.0.0
   locale_resolver:
     path: ../packages/locale_resolver
-  local_auth: ^3.0.0
   logger: ^2.6.2
   markdown: ^7.3.0
   mime: ^2.0.0
@@ -86,6 +86,13 @@ dependencies:
   url_launcher: ^6.3.2
   uuid: ^4.5.1
 
+dependency_overrides: 
+  # Avoid gradle 8.12 for fdroid compatibility for now 
+  flutter_plugin_android_lifecycle: 2.0.29
+  local_auth_android: 1.0.51
+  path_provider_android: 2.2.17
+  url_launcher_android: 6.3.17
+
 dev_dependencies:
   build_runner: ^2.7.1
   copy_with_extension_gen: ^9.1.1
diff --git a/packages/pluggable_transports_proxy/android/build.gradle b/packages/pluggable_transports_proxy/android/build.gradle
index 98935c2f..b72165c6 100644
--- a/packages/pluggable_transports_proxy/android/build.gradle
+++ b/packages/pluggable_transports_proxy/android/build.gradle
@@ -2,14 +2,14 @@ group = "eu.weblibre.pluggable_transports_proxy"
 version = "1.0-SNAPSHOT"
 
 buildscript {
-    ext.kotlin_version = "2.1.0"
+    ext.kotlin_version = "2.1.20"
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.9.1")
+        classpath("com.android.tools.build:gradle:8.11.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
diff --git a/packages/simple_intent_receiver/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/simple_intent_receiver/example/android/gradle/wrapper/gradle-wrapper.properties
index afa1e8eb..c6a2952d 100644
--- a/packages/simple_intent_receiver/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/simple_intent_receiver/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
diff --git a/packages/tor/android/build.gradle b/packages/tor/android/build.gradle
index 60b7dab9..dafdc391 100644
--- a/packages/tor/android/build.gradle
+++ b/packages/tor/android/build.gradle
@@ -2,14 +2,14 @@ group = "com.foundationdevices.tor"
 version = "1.0-SNAPSHOT"
 
 buildscript {
-    ext.kotlin_version = "1.9.22"
+    ext.kotlin_version = "2.1.20"
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.7.0")
+        classpath("com.android.tools.build:gradle:8.11.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
@@ -27,7 +27,7 @@ apply plugin: "kotlin-android"
 android {
     namespace = "com.foundationdevices.tor"
 
-    compileSdk = 35
+    compileSdk = 36
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17