Update barista sample dependencies

AdevintaSpain · Dec 3, 2022 · 4426782 · 4426782
1 parent b641e91
commit 4426782
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/barista/build.gradle.kts b/barista/build.gradle.kts
@@ -41,5 +41,5 @@ dependencies {
   testImplementation(libs.testing.jUnitParams)
   testImplementation(libs.testing.assertJ)
 
-  testImplementation(libs.testing.mockito)
+  testImplementation(libs.testing.mockito.core)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,19 +5,25 @@ nexusPublish = "1.1.0"
 nexusStaging = "0.22.0"
 compose = "1.3.1"
 composeCompiler = "1.3.2"
+androidXAppCompat = "1.0.2"
 androidXAnnotation = "1.0.2"
+androidXCore = "1.0.1"
 androidXEspresso = "3.4.0"
 androidXLegacy = "1.0.0"
 androidXMaterial = "1.2.0"
+androidXOrchestrator = "1.4.1"
 androidXRecyclerView = "1.0.0"
 androidXVectorDrawable = "1.0.0"
 androidXViewPager2 = "1.0.0"
 uiAutomator = "2.2.0"
 
-assertJ = "1.7.0"
+glide = "4.10.0"
+
+assertJ = "2.9.1"
 jUnit = "4.12"
 jUnitParams = "1.1.0"
 mockito = "2.28.2"
+mockitoKotlin = "1.5.0"
 
 [libraries]
 
@@ -26,21 +32,28 @@ kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", ve
 nexus-publish = { module = "io.github.gradle-nexus:publish-plugin", version.ref = "nexusPublish" }
 nexus-staging = { module = "io.codearte.gradle.nexus:gradle-nexus-staging-plugin", version.ref = "nexusStaging" }
 
-androidX-annotation = { module = "androidx.annotation:annotation", version.ref = "androidXAnnotation" }
-
 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-orchestrator = { module = "androidx.test:orchestrator", version.ref = "androidXOrchestrator" }
 androidX-test-uiAutomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiAutomator" }
 
+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-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" }
 
+glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
+
 testing-assertJ = { module = "org.assertj:assertj-core", version.ref = "assertJ" }
 testing-jUnit = { module = "junit:junit", version.ref = "jUnit" }
 testing-jUnitParams = { module = "pl.pragmatists:JUnitParams", version.ref = "jUnitParams" }
-testing-mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
+testing-mockito-android = { module = "org.mockito:mockito-android", version.ref = "mockito" }
+testing-mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
+testing-mockito-kotlin = { module = "com.nhaarman:mockito-kotlin", version.ref = "mockitoKotlin" }
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -30,21 +30,23 @@ android {
 }
 
 dependencies {
-  implementation("androidx.legacy:legacy-support-v4:1.0.0")
-  implementation("androidx.appcompat:appcompat:1.0.2")
+  implementation(libs.androidX.legacy.supportV4)
+
+  implementation(libs.androidX.appCompat)
   implementation(libs.androidX.recyclerView)
   implementation(libs.androidX.material)
   implementation(libs.androidX.annotation)
-  implementation("com.github.bumptech.glide:glide:4.10.0")
+
+  implementation(libs.glide)
   implementation(libs.androidX.material)
-  implementation("androidx.core:core-ktx:1.0.1")
+  implementation(libs.androidX.core)
 
-  androidTestUtil("androidx.test:orchestrator:1.4.1")
+  androidTestUtil(libs.androidX.test.orchestrator)
   androidTestImplementation(project(":barista"))
 
-  androidTestImplementation("org.assertj:assertj-core:2.9.1")
-  androidTestImplementation("com.nhaarman:mockito-kotlin:1.5.0")
-  androidTestImplementation("org.mockito:mockito-android:2.28.2")
+  androidTestImplementation(libs.testing.assertJ)
+  androidTestImplementation(libs.testing.mockito.kotlin)
+  androidTestImplementation(libs.testing.mockito.android)
 
   testImplementation(libs.testing.jUnit)