Merge branch 'main' into build-plugin

Author: riggaroo

core/network/build.gradle.kts

@@ -40,7 +40,7 @@ android {
 
 // Explicitly disable the connectedAndroidTest task for this module
 androidComponents {
-    beforeVariants(selector().all()) { variant ->
+    beforeVariants { variant ->
         variant.enableAndroidTest = false
     }
 }
@@ -79,9 +79,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)
 }

core/network/proguard-rules.pro

@@ -25,7 +25,7 @@ android {
 
 // Explicitly disable the connectedAndroidTest task for this module
 androidComponents {
-    beforeVariants(selector().all()) { variant ->
+    beforeVariants { variant ->
         variant.enableAndroidTest = false
     }
 }
@@ -45,11 +45,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)
 }

core/testing/build.gradle.kts

@@ -24,7 +24,7 @@ android {
 }
 // Explicitly disable the connectedAndroidTest task for this module
 androidComponents {
-    beforeVariants(selector().all()) { variant ->
+    beforeVariants { variant ->
         variant.enableAndroidTest = false
     }
 }

core/testing/proguard-rules.pro

@@ -24,7 +24,7 @@ android {
 }
 // Explicitly disable the connectedAndroidTest task for this module
 androidComponents {
-    beforeVariants(selector().all()) { variant ->
+    beforeVariants { variant ->
         variant.enableAndroidTest = false
     }
 }