From 85c790ed23f40fe6ce15993370ad74332b93f00a Mon Sep 17 00:00:00 2001
From: Tronax <mail@tronax.dev>
Date: Thu, 6 Aug 2026 11:43:03 +0200
Subject: [PATCH] Build: make Android build work behind restrictive proxies

- settings.gradle.kts: comment out the foojay-resolver-convention plugin.
  It tries to auto-download JDK toolchains from api.foojay.io, which fails
  with 503 behind restrictive proxies. Re-enable at home if you want
  auto-provisioning.
- app/build.gradle.kts: comment out jvmToolchain(17) for the same reason
  (triggers toolchain resolution -> foojay download). The build JDK 21
  plus compileOptions(source/target 17) achieves the same result locally.
- gradle-wrapper.properties: bump to gradle-9.6.1-all (matches the
  manually provided distribution).
- .gitignore: ignore .ssl-work/ (local corporate-CA truststore).
---
 .gitignore                                       | 1 +
 android/app/build.gradle.kts                     | 5 ++++-
 android/gradle/wrapper/gradle-wrapper.properties | 3 +--
 android/settings.gradle.kts                      | 6 +++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4587acc..13d104a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ Thumbs.db
 # === Agent / tooling local data ===
 .zcode/
 backend/.testbin/
+.ssl-work/
 
 # === Windows system files ===
 desktop.ini
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 528ea03..4086cb1 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -58,7 +58,10 @@ room {
 }
 
 kotlin {
-  jvmToolchain(17)
+  // Use the JDK running Gradle instead of resolving a toolchain (avoids
+  // foojay-resolver downloads behind restrictive proxies). compileOptions
+  // above pins source/target to 17.
+  // jvmToolchain(17)
 }
 
 dependencies {
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 26dec6c..1adfd2e 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
-distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 9919d12..c1cbe74 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -26,7 +26,11 @@ dependencyResolutionManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+    // The foojay-resolver-convention auto-downloads JDK toolchains from
+    // api.foojay.io if a configured toolchain is missing. Behind restrictive
+    // proxies this download fails (503), so we rely on a locally installed
+    // JDK instead. Re-enable at home if you want auto-provisioning.
+    // id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 rootProject.name = "Mitbringsl"