From 8342dc5fa9c04b530b5bbe4292404bb3535c46fa Mon Sep 17 00:00:00 2001
From: Andrew Rowson <github@growse.com>
Date: Fri, 20 Sep 2024 17:25:06 +0100
Subject: [PATCH] fix(deps): remove r8 google repo as F-Droid won't build with
 that. Remove explicit R8 dependency so we can rely on AGP shipped version

Fixes #1852
---
 CHANGELOG.md                      | 8 ++++++--
 project/build.gradle.kts          | 1 -
 project/gradle/libs.versions.toml | 4 +---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39a8bf15fb..7fb75aabc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,13 @@
 
 ## Version 2.5.3
 
-## New features
+### New features
+
+- OSM map is a little easier to zoom without accidentally rotating (#1825)
+
+### Bug fixes
 
-- OSM map is a little easier to zoom without accidentally rotating.
+- Use AGP-provided version of R8 rather than version from Google so that F-Droid can build it (#1852)
 
 ## Version 2.5.2
 
diff --git a/project/build.gradle.kts b/project/build.gradle.kts
index d3b3282706..e62dd0e9db 100644
--- a/project/build.gradle.kts
+++ b/project/build.gradle.kts
@@ -3,7 +3,6 @@
 buildscript {
   repositories {
     mavenCentral()
-    maven { url = uri("https://storage.googleapis.com/r8-releases/raw") }
   }
   dependencies { classpath(libs.bundles.buildscript) }
 }
diff --git a/project/gradle/libs.versions.toml b/project/gradle/libs.versions.toml
index 0f7b52220b..09b1616aea 100644
--- a/project/gradle/libs.versions.toml
+++ b/project/gradle/libs.versions.toml
@@ -44,7 +44,6 @@ okhttp = "4.12.0"
 osmdroid = "6.1.20"
 paho-mqtt = "1.2.5"
 play-services-location = "21.3.0"
-r8 = "8.6.17"
 slf4j-simple = "2.0.16"
 slf4j-timber = "1.0.1"
 square-leakcanary = "2.14"
@@ -142,7 +141,6 @@ androidx-test-orchestrator = { module = "androidx.test:orchestrator", version.re
 androidx-test-espresso-idling = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "androidx-test-espresso" }
 
 # Build utils
-r8 = { module = "com.android.tools:r8", version.ref = "r8" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 desugar = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desguar-jdk" }
 
@@ -156,6 +154,6 @@ androidx = ["androidx-core-ktx", "androidx-preference", "androidx-work-runtime",
 androidx-room = ["androidx-room-runtime", "androidx-room-ktx"]
 androidx-test = ["androidx-test-junit", "androidx-test-core-ktx", "androidx-test-rules", "androidx-test-runner"]
 androidx-test-util = ["androidx-test-services", "androidx-test-orchestrator"]
-buildscript = ["r8", "guava"]
+buildscript = ["guava"]
 objectbox-migration = ["lmdb-kt", "slf4j-simple", "slf4j-timber", "flatbuffers"]
 kmqtt = ["kmqtt-broker", "kmqtt-common"]