From 445cbe21e173bc06037e9ead3a8f7fc0768f85fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Sat, 3 Dec 2022 14:47:02 +0100 Subject: [PATCH] Update barista-compose dependencies --- barista-compose/build.gradle.kts | 22 +++++++++++----------- gradle/libs.versions.toml | 14 +++++++++++++- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/barista-compose/build.gradle.kts b/barista-compose/build.gradle.kts index 59441cad..b819e2a3 100644 --- a/barista-compose/build.gradle.kts +++ b/barista-compose/build.gradle.kts @@ -36,16 +36,16 @@ android { } dependencies { - api("androidx.test.ext:junit:1.1.3") - api("androidx.compose.ui:ui-test-junit4:1.0.2") - - debugImplementation("androidx.compose.ui:ui:${libs.versions.compose.get()}") - debugImplementation("androidx.compose.material:material:${libs.versions.compose.get()}") - debugImplementation("androidx.compose.ui:ui-tooling-preview:${libs.versions.compose.get()}") - debugImplementation("androidx.lifecycle:lifecycle-runtime-ktx:2.3.1") - debugImplementation("androidx.activity:activity-compose:1.3.1") - debugImplementation("androidx.compose.ui:ui-test-junit4:${libs.versions.compose.get()}") - debugImplementation("androidx.compose.ui:ui-test-manifest:${libs.versions.compose.get()}") - debugImplementation("androidx.compose.ui:ui-tooling:${libs.versions.compose.get()}") + api(libs.androidX.test.junit) + api(libs.androidX.compose.test.ui.junit4) + + debugImplementation(libs.androidX.compose.ui.ui) + debugImplementation(libs.androidX.compose.material) + debugImplementation(libs.androidX.compose.ui.tooling.preview) + debugImplementation(libs.androidX.compose.ui.tooling.core) + debugImplementation(libs.androidX.compose.test.ui.manifest) + + debugImplementation(libs.androidX.lifecycle) + debugImplementation(libs.androidX.activity.compose) } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9cf231cc..95e1769a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,9 @@ androidXAppCompat = "1.0.2" androidXAnnotation = "1.0.2" androidXCore = "1.0.1" androidXEspresso = "3.4.0" +androidXJUnit = "1.1.3" androidXLegacy = "1.0.0" +androidXLifecycle = "2.3.1" androidXMaterial = "1.2.0" androidXOrchestrator = "1.4.1" androidXRecyclerView = "1.0.0" @@ -35,20 +37,30 @@ nexus-staging = { module = "io.codearte.gradle.nexus:gradle-nexus-staging-plugin androidX-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidXEspresso" } androidX-test-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidXEspresso" } androidX-test-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "androidXEspresso" } +androidX-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidXJUnit" } androidX-test-orchestrator = { module = "androidx.test:orchestrator", version.ref = "androidXOrchestrator" } androidX-test-uiAutomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiAutomator" } +androidX-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "compose" } androidX-annotation = { module = "androidx.annotation:annotation", version.ref = "androidXAnnotation" } androidX-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidXAppCompat" } androidX-core = { module = "androidx.core:core-ktx", version.ref = "androidXCore" } androidX-legacy-support = { module = "androidx.legacy:legacy-support-core-ui", version.ref = "androidXLegacy" } androidX-legacy-supportV4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "androidXLegacy" } +androidX-lifecycle = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidXLifecycle" } androidX-material = { module = "com.google.android.material:material", version.ref = "androidXMaterial" } androidX-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "androidXRecyclerView" } androidX-vectorDrawable-animated = { module = "androidx.vectordrawable:vectordrawable-animated", version.ref = "androidXVectorDrawable" } - androidX-viewPager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "androidXViewPager2" } +androidX-compose-ui-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" } +androidX-compose-ui-tooling-core = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } +androidX-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" } +androidX-compose-material = { module = "androidx.compose.material:material", version.ref = "compose" } + +androidX-compose-test-ui-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" } +androidX-compose-test-ui-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" } + glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" } testing-assertJ = { module = "org.assertj:assertj-core", version.ref = "assertJ" }