Fixed setup for running all screen tests

Author: Pururun

.github/workflows/android-app.yml

@@ -151,7 +151,7 @@ jobs:
       - name: Prepare build tasks
         id: build-tasks
         run: |
-          tasks=":app:assembleOssProdDebug assembleOssProdAndroidTest assembleAllAndroidTest :test:mockapi:assemble"
+          tasks=":app:assembleOssProdDebug assembleOssProdAndroidTest :test:mockapi:assemble"
           if [[ "${{ needs.prepare.outputs.E2E_TEST_REPEAT }}" != '0' ]]; then
             tasks+=" :app:assemblePlayStagemoleDebug :test:e2e:assemble"
           fi

android/app/build.gradle.kts

@@ -30,7 +30,6 @@ plugins {
     alias(libs.plugins.kotlin.ksp)
     alias(libs.plugins.compose)
     alias(libs.plugins.baselineprofile)
-    //alias(libs.plugins.mullvad.android.library.instrumented.test)
     alias(libs.plugins.mullvad.unit.test)
     id("de.mannodermaus.android-junit5")
     id("net.mullvad.rust-android")
@@ -160,7 +159,7 @@ android {
     sourceSets {
         getByName("main") { assets.srcDirs(relayListDirectory, changelogAssetsDirectory) }
         getByName("androidTest") {
-            java.srcDirs("${project(":lib:feature:daita:impl").projectDir}/src/androidTest/java")
+            java.srcDirs("${rootProject.projectDir}/**/androidTest/kotlin")
         }
     }
 

android/gradle/build-logic/src/main/kotlin/AndroidLibraryInstrumentedTestPlugin.kt

@@ -37,17 +37,5 @@ class AndroidLibraryInstrumentedTestPlugin : Plugin<Project> {
                 "androidTestImplementation"(libs.findLibrary("junit5.android.test.runner").get())
             }
         }
-
-        target.tasks.register("assembleAllAndroidTest") {
-            dependsOn(
-                try {
-                    target.tasks.getByName("assembleAndroidTest")
-                } catch (e: UnknownTaskException) {
-                    // Modules with flavors will not have normal android test tasks so we test with
-                    // ossProdDebug
-                    target.tasks.getByName("assembleOssProdAndroidTest")
-                }
-            )
-        }
     }
 }