From eaab2196e7bbc441cb289c648ee1a3b2a16def71 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 29 Apr 2025 00:23:40 -0500
Subject: [PATCH] Fix generic build and remove some non-free deps

---
 app/build.gradle.kts                |  2 ++
 app/src/generic/res/values/keys.xml |  1 +
 deps_fdroid.txt                     | 34 -----------------------------
 deps_googleplay.txt                 | 25 ---------------------
 4 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9ed26cc07..0822592c0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -231,6 +231,8 @@ dependencies {
     implementation(libs.appauth)
     implementation(libs.microsoft.authentication) {
         exclude("com.microsoft.device.display", "display-mask")
+        exclude("com.google.android.gms")
+        exclude("com.google.android.libraries.identity.googleid")
     }
     implementation(libs.osmdroid)
     implementation(libs.androidx.recyclerview)
diff --git a/app/src/generic/res/values/keys.xml b/app/src/generic/res/values/keys.xml
index 9a0a47489..9f5dcc50f 100644
--- a/app/src/generic/res/values/keys.xml
+++ b/app/src/generic/res/values/keys.xml
@@ -5,4 +5,5 @@
   <!--suppress CheckTagEmptyBody -->
   <string name="manage_subscription_url">%s</string>
   <string name="support_email">support@tasks.org</string>
+  <string name="microsoft_oauth_path">/xVwQTvk42gGm0o6zNvelaYloFcs=</string>
 </resources>
\ No newline at end of file
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index c7a653666..a5e6f1420 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -1444,42 +1444,8 @@
 +|    |    |    \--- androidx.credentials:credentials-play-services-auth:1.2.2 (c)
 +|    |    +--- androidx.credentials:credentials-play-services-auth:1.2.2
 +|    |    |    +--- androidx.credentials:credentials:1.2.2 (*)
-+|    |    |    +--- com.google.android.gms:play-services-auth:20.7.0
-+|    |    |    |    +--- androidx.fragment:fragment:1.0.0 -> 1.8.6 (*)
-+|    |    |    |    +--- com.google.android.gms:play-services-auth-api-phone:18.0.1
-+|    |    |    |    |    +--- com.google.android.gms:play-services-base:18.0.1
-+|    |    |    |    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*)
-+|    |    |    |    |    |    +--- androidx.core:core:1.2.0 -> 1.13.1 (*)
-+|    |    |    |    |    |    +--- androidx.fragment:fragment:1.0.0 -> 1.8.6 (*)
-+|    |    |    |    |    |    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0
-+|    |    |    |    |    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*)
-+|    |    |    |    |    |    |    +--- androidx.core:core:1.2.0 -> 1.13.1 (*)
-+|    |    |    |    |    |    |    \--- androidx.fragment:fragment:1.0.0 -> 1.8.6 (*)
-+|    |    |    |    |    |    \--- com.google.android.gms:play-services-tasks:18.0.1
-+|    |    |    |    |    |         \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
-+|    |    |    |    |    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
-+|    |    |    |    |    \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
-+|    |    |    |    +--- com.google.android.gms:play-services-auth-base:18.0.4
-+|    |    |    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*)
-+|    |    |    |    |    +--- com.google.android.gms:play-services-base:18.0.1 (*)
-+|    |    |    |    |    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
-+|    |    |    |    |    \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
-+|    |    |    |    +--- com.google.android.gms:play-services-base:18.0.1 (*)
-+|    |    |    |    +--- com.google.android.gms:play-services-basement:18.2.0 (*)
-+|    |    |    |    +--- com.google.android.gms:play-services-fido:20.0.1 -> 20.1.0
-+|    |    |    |    |    +--- com.google.android.gms:play-services-base:18.0.1 (*)
-+|    |    |    |    |    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.2.0 (*)
-+|    |    |    |    |    \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
-+|    |    |    |    \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
-+|    |    |    +--- com.google.android.gms:play-services-fido:20.1.0 (*)
-+|    |    |    +--- com.google.android.libraries.identity.googleid:googleid:1.1.0
-+|    |    |    |    +--- androidx.credentials:credentials:1.0.0-alpha04 -> 1.2.2 (*)
-+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 2.1.20 (*)
-+|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 2.1.20 (*)
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.20 (*)
 +|    |    |    \--- androidx.credentials:credentials:1.2.2 (c)
-+|    |    +--- com.google.android.gms:play-services-fido:20.1.0 (*)
-+|    |    +--- com.google.android.libraries.identity.googleid:googleid:1.1.0 (*)
 +|    |    +--- io.opentelemetry:opentelemetry-api:1.18.0
 +|    |    |    \--- io.opentelemetry:opentelemetry-context:1.18.0
 +|    |    \--- androidx.fragment:fragment:1.3.2 -> 1.8.6 (*)
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 880262d2b..7b84aa0bf 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -1797,33 +1797,8 @@
 +|    |    |    \--- androidx.credentials:credentials-play-services-auth:1.2.2 (c)
 +|    |    +--- androidx.credentials:credentials-play-services-auth:1.2.2
 +|    |    |    +--- androidx.credentials:credentials:1.2.2 (*)
-+|    |    |    +--- com.google.android.gms:play-services-auth:20.7.0
-+|    |    |    |    +--- androidx.fragment:fragment:1.0.0 -> 1.8.6 (*)
-+|    |    |    |    +--- com.google.android.gms:play-services-auth-api-phone:18.0.1
-+|    |    |    |    |    +--- com.google.android.gms:play-services-base:18.0.1 -> 18.5.0 (*)
-+|    |    |    |    |    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.5.0 (*)
-+|    |    |    |    |    \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.2.0 (*)
-+|    |    |    |    +--- com.google.android.gms:play-services-auth-base:18.0.4
-+|    |    |    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*)
-+|    |    |    |    |    +--- com.google.android.gms:play-services-base:18.0.1 -> 18.5.0 (*)
-+|    |    |    |    |    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.5.0 (*)
-+|    |    |    |    |    \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.2.0 (*)
-+|    |    |    |    +--- com.google.android.gms:play-services-base:18.0.1 -> 18.5.0 (*)
-+|    |    |    |    +--- com.google.android.gms:play-services-basement:18.2.0 -> 18.5.0 (*)
-+|    |    |    |    +--- com.google.android.gms:play-services-fido:20.0.1 -> 20.1.0
-+|    |    |    |    |    +--- com.google.android.gms:play-services-base:18.0.1 -> 18.5.0 (*)
-+|    |    |    |    |    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.5.0 (*)
-+|    |    |    |    |    \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.2.0 (*)
-+|    |    |    |    \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.2.0 (*)
-+|    |    |    +--- com.google.android.gms:play-services-fido:20.1.0 (*)
-+|    |    |    +--- com.google.android.libraries.identity.googleid:googleid:1.1.0
-+|    |    |    |    +--- androidx.credentials:credentials:1.0.0-alpha04 -> 1.2.2 (*)
-+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 2.1.20 (*)
-+|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 2.1.20 (*)
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.20 (*)
 +|    |    |    \--- androidx.credentials:credentials:1.2.2 (c)
-+|    |    +--- com.google.android.gms:play-services-fido:20.1.0 (*)
-+|    |    +--- com.google.android.libraries.identity.googleid:googleid:1.1.0 (*)
 +|    |    +--- io.opentelemetry:opentelemetry-api:1.18.0
 +|    |    |    \--- io.opentelemetry:opentelemetry-context:1.18.0
 +|    |    \--- androidx.fragment:fragment:1.3.2 -> 1.8.6 (*)