Update project

michaelbel · Mar 1, 2024 · e87af29 · e87af29
1 parent dfc2140
commit e87af29
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 28 deletions.
diff --git a/android-app/build.gradle.kts b/android-app/build.gradle.kts
@@ -170,7 +170,6 @@ dependencies {
     gmsImplementation(project(":core:platform-services:inject"))
     hmsImplementation(project(":core:platform-services:inject"))
     fossImplementation(project(":core:platform-services:inject"))
-
     implementation(project(":core:analytics"))
     implementation(project(":core:common"))
     implementation(project(":core:interactor"))
@@ -186,15 +185,12 @@ dependencies {
     implementation(project(":feature:gallery"))
     implementation(project(":feature:search"))
     implementation(project(":feature:settings"))
-
     implementation(libs.kotlin.reflect)
-
     testImplementation(libs.junit)
+    androidTestImplementation(libs.bundles.test.espresso)
     androidTestImplementation(libs.androidx.test.ext.junit.ktx)
-    androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.benchmark.junit)
-
     lintChecks(libs.lint.checks)
 }
 

diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
@@ -45,8 +45,8 @@ android {
 }*/
 
 dependencies {
+    implementation(libs.bundles.test.espresso)
     implementation(libs.androidx.benchmark.macro.junit)
-    implementation(libs.androidx.espresso.core)
     implementation(libs.androidx.test.ext.junit.ktx)
     implementation(libs.androidx.test.uiautomator)
 }
diff --git a/feature/account-impl/build.gradle.kts b/feature/account-impl/build.gradle.kts
@@ -58,13 +58,11 @@ dependencies {
     implementation(project(":core:network"))
     implementation(libs.androidx.work.runtime.ktx)
     implementation(libs.androidx.hilt.work)
-
     testImplementation(libs.junit)
+    androidTestImplementation(libs.bundles.test.espresso)
     androidTestImplementation(libs.androidx.test.ext.junit.ktx)
-    androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.benchmark.junit)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
-
     lintChecks(libs.lint.checks)
 }
diff --git a/feature/auth-impl/build.gradle.kts b/feature/auth-impl/build.gradle.kts
@@ -56,15 +56,12 @@ dependencies {
     implementation(project(":core:common"))
     implementation(project(":core:interactor"))
     implementation(project(":core:network"))
-
     implementation(libs.androidx.autofill)
-
     testImplementation(libs.junit)
+    androidTestImplementation(libs.bundles.test.espresso)
     androidTestImplementation(libs.androidx.test.ext.junit.ktx)
-    androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.benchmark.junit)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
-
     lintChecks(libs.lint.checks)
 }
diff --git a/feature/details-impl/build.gradle.kts b/feature/details-impl/build.gradle.kts
@@ -57,13 +57,11 @@ dependencies {
     implementation(project(":core:common"))
     implementation(project(":core:interactor"))
     implementation(project(":core:network"))
-
     testImplementation(libs.junit)
+    androidTestImplementation(libs.bundles.test.espresso)
     androidTestImplementation(libs.androidx.test.ext.junit.ktx)
-    androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.benchmark.junit)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
-
     lintChecks(libs.lint.checks)
 }
diff --git a/feature/feed-impl/build.gradle.kts b/feature/feed-impl/build.gradle.kts
@@ -59,13 +59,11 @@ dependencies {
     implementation(project(":core:interactor"))
     implementation(project(":core:network"))
     implementation(project(":core:notifications"))
-
     testImplementation(libs.junit)
+    androidTestImplementation(libs.bundles.test.espresso)
     androidTestImplementation(libs.androidx.test.ext.junit.ktx)
-    androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.benchmark.junit)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
-
     lintChecks(libs.lint.checks)
 }
diff --git a/feature/gallery-impl/build.gradle.kts b/feature/gallery-impl/build.gradle.kts
@@ -57,13 +57,11 @@ dependencies {
     implementation(project(":core:interactor"))
     implementation(project(":core:network"))
     implementation(project(":core:work"))
-
     testImplementation(libs.junit)
+    androidTestImplementation(libs.bundles.test.espresso)
     androidTestImplementation(libs.androidx.test.ext.junit.ktx)
-    androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.benchmark.junit)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
-
     lintChecks(libs.lint.checks)
 }
diff --git a/feature/search-impl/build.gradle.kts b/feature/search-impl/build.gradle.kts
@@ -58,13 +58,11 @@ dependencies {
     implementation(project(":core:interactor"))
     implementation(project(":core:network"))
     implementation(project(":core:notifications"))
-
     testImplementation(libs.junit)
+    androidTestImplementation(libs.bundles.test.espresso)
     androidTestImplementation(libs.androidx.test.ext.junit.ktx)
-    androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.benchmark.junit)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
-
     lintChecks(libs.lint.checks)
 }
diff --git a/feature/settings-impl/build.gradle.kts b/feature/settings-impl/build.gradle.kts
@@ -58,13 +58,11 @@ dependencies {
     api(project(":core:common"))
     api(project(":core:ui"))
     implementation(project(":core:interactor"))
-
     testImplementation(libs.junit)
+    androidTestImplementation(libs.bundles.test.espresso)
     androidTestImplementation(libs.androidx.test.ext.junit.ktx)
-    androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.benchmark.junit)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
-
     lintChecks(libs.lint.checks)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -52,6 +52,7 @@ androidx-test = "1.5.2"
 androidx-test-ext = "1.1.5"
 androidx-test-uiautomator = "2.3.0"
 androidx-espresso-core = "3.5.1"
+androidx-test-espresso = "3.5.1"
 androidx-benchmark = "1.2.3"
 androidx-profile-installer = "1.3.1"
 androidx-work = "2.9.0"
@@ -128,6 +129,8 @@ androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-
 androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
 androidx-test-ext-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidx-test-ext" }
 androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-espresso-core" }
+androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
+androidx-test-espresso-device = { module = "androidx.test.espresso:espresso-device", version.ref = "androidx-test-espresso" }
 androidx-benchmark-junit = { module = "androidx.benchmark:benchmark-junit4", version.ref = "androidx-benchmark" }
 androidx-benchmark-macro-junit = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark" }
 androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx-test-uiautomator" }
@@ -221,6 +224,10 @@ ktor = [
     "ktor-client-content-negotiation",
     "ktor-serialization-kotlinx-json"
 ]
+test-espresso = [
+    "androidx-test-espresso-core",
+    "androidx-test-espresso-device"
+]
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }