mars885 · mars885 · Aug 21, 2024 · Aug 21, 2024 · Aug 21, 2024
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,11 +17,9 @@
 plugins {
     id(libs.plugins.androidApplication.get().pluginId)
     id(libs.plugins.gamedgeAndroid.get().pluginId)
-    id(libs.plugins.kotlinKapt.get().pluginId)
+    id(libs.plugins.gamedgeDaggerHilt.get().pluginId)
 
     alias(libs.plugins.jetpackCompose)
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.daggerHilt)
 }
 
 dependencies {
@@ -57,12 +55,6 @@ dependencies {
     implementation(libs.commonsCore)
     implementation(libs.commonsKtx)
 
-    implementation(libs.daggerHiltAndroid)
-    kapt(libs.daggerHiltAndroidCompiler)
-
-    implementation(libs.hiltBinder)
-    ksp(libs.hiltBinderCompiler)
-
     testImplementation(libs.jUnit)
 
     androidTestImplementation(libs.jUnitExt)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -33,6 +33,10 @@ gradlePlugin {
             id = "com.paulrybitskyi.gamedge.protobuf"
             implementationClass = "com.paulrybitskyi.gamedge.plugins.GamedgeProtobufPlugin"
         }
+        create("com.paulrybitskyi.gamedge.dagger.hilt") {
+            id = "com.paulrybitskyi.gamedge.dagger.hilt"
+            implementationClass = "com.paulrybitskyi.gamedge.plugins.GamedgeDaggerHiltPlugin"
+        }
         create("com.paulrybitskyi.gamedge.feature") {
             id = "com.paulrybitskyi.gamedge.feature"
             implementationClass = "com.paulrybitskyi.gamedge.plugins.GamedgeFeaturePlugin"

diff --git a/buildSrc/src/main/java/com/paulrybitskyi/gamedge/plugins/GamedgeDaggerHiltPlugin.kt b/buildSrc/src/main/java/com/paulrybitskyi/gamedge/plugins/GamedgeDaggerHiltPlugin.kt
@@ -0,0 +1,30 @@
+package com.paulrybitskyi.gamedge.plugins
+
+import com.paulrybitskyi.gamedge.extensions.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class GamedgeDaggerHiltPlugin : Plugin<Project> {
+
+    override fun apply(project: Project) = with(project) {
+        setupPlugins()
+        addDependencies()
+    }
+
+    private fun Project.setupPlugins(): Unit = with(plugins) {
+        apply(libs.plugins.kotlinKapt.get().pluginId)
+        apply(libs.plugins.ksp.get().pluginId)
+        apply(libs.plugins.daggerHilt.get().pluginId)
+    }
+
+    private fun Project.addDependencies(): Unit = with(dependencies) {
+        add("implementation", libs.daggerHiltAndroid.get())
+        add("kapt", libs.daggerHiltAndroidCompiler.get())
+
+        add("implementation", libs.hiltBinder.get())
+        add("ksp", libs.hiltBinderCompiler.get())
+
+        add("androidTestImplementation", libs.daggerHiltTesting.get())
+        add("kaptAndroidTest", libs.daggerHiltAndroidCompiler.get())
+    }
+}
diff --git a/buildSrc/src/main/java/com/paulrybitskyi/gamedge/plugins/GamedgeFeaturePlugin.kt b/buildSrc/src/main/java/com/paulrybitskyi/gamedge/plugins/GamedgeFeaturePlugin.kt
@@ -14,10 +14,8 @@ class GamedgeFeaturePlugin : Plugin<Project> {
     private fun Project.setupPlugins(): Unit = with(plugins) {
         apply(libs.plugins.androidLibrary.get().pluginId)
         apply(libs.plugins.gamedgeAndroid.get().pluginId)
-        apply(libs.plugins.kotlinKapt.get().pluginId)
         apply(libs.plugins.jetpackCompose.get().pluginId)
-        apply(libs.plugins.ksp.get().pluginId)
-        apply(libs.plugins.daggerHilt.get().pluginId)
+        apply(libs.plugins.gamedgeDaggerHilt.get().pluginId)
     }
 
     private fun Project.addDependencies(): Unit = with(dependencies) {
@@ -46,10 +44,6 @@ class GamedgeFeaturePlugin : Plugin<Project> {
         add("implementation", libs.accompanistNavigationAnimations.get())
         add("implementation", libs.kotlinResult.get())
         add("implementation", libs.coil.get())
-        add("implementation", libs.daggerHiltAndroid.get())
-        add("kapt", libs.daggerHiltAndroidCompiler.get())
-        add("implementation", libs.hiltBinder.get())
-        add("ksp", libs.hiltBinderCompiler.get())
         add("testImplementation", project(localModules.commonTesting))
         add("testImplementation", libs.jUnit.get())
         add("testImplementation", libs.truth.get())

diff --git a/common-api/build.gradle.kts b/common-api/build.gradle.kts
@@ -17,9 +17,7 @@
 plugins {
     id(libs.plugins.androidLibrary.get().pluginId)
     id(libs.plugins.gamedgeAndroid.get().pluginId)
-    id(libs.plugins.kotlinKapt.get().pluginId)
-
-    alias(libs.plugins.ksp)
+    id(libs.plugins.gamedgeDaggerHilt.get().pluginId)
 }
 
 android {
@@ -41,12 +39,6 @@ dependencies {
 
     implementation(libs.kotlinResult)
 
-    implementation(libs.daggerHiltAndroid)
-    kapt(libs.daggerHiltAndroidCompiler)
-
-    implementation(libs.hiltBinder)
-    ksp(libs.hiltBinderCompiler)
-
     testImplementation(libs.jUnit)
     androidTestImplementation(libs.jUnitExt)
 }
diff --git a/common-data/build.gradle.kts b/common-data/build.gradle.kts
@@ -17,10 +17,8 @@
 plugins {
     id(libs.plugins.androidLibrary.get().pluginId)
     id(libs.plugins.gamedgeAndroid.get().pluginId)
-    id(libs.plugins.kotlinKapt.get().pluginId)
     id(libs.plugins.gamedgeProtobuf.get().pluginId)
-
-    alias(libs.plugins.ksp)
+    id(libs.plugins.gamedgeDaggerHilt.get().pluginId)
 }
 
 android {
@@ -40,12 +38,6 @@ dependencies {
 
     implementation(libs.kotlinResult)
 
-    implementation(libs.daggerHiltAndroid)
-    kapt(libs.daggerHiltAndroidCompiler)
-
-    implementation(libs.hiltBinder)
-    ksp(libs.hiltBinderCompiler)
-
     testImplementation(project(localModules.commonTesting))
     testImplementation(libs.jUnit)
     testImplementation(libs.truth)

diff --git a/common-ui-widgets/build.gradle.kts b/common-ui-widgets/build.gradle.kts
@@ -17,11 +17,9 @@
 plugins {
     id(libs.plugins.androidLibrary.get().pluginId)
     id(libs.plugins.gamedgeAndroid.get().pluginId)
-    id(libs.plugins.kotlinKapt.get().pluginId)
+    id(libs.plugins.gamedgeDaggerHilt.get().pluginId)
 
     alias(libs.plugins.jetpackCompose)
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.daggerHilt)
 }
 
 android {
@@ -45,12 +43,6 @@ dependencies {
 
     implementation(libs.coil)
 
-    implementation(libs.daggerHiltAndroid)
-    kapt(libs.daggerHiltAndroidCompiler)
-
-    implementation(libs.hiltBinder)
-    ksp(libs.hiltBinderCompiler)
-
     testImplementation(libs.jUnit)
     androidTestImplementation(libs.jUnitExt)
 }
diff --git a/common-ui/build.gradle.kts b/common-ui/build.gradle.kts
@@ -17,10 +17,9 @@
 plugins {
     id(libs.plugins.androidLibrary.get().pluginId)
     id(libs.plugins.gamedgeAndroid.get().pluginId)
-    id(libs.plugins.kotlinKapt.get().pluginId)
+    id(libs.plugins.gamedgeDaggerHilt.get().pluginId)
 
     alias(libs.plugins.jetpackCompose)
-    alias(libs.plugins.ksp)
 }
 
 android {
@@ -44,12 +43,6 @@ dependencies {
 
     implementation(libs.coil)
 
-    implementation(libs.daggerHiltAndroid)
-    kapt(libs.daggerHiltAndroidCompiler)
-
-    implementation(libs.hiltBinder)
-    ksp(libs.hiltBinderCompiler)
-
     testImplementation(libs.jUnit)
     androidTestImplementation(libs.jUnitExt)
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -17,9 +17,7 @@
 plugins {
     id(libs.plugins.androidLibrary.get().pluginId)
     id(libs.plugins.gamedgeAndroid.get().pluginId)
-    id(libs.plugins.kotlinKapt.get().pluginId)
-
-    alias(libs.plugins.ksp)
+    id(libs.plugins.gamedgeDaggerHilt.get().pluginId)
 }
 
 android {
@@ -41,12 +39,6 @@ dependencies {
 
     implementation(libs.kotlinResult)
 
-    implementation(libs.daggerHiltAndroid)
-    kapt(libs.daggerHiltAndroidCompiler)
-
-    implementation(libs.hiltBinder)
-    ksp(libs.hiltBinderCompiler)
-
     testImplementation(project(localModules.commonTesting))
     testImplementation(libs.jUnit)
     testImplementation(libs.truth)

diff --git a/database/build.gradle.kts b/database/build.gradle.kts
@@ -17,10 +17,8 @@
 plugins {
     id(libs.plugins.androidLibrary.get().pluginId)
     id(libs.plugins.gamedgeAndroid.get().pluginId)
-    id(libs.plugins.kotlinKapt.get().pluginId)
+    id(libs.plugins.gamedgeDaggerHilt.get().pluginId)
 
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.daggerHilt)
     alias(libs.plugins.kotlinxSerialization)
 }
 
@@ -53,12 +51,6 @@ dependencies {
     implementation(libs.roomKtx)
     ksp(libs.roomCompiler)
 
-    implementation(libs.daggerHiltAndroid)
-    kapt(libs.daggerHiltAndroidCompiler)
-
-    implementation(libs.hiltBinder)
-    ksp(libs.hiltBinderCompiler)
-
     testImplementation(project(localModules.commonTesting))
     testImplementation(libs.jUnit)
     testImplementation(libs.truth)
@@ -73,7 +65,4 @@ dependencies {
     androidTestImplementation(libs.coroutinesTesting)
     androidTestImplementation(libs.turbine)
     androidTestImplementation(libs.roomTesting)
-
-    androidTestImplementation(libs.daggerHiltTesting)
-    kaptAndroidTest(libs.daggerHiltAndroidCompiler)
 }
diff --git a/gamespot-api/build.gradle.kts b/gamespot-api/build.gradle.kts
@@ -20,10 +20,8 @@ import com.paulrybitskyi.gamedge.extensions.stringField
 plugins {
     id(libs.plugins.androidLibrary.get().pluginId)
     id(libs.plugins.gamedgeAndroid.get().pluginId)
-    id(libs.plugins.kotlinKapt.get().pluginId)
+    id(libs.plugins.gamedgeDaggerHilt.get().pluginId)
 
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.daggerHilt)
     alias(libs.plugins.kotlinxSerialization)
 }
 
@@ -51,12 +49,6 @@ dependencies {
 
     implementation(libs.kotlinResult)
 
-    implementation(libs.daggerHiltAndroid)
-    kapt(libs.daggerHiltAndroidCompiler)
-
-    implementation(libs.hiltBinder)
-    ksp(libs.hiltBinderCompiler)
-
     testImplementation(project(localModules.commonTesting))
     testImplementation(libs.jUnit)
     testImplementation(libs.truth)
@@ -67,7 +59,4 @@ dependencies {
     androidTestImplementation(libs.jUnitExt)
     androidTestImplementation(libs.truth)
     androidTestImplementation(libs.mockWebServer)
-
-    androidTestImplementation(libs.daggerHiltTesting)
-    kaptAndroidTest(libs.daggerHiltAndroidCompiler)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -83,6 +83,7 @@ gradleVersions = { id = "com.github.ben-manes.versions", version.ref = "gradleVe
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektPlugin" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlintPlugin" }
 gamedgeAndroid = { id = "com.paulrybitskyi.gamedge.android" }
+gamedgeDaggerHilt = { id = "com.paulrybitskyi.gamedge.dagger.hilt" }
 gamedgeProtobuf = { id = "com.paulrybitskyi.gamedge.protobuf" }
 gamedgeFeature = { id = "com.paulrybitskyi.gamedge.feature" }
 

diff --git a/igdb-api/build.gradle.kts b/igdb-api/build.gradle.kts
@@ -20,10 +20,8 @@ import com.paulrybitskyi.gamedge.extensions.stringField
 plugins {
     id(libs.plugins.androidLibrary.get().pluginId)
     id(libs.plugins.gamedgeAndroid.get().pluginId)
-    id(libs.plugins.kotlinKapt.get().pluginId)
+    id(libs.plugins.gamedgeDaggerHilt.get().pluginId)
 
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.daggerHilt)
     alias(libs.plugins.kotlinxSerialization)
 }
 
@@ -53,12 +51,6 @@ dependencies {
 
     implementation(libs.kotlinResult)
 
-    implementation(libs.daggerHiltAndroid)
-    kapt(libs.daggerHiltAndroidCompiler)
-
-    implementation(libs.hiltBinder)
-    ksp(libs.hiltBinderCompiler)
-
     testImplementation(project(localModules.commonTesting))
     testImplementation(libs.jUnit)
     testImplementation(libs.truth)
@@ -69,7 +61,4 @@ dependencies {
     androidTestImplementation(libs.jUnitExt)
     androidTestImplementation(libs.truth)
     androidTestImplementation(libs.mockWebServer)
-
-    androidTestImplementation(libs.daggerHiltTesting)
-    kaptAndroidTest(libs.daggerHiltAndroidCompiler)
 }