Merge pull request #4 from boranfrkn/HiltAndComposeConventionPlugins

HiltAndConventionPlugins
boranfrkn · Aug 18, 2023 · d77fc42 · d77fc42
2 parents edcaf14 + 3441410
commit d77fc42
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 98 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlinAndorid)
-    alias(libs.plugins.kapt)
     alias(libs.plugins.hilt)
+    id("hilt-convention")
 }
 
 android {
@@ -38,14 +38,8 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.toString()
     }
-    kapt {
-        correctErrorTypes = true
-    }
 }
 
 dependencies {
-    implementation(libs.hiltAndroid)
-    kapt(libs.hiltCompiler)
-
     implementation(projects.characters)
 }
diff --git a/build-logic/src/main/java/com/furkanboran/build_logic/Extensions.kt b/build-logic/src/main/java/com/furkanboran/build_logic/Extensions.kt
@@ -0,0 +1,14 @@
+package com.furkanboran.build_logic
+
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.plugins.ExtensionAware
+import org.gradle.kotlin.dsl.getByType
+import org.jetbrains.kotlin.gradle.plugin.KaptExtension
+
+val Project.libs
+    get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+fun Project.kapt(block: KaptExtension.() -> Unit): Unit =
+    (this as ExtensionAware).extensions.configure("kapt", block)
diff --git a/build-logic/src/main/java/com/furkanboran/build_logic/compose-convention.gradle.kts b/build-logic/src/main/java/com/furkanboran/build_logic/compose-convention.gradle.kts
@@ -0,0 +1,26 @@
+import com.furkanboran.build_logic.libs
+
+plugins {
+    id("library-convention")
+}
+
+android {
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.4"
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+}
+
+dependencies {
+    add("implementation", platform(libs.findLibrary("composeBom").get()))
+    add("implementation", libs.findLibrary("ui").get())
+    add("implementation", libs.findLibrary("uiGraphics").get())
+    add("implementation", libs.findLibrary("uiToolingPreview").get())
+    add("implementation", libs.findLibrary("material3").get())
+    add("debugImplementation", libs.findLibrary("uiTooling").get())
+}
diff --git a/build-logic/src/main/java/com/furkanboran/build_logic/hilt-convention.gradle.kts b/build-logic/src/main/java/com/furkanboran/build_logic/hilt-convention.gradle.kts
@@ -0,0 +1,10 @@
+import com.furkanboran.build_logic.libs
+
+plugins {
+    kotlin("kapt")
+}
+
+dependencies {
+    add("implementation", libs.findLibrary("hiltAndroid").get())
+    add("kapt", libs.findLibrary("hiltCompiler").get())
+}
diff --git a/build-logic/src/main/java/com/furkanboran/build_logic/library-convention.gradle.kts b/build-logic/src/main/java/com/furkanboran/build_logic/library-convention.gradle.kts
@@ -18,4 +18,8 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
         sourceCompatibility = JavaVersion.VERSION_17
     }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
 }
diff --git a/character-card/build.gradle.kts b/character-card/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     id("library-convention")
+    id("compose-convention")
     alias(libs.plugins.kotlinAndorid)
 }
 
@@ -20,32 +21,10 @@ android {
             )
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    buildFeatures {
-        compose = true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.4"
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
 }
 
 dependencies {
-
     implementation(libs.coreKtx)
     implementation(libs.appcompat)
-    implementation(libs.material)
-    implementation(libs.activityCompose)
-    implementation(platform(libs.composeBom))
-    implementation(libs.ui)
-    implementation(libs.uiGraphics)
-    implementation(libs.uiToolingPreview)
-    implementation(libs.material3)
     implementation(libs.coil)
-    debugImplementation(libs.uiTooling)
 }
diff --git a/characters/build.gradle.kts b/characters/build.gradle.kts
@@ -1,7 +1,8 @@
 plugins {
     id("library-convention")
+    id("compose-convention")
+    id("hilt-convention")
     alias(libs.plugins.kotlinAndorid)
-    alias(libs.plugins.kapt)
     alias(libs.plugins.hilt)
 }
 
@@ -41,16 +42,7 @@ dependencies {
     implementation(libs.coreKtx)
     implementation(libs.lifecycleRuntimeKtx)
     implementation(libs.activityCompose)
-    implementation(platform(libs.composeBom))
-    implementation(libs.ui)
-    implementation(libs.uiGraphics)
-    implementation(libs.uiToolingPreview)
-    implementation(libs.material3)
     implementation(libs.paging)
-    implementation(libs.hiltAndroid)
-    kapt(libs.hiltCompiler)
-    androidTestImplementation(platform(libs.composeBom))
-    debugImplementation(libs.uiTooling)
     debugImplementation(libs.uiTestManifest)
 
     implementation(projects.characterCard)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,20 +1,10 @@
 plugins {
     id("library-convention")
-    alias(libs.plugins.kotlinAndorid)
-    alias(libs.plugins.kapt)
-    alias(libs.plugins.hilt)
+    id("hilt-convention")
 }
 
 android {
     namespace = "boranfrkn.disneycharacters.core"
-    compileSdk = 33
-
-    defaultConfig {
-        minSdk = 24
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
 
     buildTypes {
         release {
@@ -25,16 +15,4 @@ android {
             )
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-}
-
-dependencies {
-    implementation(libs.hiltAndroid)
-    kapt(libs.hiltCompiler)
 }
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -1,18 +1,12 @@
 plugins {
     id("library-convention")
+    id("hilt-convention")
     alias(libs.plugins.kotlinAndorid)
-    alias(libs.plugins.kapt)
-    alias(libs.plugins.hilt)
 }
 
 android {
     namespace = "boranfrkn.disneycharacters.data"
 
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -22,26 +16,16 @@ android {
             )
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
 }
 
 dependencies {
-
     implementation(libs.coreKtx)
     implementation(libs.appcompat)
     implementation(libs.material)
     implementation(libs.retrofit)
     implementation(libs.retrofitGson)
     implementation(libs.okHttpLogging)
     implementation(libs.paging)
-    implementation(libs.hiltAndroid)
-    kapt(libs.hiltCompiler)
 
     implementation(projects.core)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -30,9 +30,9 @@ uiGraphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 uiTooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 uiToolingPreview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 uiTestManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
 hiltAndroid = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
 hiltCompiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }

diff --git a/theme/build.gradle.kts b/theme/build.gradle.kts
@@ -1,30 +1,13 @@
 plugins {
     id("library-convention")
+    id("compose-convention")
     alias(libs.plugins.kotlinAndorid)
 }
 
 android {
     namespace = "boranfrkn.disneycharacters.theme"
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-    buildFeatures {
-        compose = true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.4"
-    }
 }
 
 dependencies {
-
     implementation(libs.coreKtx)
-    implementation(libs.appcompat)
-    implementation(libs.material3)
-    implementation(platform(libs.composeBom))
 }