From c7a25c68691469c99db91a58f6b69fe417109b65 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 11 Jan 2023 14:14:51 +0800
Subject: [PATCH 1/3] Apply KAP for BasePlugin type

---
 adapter/build.gradle.kts      | 1 -
 app/build.gradle.kts          | 1 -
 base/build.gradle.kts         | 1 -
 biz/detail/build.gradle.kts   | 1 -
 biz/login/build.gradle.kts    | 1 -
 biz/main/build.gradle.kts     | 1 -
 biz/obsolete/build.gradle.kts | 1 -
 biz/web/build.gradle.kts      | 1 -
 build.gradle.kts              | 4 ++++
 common/build.gradle.kts       | 1 -
 10 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/adapter/build.gradle.kts b/adapter/build.gradle.kts
index 90ca15056..315846261 100644
--- a/adapter/build.gradle.kts
+++ b/adapter/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
   alias(libs.plugins.android.library)
-  alias(libs.plugins.kotlin.android)
   alias(libs.plugins.napt)
   alias(libs.plugins.cacheFix)
 }
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4dbf82aed..35f95e36e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -3,7 +3,6 @@ import java.util.Properties
 
 plugins {
   alias(libs.plugins.android.application)
-  alias(libs.plugins.kotlin.android)
   alias(libs.plugins.napt)
   alias(libs.plugins.cacheFix)
 }
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index cc8782cab..8acc7c776 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
   alias(libs.plugins.android.library)
-  alias(libs.plugins.kotlin.android)
   alias(libs.plugins.napt)
   alias(libs.plugins.cacheFix)
 }
diff --git a/biz/detail/build.gradle.kts b/biz/detail/build.gradle.kts
index 466ad374f..c7b81e3d8 100644
--- a/biz/detail/build.gradle.kts
+++ b/biz/detail/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
   alias(libs.plugins.android.library)
-  alias(libs.plugins.kotlin.android)
   alias(libs.plugins.ksp)
   alias(libs.plugins.cacheFix)
 }
diff --git a/biz/login/build.gradle.kts b/biz/login/build.gradle.kts
index 094b3eefc..1c21a62e5 100644
--- a/biz/login/build.gradle.kts
+++ b/biz/login/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
   alias(libs.plugins.android.library)
-  alias(libs.plugins.kotlin.android)
   alias(libs.plugins.napt)
   alias(libs.plugins.cacheFix)
 }
diff --git a/biz/main/build.gradle.kts b/biz/main/build.gradle.kts
index 18e882df9..2f3b92091 100644
--- a/biz/main/build.gradle.kts
+++ b/biz/main/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
   alias(libs.plugins.android.library)
-  alias(libs.plugins.kotlin.android)
   alias(libs.plugins.ksp)
   alias(libs.plugins.napt)
   alias(libs.plugins.cacheFix)
diff --git a/biz/obsolete/build.gradle.kts b/biz/obsolete/build.gradle.kts
index 259158f00..a394878e2 100644
--- a/biz/obsolete/build.gradle.kts
+++ b/biz/obsolete/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
   alias(libs.plugins.android.library)
-  alias(libs.plugins.kotlin.android)
   alias(libs.plugins.cacheFix)
 }
 
diff --git a/biz/web/build.gradle.kts b/biz/web/build.gradle.kts
index 0ca3281b0..9d3ba9955 100644
--- a/biz/web/build.gradle.kts
+++ b/biz/web/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
   alias(libs.plugins.android.library)
-  alias(libs.plugins.kotlin.android)
   alias(libs.plugins.napt)
   alias(libs.plugins.cacheFix)
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index c8654d295..28bec9c64 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,6 @@
 import com.android.build.gradle.BaseExtension
 import com.google.devtools.ksp.gradle.KspExtension
+import com.android.build.gradle.BasePlugin
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -22,6 +23,9 @@ allprojects {
     config = rootProject.files("config/detekt/detekt.yml")
   }
 
+  plugins.withType<BasePlugin> {
+    plugins.apply(libs.plugins.kotlin.android.get().pluginId)
+  }
   plugins.withId(rootProject.libs.plugins.android.library.get().pluginId) {
     if (displayName.contains(":biz:") || name.startsWith("common")) setupCommon() else setupBase()
   }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index df9ad205d..4aae13936 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
   alias(libs.plugins.android.library)
-  alias(libs.plugins.kotlin.android)
   alias(libs.plugins.ksp)
   alias(libs.plugins.napt)
   alias(libs.plugins.cacheFix)

From 09603ea13deafffc5fbe936e07a527001fd40e1e Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 11 Jan 2023 14:15:35 +0800
Subject: [PATCH 2/3] Apply cacheFix for BasePlugin type

---
 adapter/build.gradle.kts      | 1 -
 app/build.gradle.kts          | 1 -
 base/build.gradle.kts         | 1 -
 biz/detail/build.gradle.kts   | 1 -
 biz/login/build.gradle.kts    | 1 -
 biz/main/build.gradle.kts     | 1 -
 biz/obsolete/build.gradle.kts | 1 -
 biz/web/build.gradle.kts      | 1 -
 build.gradle.kts              | 1 +
 common/build.gradle.kts       | 1 -
 10 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/adapter/build.gradle.kts b/adapter/build.gradle.kts
index 315846261..8780f8c2e 100644
--- a/adapter/build.gradle.kts
+++ b/adapter/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.napt)
-  alias(libs.plugins.cacheFix)
 }
 
 android {
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 35f95e36e..d8df879bc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,7 +4,6 @@ import java.util.Properties
 plugins {
   alias(libs.plugins.android.application)
   alias(libs.plugins.napt)
-  alias(libs.plugins.cacheFix)
 }
 
 android {
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index 8acc7c776..f3b71e080 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.napt)
-  alias(libs.plugins.cacheFix)
 }
 
 android {
diff --git a/biz/detail/build.gradle.kts b/biz/detail/build.gradle.kts
index c7b81e3d8..df1626ba8 100644
--- a/biz/detail/build.gradle.kts
+++ b/biz/detail/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.ksp)
-  alias(libs.plugins.cacheFix)
 }
 
 android {
diff --git a/biz/login/build.gradle.kts b/biz/login/build.gradle.kts
index 1c21a62e5..df663d217 100644
--- a/biz/login/build.gradle.kts
+++ b/biz/login/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.napt)
-  alias(libs.plugins.cacheFix)
 }
 
 android {
diff --git a/biz/main/build.gradle.kts b/biz/main/build.gradle.kts
index 2f3b92091..9c2e679a0 100644
--- a/biz/main/build.gradle.kts
+++ b/biz/main/build.gradle.kts
@@ -2,7 +2,6 @@ plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.ksp)
   alias(libs.plugins.napt)
-  alias(libs.plugins.cacheFix)
 }
 
 android {
diff --git a/biz/obsolete/build.gradle.kts b/biz/obsolete/build.gradle.kts
index a394878e2..9955b2495 100644
--- a/biz/obsolete/build.gradle.kts
+++ b/biz/obsolete/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
   alias(libs.plugins.android.library)
-  alias(libs.plugins.cacheFix)
 }
 
 dependencies {
diff --git a/biz/web/build.gradle.kts b/biz/web/build.gradle.kts
index 9d3ba9955..7e88e6973 100644
--- a/biz/web/build.gradle.kts
+++ b/biz/web/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.napt)
-  alias(libs.plugins.cacheFix)
 }
 
 android {
diff --git a/build.gradle.kts b/build.gradle.kts
index 28bec9c64..9b0864dc2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,6 +25,7 @@ allprojects {
 
   plugins.withType<BasePlugin> {
     plugins.apply(libs.plugins.kotlin.android.get().pluginId)
+    plugins.apply(libs.plugins.cacheFix.get().pluginId)
   }
   plugins.withId(rootProject.libs.plugins.android.library.get().pluginId) {
     if (displayName.contains(":biz:") || name.startsWith("common")) setupCommon() else setupBase()
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 4aae13936..fc3abb214 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -2,7 +2,6 @@ plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.ksp)
   alias(libs.plugins.napt)
-  alias(libs.plugins.cacheFix)
 }
 
 android {

From a507861c7e5773592c6fbf957b73b3c986ffc8d5 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 11 Jan 2023 14:19:58 +0800
Subject: [PATCH 3/3] Check plugin type for BasePlugin

---
 build.gradle.kts | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9b0864dc2..efb0b277d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,8 @@
+import com.android.build.gradle.AppPlugin
 import com.android.build.gradle.BaseExtension
-import com.google.devtools.ksp.gradle.KspExtension
 import com.android.build.gradle.BasePlugin
+import com.android.build.gradle.LibraryPlugin
+import com.google.devtools.ksp.gradle.KspExtension
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -26,12 +28,12 @@ allprojects {
   plugins.withType<BasePlugin> {
     plugins.apply(libs.plugins.kotlin.android.get().pluginId)
     plugins.apply(libs.plugins.cacheFix.get().pluginId)
-  }
-  plugins.withId(rootProject.libs.plugins.android.library.get().pluginId) {
-    if (displayName.contains(":biz:") || name.startsWith("common")) setupCommon() else setupBase()
-  }
-  plugins.withId(rootProject.libs.plugins.android.application.get().pluginId) {
-    setupCommon()
+
+    if (this is AppPlugin) {
+      setupCommon()
+    } else if (this is LibraryPlugin) {
+      if (displayName.contains(":biz:") || name.startsWith("common")) setupCommon() else setupBase()
+    }
   }
   plugins.withId(rootProject.libs.plugins.ksp.get().pluginId) {
     configure<KspExtension> {