Convert inheritance into delegation

build-logic/convention/src/main/kotlin/AndroidHiltConventionPlugin.kt

@@ -14,14 +14,15 @@
  *   limitations under the License.
  */
 
-import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.Plugin
-import org.gradle.kotlin.dsl.DependencyHandlerScope
+import org.gradle.api.Project
 
-class AndroidHiltConventionPlugin : HiltConventionPlugin() {
+class AndroidHiltConventionPlugin : Plugin<Project> by HiltConventionPlugin(
-    override val basePluginId = "dagger.hilt.android.plugin"
+    basePluginId = "dagger.hilt.android.plugin",
-    override fun DependencyHandlerScope.additionalDependencies(libs: VersionCatalog) {
+    dependencyHandler = { libs ->
         "implementation"(libs.findLibrary("hilt.android").get())
+        "ksp"(libs.findLibrary("hilt.compiler").get())
         "kspAndroidTest"(libs.findLibrary("hilt.compiler").get())
         "kspTest"(libs.findLibrary("hilt.compiler").get())
     }
-}
+)

build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt

@@ -21,9 +21,10 @@ import org.gradle.api.artifacts.VersionCatalog
 import org.gradle.kotlin.dsl.DependencyHandlerScope
 import org.gradle.kotlin.dsl.dependencies
 
-abstract class HiltConventionPlugin : Plugin<Project> {
+class HiltConventionPlugin(
-    open val basePluginId: String? = null
+    val basePluginId: String? = null,
-    protected abstract fun DependencyHandlerScope.additionalDependencies(libs: VersionCatalog)
+    val dependencyHandler: DependencyHandlerScope.(libs: VersionCatalog) -> Unit
+) : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
@@ -32,7 +33,7 @@ abstract class HiltConventionPlugin : Plugin<Project> {
             }
             dependencies {
                 "ksp"(libs.findLibrary("hilt.compiler").get())
-                additionalDependencies(libs)
+                dependencyHandler(libs)
             }
         }
     }

build-logic/convention/src/main/kotlin/JvmHiltConventionPlugin.kt

@@ -14,11 +14,11 @@
  *   limitations under the License.
  */
 
-import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.Plugin
-import org.gradle.kotlin.dsl.DependencyHandlerScope
+import org.gradle.api.Project
 
-class JvmHiltConventionPlugin : HiltConventionPlugin() {
+class JvmHiltConventionPlugin : Plugin<Project> by HiltConventionPlugin(
-    override fun DependencyHandlerScope.additionalDependencies(libs: VersionCatalog) {
+    dependencyHandler = { libs ->
         "implementation"(libs.findLibrary("hilt.core").get())
-    }
+    },
-}
+)