From e908d6fcc0eedc9a6005f2ce38d473686e98a918 Mon Sep 17 00:00:00 2001 From: greenart7c3 <115044884+greenart7c3@users.noreply.github.com> Date: Fri, 28 Jul 2023 05:46:44 -0300 Subject: [PATCH] fix dependencies --- app/build.gradle | 9 +-------- build.gradle | 8 +++----- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6f99da97..d8fc19ff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,15 +48,11 @@ android { } dependencies { - implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.activity:activity-compose:1.7.2' implementation "androidx.compose.ui:ui:$compose_ui_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version" - // Needs this to open gallery / image upload - implementation "androidx.fragment:fragment-ktx:$fragment_version" - // Navigation implementation("androidx.navigation:navigation-compose:$nav_version") @@ -66,7 +62,6 @@ dependencies { implementation "androidx.compose.material:material:$compose_ui_version" implementation "androidx.compose.material:material-icons-extended:$compose_ui_version" - implementation "androidx.compose.material:material-icons-extended:1.4.3" implementation 'androidx.appcompat:appcompat:1.6.1' @@ -87,14 +82,12 @@ dependencies { implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version" // For QR generation implementation 'com.google.zxing:core:3.5.1' implementation 'com.journeyapps:zxing-android-embedded:4.3.0' - // Json Serialization TODO: We might need to converge between gson and Jackson (we are usin both) - implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2' + // Json Serialization implementation 'com.squareup.retrofit2:converter-gson:2.9.0' // Websockets API diff --git a/build.gradle b/build.gradle index 439c37c4..da43c2b0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,12 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + buildscript { ext { - fragment_version = "1.6.0" lifecycle_version = '2.6.1' compose_ui_version = '1.4.3' nav_version = "2.6.0" - room_version = "2.4.3" accompanist_version = '0.30.0' coil_version = '2.4.0' - vico_version = '1.7.1' - exoplayer_version = '1.1.0' } } @@ -29,7 +27,7 @@ task installGitHook(type: Copy) { tasks.getByPath(':app:preBuild').dependsOn installGitHook subprojects { - tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { + tasks.withType(KotlinCompile).configureEach { kotlinOptions { if (project.findProperty("composeCompilerReports") == "true") { freeCompilerArgs += [