add: loading app apk/aab and test apk.

Author: oianmol

.idea/workspace.xml

@@ -39,7 +39,8 @@ repositories {
 
 
 dependencies {
-    compileOnly("com.android.tools.build:gradle:7.4.2")
+    compileOnly("com.android.tools.build:gradle:3.6.1")
+
     compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
     protobuf(project(":protos"))
     compileOnly("org.apache.tomcat:annotations-api:6.0.53")

androidplugin/build.gradle.kts

@@ -1,5 +1,6 @@
 package dev.oianmol.opentestlab.tasks
 
+import com.android.build.gradle.api.BaseVariantOutput
 import com.google.protobuf.ByteString
 import dev.oianmol.opentestlab.*
 import io.grpc.ManagedChannel
@@ -9,20 +10,38 @@ import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import org.gradle.api.DefaultTask
+import org.gradle.api.DomainObjectCollection
 import org.gradle.api.GradleException
 import org.gradle.api.Project
+import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction
 import java.io.File
 import java.util.concurrent.TimeUnit.SECONDS
 
 abstract class AndroidTestDeviceFarmTask : DefaultTask() {
 
+    @Input
+    var appBinary: String? = null
+
+    @Input
+    var testAppBinary: String? = null
+
     @TaskAction
     fun connectDevices() {
+        requireNotNull(appBinary) {
+            "APK/AAB was not built for executing test cases! please assemble first"
+        }
+
+        requireNotNull(testAppBinary) {
+            "AndroidTest APK/AAB was not built for executing test cases! please assemble first"
+        }
+
+        logger.lifecycle("appBinary ${appBinary} testAppBinary${testAppBinary}")
         runBlocking {
             val channel = managedChannel()
             runCatchingCancellable {
-                val (testApk, apk) = project.testApks()
+                val apk = File(appBinary)
+                val testApk = File(testAppBinary)
                 with(DeviceFarmServiceGrpcKt.DeviceFarmServiceCoroutineStub(channel)) {
                     deviceFarmInfo(this).availableDevices()?.let {
                         dumpDebugLog("Executing Tests for Test APK ${testApk.absolutePath}")

androidplugin/src/main/java/dev/oianmol/opentestlab/tasks/AndroidTestDeviceFarmTask.kt

@@ -1,22 +1,21 @@
 package dev.oianmol.opentestlab.tasks
 
-
+import com.android.build.gradle.AppExtension
+import com.android.build.gradle.TestedExtension
+import com.android.build.gradle.api.ApplicationVariant
+import com.android.build.gradle.api.TestVariant
+import dev.oianmol.opentestlab.tasks.DeviceFarmPlugin.Companion.OPEN_TEST_LAB
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
+
 class DeviceFarmPlugin : Plugin<Project> {
     companion object {
-        const val GRADLE_METHOD_NAME = "configureOpenDeviceFarm"
+        const val OPEN_TEST_LAB = "OPEN_TEST_LAB"
     }
 
     override fun apply(project: Project) {
         with(project) {
-            project.extensions.create(
-                GRADLE_METHOD_NAME,
-                DeviceFarmPluginExtension::class.java,
-                project
-            )
-
             project.afterEvaluate {
                 logger.lifecycle("*************** Open Test Lab Plugin ***************")
                 deviceFarm()
@@ -27,17 +26,37 @@ class DeviceFarmPlugin : Plugin<Project> {
 }
 
 fun Project.deviceFarm() {
-    project.extensions.findByType(DeviceFarmPluginExtension::class.java)?.apply {
-        this.applicationId?.let {
+    val androidExtension: Any? = project.extensions.findByName("android")
+    val appExtension = (androidExtension as AppExtension)
+    (androidExtension as TestedExtension).apply {
+        testVariants.toList().forEach { testVariant ->
             tasks.register(
-                "executeDeviceFarmFor${it.replace(".", "dot")}",
+                "openDeviceFarmTest${testVariant.name.capitalize()}",
                 AndroidTestDeviceFarmTask::class.java,
-            )
-
+            ) {
+                group = OPEN_TEST_LAB
+                description = "Execute DeviceFarm Test"
+                val appVariant = appExtension.applicationVariants.toList()
+                    .firstOrNull {
+                        it.buildType == testVariant.buildType
+                                && it.flavorName == testVariant.flavorName
+                    }!!
+                appBinary = appVariant.outputs.firstOrNull()?.outputFile?.absolutePath
+                testAppBinary = testVariant.outputs.firstOrNull()?.outputFile?.absolutePath
+            }
             tasks.register(
-                "pullLatestTestReportFor${it.replace(".", "dot")}",
+                "openDeviceFarmFetchReportFor${testVariant.name.capitalize()}",
                 TestLabPullReportTask::class.java,
-            )
+            ) {
+                group = OPEN_TEST_LAB
+                description = "Open DeviceFarm Fetch Report"
+            }
         }
     }
 }
+
+
+sealed class ExtensionType(open val testVariant: TestVariant) {
+    data class Application(override val testVariant: TestVariant, val appVariant: ApplicationVariant) :
+        ExtensionType(testVariant)
+}

androidplugin/src/main/java/dev/oianmol/opentestlab/tasks/DeviceFarmPlugin.kt

@@ -33,4 +33,5 @@ message Empty {}
 enum FileType {
   TestApk = 0;  // Test APK file.
   AndroidApk = 1;  // Android APK file.
+  AppBundle = 2; // The android app bundle.
 }

androidplugin/src/main/java/dev/oianmol/opentestlab/tasks/DeviceFarmPluginExtension.kt

@@ -4,10 +4,6 @@ plugins {
     alias(libs.plugins.device.farm)
 }
 
-configureOpenDeviceFarm {
-    applicationId = "dev.oianmol.sampleandroidapp"
-}
-
 android {
     namespace = "dev.oianmol.sampleandroidapp"
     compileSdk = 34