From b07bbe13a883a8f707919f81070cda95440efadb Mon Sep 17 00:00:00 2001 From: JackEblan Date: Fri, 12 Jul 2024 07:34:11 +0800 Subject: [PATCH] Libs --- .idea/androidTestResultsUserPreferences.xml | 26 +++++++++++++++++++++ .idea/deploymentTargetSelector.xml | 9 +++++++ app/build.gradle.kts | 1 + core/database/build.gradle.kts | 7 ------ gradle/libs.versions.toml | 5 +++- 5 files changed, 40 insertions(+), 8 deletions(-) diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml index 68e8b563..495e1add 100644 --- a/.idea/androidTestResultsUserPreferences.xml +++ b/.idea/androidTestResultsUserPreferences.xml @@ -16,6 +16,19 @@ + + + + + + + @@ -29,6 +42,19 @@ + + + + + + + diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 1110c511..858138f0 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -11,6 +11,15 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2adced95..a07e5d79 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -77,6 +77,7 @@ dependencies { implementation(libs.androidx.lifecycle.viewmodel.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) implementation(libs.androidx.navigation.compose) + implementation(libs.kotlinx.coroutines.guava) implementation(libs.kotlinx.serialization.json) debugImplementation(libs.androidx.compose.ui.test.manifest) diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts index d26c793c..8b7cb14e 100644 --- a/core/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -40,11 +40,4 @@ dependencies { androidTestImplementation(libs.room.testing) androidTestImplementation(projects.core.testing) - - // https://github.com/google/guava/issues/6618 - modules { - module("com.google.guava:listenablefuture") { - replacedBy("com.google.guava:guava", "listenablefuture is part of guava") - } - } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 19073119..c18fb343 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -86,9 +86,12 @@ hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testi hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" } javax-inject = { module = "javax.inject:javax.inject", version = "1" } junit-junit = { group = "junit", name = "junit", version.ref = "junit4" } +kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" } +kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" } +kotlinx-coroutines-guava = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-guava", version.ref = "kotlinxCoroutines" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" } kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" } -kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" } lint-api = { group = "com.android.tools.lint", name = "lint-api", version.ref = "androidTools" } lint-checks = { group = "com.android.tools.lint", name = "lint-checks", version.ref = "androidTools" } lint-tests = { group = "com.android.tools.lint", name = "lint-tests", version.ref = "androidTools" }