From 9c5bb9c8180fe841f706458a91aa984cdd37355b Mon Sep 17 00:00:00 2001
From: sim <git@sgougeon.fr>
Date: Mon, 2 Dec 2024 10:17:27 +0000
Subject: [PATCH] Use main nextcloud-sso lib and enable desugaring

---
 app/build.gradle.kts      | 3 +++
 gradle/libs.versions.toml | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c26ac87..af41c05 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,6 +9,7 @@ android {
     compileOptions {
         targetCompatibility = JavaVersion.VERSION_17
         sourceCompatibility = JavaVersion.VERSION_17
+        isCoreLibraryDesugaringEnabled = true
     }
 
     compileSdk = 35
@@ -65,6 +66,8 @@ if (project.hasProperty("sign")) {
 }
 
 dependencies {
+    // because of nextcloud-sso
+    coreLibraryDesugaring(libs.tools.desugar.jdk.libs)
     implementation(libs.accompanist.permissions)
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.constraintlayout)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6e81a0b..0e8941e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,12 +7,11 @@ androidx-coordinatorlayout = "1.2.0"
 androidx-lifecycle = "2.8.7"
 androidx-work = "2.10.0"
 appcompat = "1.7.0"
+desugar_jdk_libsVersion = "2.1.3"
 kotlin = "2.0.21"
 ktlint = "12.1.1"
 material = "1.12.0"
-#nextcloud-sso = "1.3.2.patch3"
-nextcloud-sso = "1.3.2.nodes1"
-#nextcloud-sso = "1.3.2"
+nextcloud-sso = "1.3.2"
 okhttp-sse = "5.0.0.SSEPATCH1-SNAPSHOT"
 retrofit = "2.11.0"
 rxjava3-rxandroid = "3.0.2"
@@ -42,6 +41,7 @@ rxjava3-rxjava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava
 androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" }
 androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiTooling" }
 androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "uiTooling" }
+tools-desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libsVersion" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }