Merge pull request #178 from liutikas/cleanup

riggaroo · web-flow · commit 0765b3d40d40 · 2025-11-17T13:57:37.000Z
Clean up the logic to disable of android device tests
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -52,7 +52,7 @@ android {
 
 // Explicitly disable the connectedAndroidTest task for this module
 androidComponents {
-    beforeVariants(selector().all()) { variant ->
+    beforeVariants { variant ->
         variant.enableAndroidTest = false
     }
 }
@@ -91,9 +91,4 @@ dependencies {
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.robolectric)
     testImplementation(libs.androidx.core)
-
-    androidTestImplementation(libs.androidx.ui.test.junit4)
-    androidTestImplementation(libs.hilt.android.testing)
-    androidTestImplementation(projects.core.testing)
-    kspAndroidTest(libs.hilt.compiler)
 }
diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
@@ -41,7 +41,7 @@ android {
 
 // Explicitly disable the connectedAndroidTest task for this module
 androidComponents {
-    beforeVariants(selector().all()) { variant ->
+    beforeVariants { variant ->
         variant.enableAndroidTest = false
     }
 }
@@ -61,11 +61,5 @@ dependencies {
     implementation(projects.feature.results)
     implementation(projects.watchface)
     implementation(projects.wear.common)
-
     ksp(libs.hilt.compiler)
-
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.androidx.ui.test.junit4)
-    androidTestImplementation(libs.hilt.android.testing)
-    kspAndroidTest(libs.hilt.compiler)
 }
diff --git a/core/util/build.gradle.kts b/core/util/build.gradle.kts
@@ -39,7 +39,7 @@ android {
 }
 // Explicitly disable the connectedAndroidTest task for this module
 androidComponents {
-    beforeVariants(selector().all()) { variant ->
+    beforeVariants { variant ->
         variant.enableAndroidTest = false
     }
 }
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -38,7 +38,7 @@ android {
 }
 // Explicitly disable the connectedAndroidTest task for this module
 androidComponents {
-    beforeVariants(selector().all()) { variant ->
+    beforeVariants { variant ->
         variant.enableAndroidTest = false
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ android {`
`52`	`52`
`53`	`53`	`// Explicitly disable the connectedAndroidTest task for this module`
`54`	`54`	`androidComponents {`
`55`		`- beforeVariants(selector().all()) { variant ->`
	`55`	`+ beforeVariants { variant ->`
`56`	`56`	`variant.enableAndroidTest = false`
`57`	`57`	`}`
`58`	`58`	`}`
`@@ -91,9 +91,4 @@ dependencies {`
`91`	`91`	`testImplementation(libs.kotlinx.coroutines.test)`
`92`	`92`	`testImplementation(libs.robolectric)`
`93`	`93`	`testImplementation(libs.androidx.core)`
`94`		`-`
`95`		`- androidTestImplementation(libs.androidx.ui.test.junit4)`
`96`		`- androidTestImplementation(libs.hilt.android.testing)`
`97`		`- androidTestImplementation(projects.core.testing)`
`98`		`- kspAndroidTest(libs.hilt.compiler)`
`99`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ android {`
`41`	`41`
`42`	`42`	`// Explicitly disable the connectedAndroidTest task for this module`
`43`	`43`	`androidComponents {`
`44`		`- beforeVariants(selector().all()) { variant ->`
	`44`	`+ beforeVariants { variant ->`
`45`	`45`	`variant.enableAndroidTest = false`
`46`	`46`	`}`
`47`	`47`	`}`
`@@ -61,11 +61,5 @@ dependencies {`
`61`	`61`	`implementation(projects.feature.results)`
`62`	`62`	`implementation(projects.watchface)`
`63`	`63`	`implementation(projects.wear.common)`
`64`		`-`
`65`	`64`	`ksp(libs.hilt.compiler)`
`66`		`-`
`67`		`- androidTestImplementation(platform(libs.androidx.compose.bom))`
`68`		`- androidTestImplementation(libs.androidx.ui.test.junit4)`
`69`		`- androidTestImplementation(libs.hilt.android.testing)`
`70`		`- kspAndroidTest(libs.hilt.compiler)`
`71`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ android {`
`39`	`39`	`}`
`40`	`40`	`// Explicitly disable the connectedAndroidTest task for this module`
`41`	`41`	`androidComponents {`
`42`		`- beforeVariants(selector().all()) { variant ->`
	`42`	`+ beforeVariants { variant ->`
`43`	`43`	`variant.enableAndroidTest = false`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ android {`
`38`	`38`	`}`
`39`	`39`	`// Explicitly disable the connectedAndroidTest task for this module`
`40`	`40`	`androidComponents {`
`41`		`- beforeVariants(selector().all()) { variant ->`
	`41`	`+ beforeVariants { variant ->`
`42`	`42`	`variant.enableAndroidTest = false`
`43`	`43`	`}`
`44`	`44`	`}`