From 3dcacd2f72f9e34af7c7a7a00f00bc603ee2ddd1 Mon Sep 17 00:00:00 2001
From: Dmitry Kostyrev <dkostyrev@joom.com>
Date: Thu, 29 Jun 2023 13:24:59 +0100
Subject: [PATCH] Explicitly use selector.all to make plugin compatible across
 different AGP versions.

---
 .../main/java/com/joom/paranoid/plugin/ParanoidPlugin.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/paranoid/gradle-plugin/src/main/java/com/joom/paranoid/plugin/ParanoidPlugin.kt b/paranoid/gradle-plugin/src/main/java/com/joom/paranoid/plugin/ParanoidPlugin.kt
index f1562ee..08766c2 100644
--- a/paranoid/gradle-plugin/src/main/java/com/joom/paranoid/plugin/ParanoidPlugin.kt
+++ b/paranoid/gradle-plugin/src/main/java/com/joom/paranoid/plugin/ParanoidPlugin.kt
@@ -49,7 +49,7 @@ class ParanoidPlugin : Plugin<Project> {
 
     val androidComponentsExtension = project.androidComponents ?: throw GradleException("Failed to get androidComponents extension")
     if (androidComponentsExtension.pluginVersion < MINIMUM_VERSION) {
-      throw GradleException("Paranoid requires Android Gradle Plugin version $MINIMUM_VERSION")
+      throw GradleException("Paranoid requires Android Gradle Plugin version ${MINIMUM_VERSION.major}.${MINIMUM_VERSION.minor}.${MINIMUM_VERSION.micro}")
     }
 
     registerParanoid(extension)
@@ -96,7 +96,7 @@ class ParanoidPlugin : Plugin<Project> {
 
   private fun registerParanoid(extension: ParanoidExtension) {
     project.applicationAndroidComponents?.apply {
-      onVariants { variant ->
+      onVariants(selector().all()) { variant ->
         if (extension.applyToBuildTypes.isVariantFit(variant)) {
           variant.createParanoidTransformTask(extension, validateClasspath = true)
         }
@@ -104,7 +104,7 @@ class ParanoidPlugin : Plugin<Project> {
     }
 
     project.libraryAndroidComponents?.apply {
-      onVariants { variant ->
+      onVariants(selector().all()) { variant ->
         if (extension.applyToBuildTypes.isVariantFit(variant)) {
           variant.createParanoidTransformTask(extension, validateClasspath = false)
         }