Mastodon
/
nextpush-android
mirror of https://codeberg.org/NextPush/nextpush-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use main nextcloud-sso lib and enable desugaring

This commit is contained in:
sim 2024-12-02 10:17:27 +00:00
parent 96183984ef
commit 9c5bb9c818
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle.kts
View File

@ -9,6 +9,7 @@ android {
compileOptions { compileOptions {
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
isCoreLibraryDesugaringEnabled = true
} }
compileSdk = 35 compileSdk = 35
@ -65,6 +66,8 @@ if (project.hasProperty("sign")) {
} }
dependencies { dependencies {
// because of nextcloud-sso
coreLibraryDesugaring(libs.tools.desugar.jdk.libs)
implementation(libs.accompanist.permissions) implementation(libs.accompanist.permissions)
implementation(libs.androidx.activity.compose) implementation(libs.androidx.activity.compose)
implementation(libs.androidx.constraintlayout) implementation(libs.androidx.constraintlayout)

6
gradle/libs.versions.toml
View File

@ -7,12 +7,11 @@ androidx-coordinatorlayout = "1.2.0"
androidx-lifecycle = "2.8.7" androidx-lifecycle = "2.8.7"
androidx-work = "2.10.0" androidx-work = "2.10.0"
appcompat = "1.7.0" appcompat = "1.7.0"
desugar_jdk_libsVersion = "2.1.3"
kotlin = "2.0.21" kotlin = "2.0.21"
ktlint = "12.1.1" ktlint = "12.1.1"
material = "1.12.0" material = "1.12.0"
#nextcloud-sso = "1.3.2.patch3" nextcloud-sso = "1.3.2"
nextcloud-sso = "1.3.2.nodes1"
#nextcloud-sso = "1.3.2"
okhttp-sse = "5.0.0.SSEPATCH1-SNAPSHOT" okhttp-sse = "5.0.0.SSEPATCH1-SNAPSHOT"
retrofit = "2.11.0" retrofit = "2.11.0"
rxjava3-rxandroid = "3.0.2" 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-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-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" } 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] [plugins]
android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }