From b2c2be45bf29d6783f6f5e31e5cabbda66782521 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Tue, 29 Nov 2022 20:44:13 +0530
Subject: [PATCH] refactor: cleanup and simplify AndroidCommonPlugin

---
 .../aps/gradle/AndroidCommonPlugin.kt         | 31 +++----------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommonPlugin.kt b/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommonPlugin.kt
index f49b5fdf..9dfd4763 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommonPlugin.kt
+++ b/build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommonPlugin.kt
@@ -10,10 +10,9 @@ package dev.msfjarvis.aps.gradle
 
 import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.dsl.Lint
-import com.android.build.api.dsl.TestExtension
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
-import com.android.build.gradle.TestedExtension
+import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import org.gradle.android.AndroidCacheFixPlugin
 import org.gradle.api.JavaVersion
@@ -35,21 +34,13 @@ class AndroidCommonPlugin : Plugin<Project> {
   override fun apply(project: Project) {
     project.configureSlimTests()
     project.pluginManager.apply(AndroidCacheFixPlugin::class)
-    project.extensions.findByType<BaseAppModuleExtension>()?.run { lint.configureLint(project) }
-    project.extensions.findByType<LibraryExtension>()?.run { lint.configureLint(project) }
-    project.extensions.findByType<TestedExtension>()?.run {
+    project.extensions.findByType<BaseExtension>()?.run {
       compileSdkVersion(COMPILE_SDK)
       defaultConfig {
         minSdk = MIN_SDK
         targetSdk = TARGET_SDK
       }
 
-      sourceSets {
-        named("main") { java.srcDirs("src/main/kotlin") }
-        named("test") { java.srcDirs("src/test/kotlin") }
-        named("androidTest") { java.srcDirs("src/androidTest/kotlin") }
-      }
-
       packagingOptions {
         resources.excludes.add("**/*.version")
         resources.excludes.add("**/*.txt")
@@ -69,22 +60,8 @@ class AndroidCommonPlugin : Plugin<Project> {
         unitTests.isReturnDefaultValues = true
       }
     }
-    project.extensions.findByType<TestExtension>()?.run {
-      compileSdk = COMPILE_SDK
-      defaultConfig {
-        minSdk = MIN_SDK
-        targetSdk = TARGET_SDK
-      }
-      compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-      }
-
-      testOptions {
-        animationsDisabled = true
-        unitTests.isReturnDefaultValues = true
-      }
-    }
+    project.extensions.findByType<BaseAppModuleExtension>()?.run { lint.configureLint(project) }
+    project.extensions.findByType<LibraryExtension>()?.run { lint.configureLint(project) }
   }
 }