From 85b8350c8fb42de9c7e81f7657c7401dc98f2f7e Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Wed, 21 Jun 2023 23:00:10 +0530
Subject: [PATCH] fix: add 'runTestsInCI' task to projects for running tests in
 CI

---
 .github/workflows/build.yml                   |  2 +-
 .idea/compiler.xml                            | 12 +++++------
 .../androidide/plugins/AndroidIDEPlugin.kt    | 21 +++++++++++++++++++
 build.gradle.kts                              |  7 +++++--
 settings.gradle.kts                           |  1 -
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d5f000ca6..3ec548501 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -122,7 +122,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Run debug tests
-        run: ./gradlew test --continue
+        run: ./gradlew runTestsInCI --continue
         env:
           ANDROIDIDE_TEST: true
           IDE_SIGNING_ALIAS: ${{ secrets.IDE_SIGNING_ALIAS }}
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 983e88772..2c33d6782 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -12,18 +12,18 @@
       <profile name="Gradle Imported" enabled="true">
         <outputRelativeToContentRoot value="true" />
         <processorPath useClasspath="false">
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service/1.1.0/f2d5d13c2f812fafef11152949b0b117624ce553/auto-service-1.1.0.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service/1.1.1/bfeb4c40087b49e23700f074807d3f2a6d36d2d1/auto-service-1.1.1.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.ltgt.gradle.incap/incap-processor/1.0.0/ddec950483eefb2a5cca0736f5967fccbfdb7d2d/incap-processor-1.0.0.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service-annotations/1.1.0/d22db50d06b26c9882a046ea597f43b174dd3374/auto-service-annotations-1.1.0.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service-annotations/1.1.1/da12a15cd058ba90a0ff55357fb521161af4736d/auto-service-annotations-1.1.1.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto/auto-common/1.2.1/f6da26895f759010f5f170c8044e84c1b17ef83e/auto-common-1.2.1.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/31.1-jre/60458f877d055d0c9114d9e1a2efb737b4bc282c/guava-31.1-jre.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/32.0.1-jre/6e5d51a72d142f2d40a57dfb897188b36a95b489/guava-32.0.1-jre.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.ltgt.gradle.incap/incap/1.0.0/4d765e5b0e3ee542b57ccffbb9c147c280290207/incap-1.0.0.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/b421526c5f297295adef1c886e5246c39d4ac629/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.12.0/d5692f0526415fcc6de94bb5bfbd3afd9dd3b3e5/checker-qual-3.12.0.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.11.0/c5a0ace696d3f8b1c1d8cc036d8c03cc0cbe6b69/error_prone_annotations-2.11.0.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.3/ba035118bc8bac37d7eff77700720999acd9986d/j2objc-annotations-1.3.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.33.0/de2b60b62da487644fc11f734e73c8b0b431238f/checker-qual-3.33.0.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.18.0/89b684257096f548fa39a7df9fdaa409d4d4df91/error_prone_annotations-2.18.0.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/2.8/c85270e307e7b822f1086b93689124b89768e273/j2objc-annotations-2.8.jar" />
         </processorPath>
         <module name="AndroidIDE.annotation-processors.main" />
       </profile>
diff --git a/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt b/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt
index 2052895db..14d27db66 100644
--- a/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt
+++ b/build-logic/ide/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt
@@ -17,6 +17,7 @@
 
 package com.itsaky.androidide.plugins
 
+import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
@@ -28,5 +29,25 @@ import org.gradle.api.Project
 class AndroidIDEPlugin : Plugin<Project> {
 
   override fun apply(target: Project) {
+    target.run {
+      if (project.path == rootProject.path) {
+        throw GradleException("Cannot apply ${AndroidIDEPlugin::class.simpleName} to root project")
+      }
+
+      val taskName = when {
+        project.path == ":app" -> "testArm64-v8aDebugUnitTest"
+
+        plugins.hasPlugin("com.android.application") ||
+        plugins.hasPlugin("com.android.library") -> "testDebugUnitTest"
+
+        else -> "test"
+      }
+
+      logger.info("${project.path} will run task '$taskName' for tests in CI")
+
+      project.tasks.create("runTestsInCI") {
+        dependsOn(taskName)
+      }
+    }
   }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index e05367a23..d62599c46 100755
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,6 +25,7 @@ import com.vanniktech.maven.publish.JavaLibrary
 import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import com.vanniktech.maven.publish.SonatypeHost.Companion.S01
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
@@ -114,7 +115,9 @@ fun Project.configureBaseExtension() {
 }
 
 subprojects {
-  apply { plugin(AndroidIDEPlugin::class.java) }
+  afterEvaluate {
+    apply { plugin(AndroidIDEPlugin::class.java) }
+  }
 
   project.group = BuildConfig.packageName
   project.version = rootProject.version
@@ -179,7 +182,7 @@ subprojects {
     }
   }
 
-  tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+  tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = BuildConfig.javaVersion.toString()
   }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4911957d0..744897eb0 100755
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -96,6 +96,5 @@ include(
   ":subprojects:tooling-api-model",
   ":subprojects:tooling-api-testing",
   ":subprojects:xml-dom",
-  ":subprojects:xml-formatter",
   ":subprojects:xml-utils"
 )
\ No newline at end of file