From 7d03924de62c2e7570cce455c920bdad6515d02f Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Fri, 3 Dec 2021 12:56:55 +0530
Subject: [PATCH] build-logic: configure SlimTests correctly

---
 ...ithub.android-password-store.android-application.gradle.kts | 2 --
 ...com.github.android-password-store.android-common.gradle.kts | 3 +++
 ...om.github.android-password-store.android-library.gradle.kts | 3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-application.gradle.kts b/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-application.gradle.kts
index ce0058a0..e223b721 100644
--- a/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-application.gradle.kts
+++ b/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-application.gradle.kts
@@ -6,7 +6,6 @@
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import flavors.FlavorDimensions
 import flavors.ProductFlavors
-import flavors.configureSlimTests
 import org.gradle.kotlin.dsl.configure
 import signing.configureBuildSigning
 
@@ -60,6 +59,5 @@ extensions.configure<BaseAppModuleExtension> {
     register(ProductFlavors.NON_FREE) {}
   }
 
-  project.configureSlimTests()
   project.configureBuildSigning()
 }
diff --git a/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-common.gradle.kts b/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-common.gradle.kts
index 0d873892..4f76ba19 100644
--- a/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-common.gradle.kts
+++ b/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-common.gradle.kts
@@ -4,6 +4,7 @@
  */
 
 import com.android.build.gradle.TestedExtension
+import flavors.configureSlimTests
 
 extensions.configure<TestedExtension> {
   setCompileSdkVersion(31)
@@ -36,4 +37,6 @@ extensions.configure<TestedExtension> {
     animationsDisabled = true
     unitTests.isReturnDefaultValues = true
   }
+
+  configureSlimTests()
 }
diff --git a/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-library.gradle.kts b/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-library.gradle.kts
index 9a84d0f9..993bc2a4 100644
--- a/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-library.gradle.kts
+++ b/build-logic/android-plugins/src/main/kotlin/com.github.android-password-store.android-library.gradle.kts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-import flavors.configureSlimTests
 import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.plugins.signing.SigningExtension
 
@@ -13,8 +12,6 @@ plugins {
 }
 
 afterEvaluate {
-  project.configureSlimTests()
-
   extensions.configure<SigningExtension> {
     val signingKey: String? by project
     val signingPassword: String? by project