Move KSP/KAPT specific things from compiler-common to compiler (#231)

Author: ansman

.gitignore

@@ -105,3 +105,5 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 .idea/deploymentTargetDropDown.xml
+
+.kotlin

build-logic/src/main/kotlin/library.compiler.gradle.kts

@@ -1,6 +1,6 @@
 
 import com.android.build.gradle.LibraryExtension
-import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
 import se.ansman.dagger.auto.gradle.cachedProvider
@@ -16,11 +16,6 @@ plugins {
 
 val libs = the<LibrariesForLibs>()
 
-//archivesName.set(project.path
-//    .removePrefix(":third-party")
-//    .removePrefix(":")
-//    .replace(':', '-'))
-
 val gitCommit = cachedProvider {
     project.execWithOutput {
         commandLine("git", "rev-parse", "HEAD")
@@ -36,7 +31,6 @@ val remoteSource: Provider<String> = providers.gradleProperty("version")
     .map { repo("/blob/$it") }
 
 tasks.withType<AbstractDokkaLeafTask>().configureEach {
-//    moduleName.set(archivesName)
     val projectPath = project.path.removePrefix(":").replace(':', '/')
     dokkaSourceSets.configureEach {
         reportUndocumented.set(false)
@@ -181,22 +175,50 @@ pluginManager.withPlugin("com.android.library") {
     }
 }
 
-afterEvaluate {
-    if (pluginManager.hasPlugin("org.jetbrains.kotlin.jvm")) {
-        publication {
-            if (pluginManager.hasPlugin("com.github.johnrengelman.shadow")) {
-                the<ShadowExtension>().component(this)
+pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
+    publication {
+        afterEvaluate {
+            if (pluginManager.hasPlugin("com.gradleup.shadow")) {
+                from(components["shadow"])
             } else {
                 from(components["java"])
             }
         }
+    }
 
-        sourcesJar {
-            dependsOn("classes")
-            from(project.extensions.getByType<SourceSetContainer>().getByName("main").allSource)
-        }
+    sourcesJar {
+        dependsOn("classes")
+        from(project.extensions.getByType<SourceSetContainer>().getByName("main").allSource)
     }
 }
+
+pluginManager.withPlugin("com.gradleup.shadow") {
+    val compileShaded: Configuration by configurations.creating
+    configurations.named("compileOnly") { extendsFrom(compileShaded) }
+    configurations.named("testRuntimeOnly") { extendsFrom(compileShaded) }
+    configurations.named("shadow") { extendsFrom(configurations["implementation"]) }
+
+    // Since we change the classifier of the shadowJar we need to disable the default jar task or we'll get two
+    // artifacts that have the same classifier
+    tasks.named<Jar>("jar") {
+        archiveClassifier.set("ignored")
+    }
+
+    tasks.named<ShadowJar>("shadowJar") {
+        archiveClassifier.set("")
+        configurations = listOf(compileShaded)
+        isEnableRelocation = true
+        relocationPrefix = "se.ansman.dagger.auto${project.path.replace(':', '.').replace('-', '_')}"
+        mergeServiceFiles()
+    }
+
+    pluginManager.withPlugin("org.gradle.java-test-fixtures") {
+        configurations.named("testFixturesImplementation") { extendsFrom(compileShaded) }
+        configurations.named("testFixturesImplementation") { extendsFrom(configurations["implementation"]) }
+        configurations.named("testFixturesApi") { extendsFrom(configurations["api"]) }
+    }
+}
+
 pluginManager.withPlugin("org.gradle.java-test-fixtures") {
     // Disables publishing test fixtures:
     // https://docs.gradle.org/current/userguide/java_testing.html#ex-disable-publishing-of-test-fixtures-variants

build-logic/src/main/kotlin/library.publishing.gradle.kts

@@ -12,14 +12,14 @@ plugins {
     id("dokka-common")
     alias(libs.plugins.binaryCompatibilityValidator)
     alias(libs.plugins.mkdocs)
+    alias(libs.plugins.shadow) apply false
 }
 
 buildscript {
     dependencies {
         classpath(libs.android.gradlePlugin)
         classpath(libs.dokka.gradlePlugin)
         classpath(libs.dokka.versioningPlugin)
-        classpath(libs.shadow)
     }
 }
 

build.gradle.kts

@@ -1,15 +1,44 @@
+
+import se.ansman.dagger.auto.gradle.setupResourceTests
+
 plugins {
-    id("library.compiler")
+    kotlin("jvm")
+    kotlin("kapt")
+    id("library")
     id("library.publishing")
+    id("com.gradleup.shadow")
     `java-test-fixtures`
 }
 
+setupResourceTests()
+
 dependencies {
+    implementation(libs.javapoet)
+    implementation(libs.bundles.kotlinpoet)
+    implementation(libs.dagger)
+    implementation(libs.dagger.hilt.core)
+    implementation(libs.ksp.api)
+    implementation(libs.auto.common)
+
     implementation(projects.core)
     implementation(projects.android.testing)
-    implementation(projects.thirdParty.retrofit)
-    implementation(projects.thirdParty.ktorfit)
     implementation(projects.thirdParty.androidx.room)
-    testFixturesApi(projects.compiler.common.testUtils)
-    testImplementation(projects.compiler.common.testUtils)
+    implementation(projects.thirdParty.ktorfit)
+    implementation(projects.thirdParty.retrofit)
+
+    implementation(projects.compiler.common)
+    compileShaded(libs.kotlinx.metadata) {
+        exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+    }
+
+    implementation(libs.auto.service.annotations)
+    kapt(libs.auto.service)
+
+    implementation(libs.incap)
+    kapt(libs.incap.compiler)
+
+    testFixturesApi(libs.bundles.jvmTesting)
+    testFixturesApi(libs.dagger)
+    testFixturesApi(libs.dagger.hilt.core)
+    testFixturesApi(libs.bundles.compileTesting)
 }

compiler/build.gradle.kts

@@ -1,39 +1,13 @@
-
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransformer
-
 plugins {
     kotlin("jvm")
     id("library")
     id("library.publishing")
-    id("com.github.johnrengelman.shadow")
-}
-
-val compileShaded: Configuration by configurations.creating
-configurations.named("compileOnly") { extendsFrom(compileShaded) }
-configurations.named("testRuntimeOnly") { extendsFrom(compileShaded) }
-
-val shadowJar = tasks.named<ShadowJar>("shadowJar") {
-    configurations = listOf(compileShaded)
-    isEnableRelocation = true
-    relocationPrefix = "se.ansman.dagger.auto${project.path.replace(':', '.').replace('-', '_')}"
-    transformers.add(ServiceFileTransformer())
-}
-
-artifacts {
-    add("runtimeOnly", shadowJar)
 }
 
 dependencies {
-    @Suppress("UnstableApiUsage")
-    compileShaded(libs.kotlinx.metadata) {
-        exclude("org.jetbrains.kotlin", "kotlin-stdlib")
-    }
-
-    implementation(libs.javapoet)
-    implementation(libs.bundles.kotlinpoet)
+    compileOnly(libs.kotlinx.metadata)
+    compileOnly(libs.javapoet)
+    compileOnly(libs.bundles.kotlinpoet)
     implementation(libs.dagger)
     implementation(libs.dagger.hilt.core)
-    implementation(libs.ksp.api)
-    implementation(libs.auto.common)
 }

compiler/common/build.gradle.kts

@@ -7,8 +7,8 @@ import com.squareup.javapoet.JavaFile
 import com.squareup.javapoet.ParameterSpec
 import com.squareup.javapoet.TypeName
 import se.ansman.dagger.auto.compiler.androidx.room.models.AndroidXRoomDatabaseModule
-import se.ansman.dagger.auto.compiler.common.kapt.JavaPoetRenderEngine
-import se.ansman.dagger.auto.compiler.common.rendering.HiltJavaModuleBuilder
+import se.ansman.dagger.auto.compiler.kapt.JavaPoetRenderEngine
+import se.ansman.dagger.auto.compiler.kapt.HiltJavaModuleBuilder
 import javax.lang.model.element.Element
 
 object JavaAndroidXRoomDatabaseModuleRenderer :

compiler/src/main/kotlin/se/ansman/dagger/auto/compiler/androidx/room/renderer/JavaAndroidXRoomDatabaseModuleRenderer.kt

@@ -8,8 +8,8 @@ import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.ParameterSpec
 import com.squareup.kotlinpoet.TypeName
 import se.ansman.dagger.auto.compiler.androidx.room.models.AndroidXRoomDatabaseModule
-import se.ansman.dagger.auto.compiler.common.ksp.KotlinPoetRenderEngine
-import se.ansman.dagger.auto.compiler.common.rendering.HiltKotlinModuleBuilder
+import se.ansman.dagger.auto.compiler.ksp.KotlinPoetRenderEngine
+import se.ansman.dagger.auto.compiler.ksp.HiltKotlinModuleBuilder
 
 object KotlinAndroidXRoomDatabaseModuleRenderer :
     AndroidXRoomDatabaseModuleRenderer<KSDeclaration, TypeName, ClassName, AnnotationSpec, ParameterSpec, CodeBlock, FileSpec>(

compiler/src/main/kotlin/se/ansman/dagger/auto/compiler/androidx/room/renderer/KotlinAndroidXRoomDatabaseModuleRenderer.kt

@@ -6,8 +6,8 @@ import com.squareup.javapoet.CodeBlock
 import com.squareup.javapoet.JavaFile
 import com.squareup.javapoet.ParameterSpec
 import com.squareup.javapoet.TypeName
-import se.ansman.dagger.auto.compiler.common.kapt.JavaPoetRenderEngine
-import se.ansman.dagger.auto.compiler.common.rendering.HiltJavaModuleBuilder
+import se.ansman.dagger.auto.compiler.kapt.JavaPoetRenderEngine
+import se.ansman.dagger.auto.compiler.kapt.HiltJavaModuleBuilder
 import javax.lang.model.element.Element
 
 object JavaAutoBindModuleModuleRenderer : AutoBindObjectModuleRenderer<Element, TypeName, ClassName, AnnotationSpec, ParameterSpec, CodeBlock, JavaFile>(

compiler/src/main/kotlin/se/ansman/dagger/auto/compiler/autobind/renderer/JavaAutoBindModuleModuleRenderer.kt

@@ -7,8 +7,8 @@ import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.ParameterSpec
 import com.squareup.kotlinpoet.TypeName
-import se.ansman.dagger.auto.compiler.common.ksp.KotlinPoetRenderEngine
-import se.ansman.dagger.auto.compiler.common.rendering.HiltKotlinModuleBuilder
+import se.ansman.dagger.auto.compiler.ksp.KotlinPoetRenderEngine
+import se.ansman.dagger.auto.compiler.ksp.HiltKotlinModuleBuilder
 
 object KotlinAutoBindObjectModuleRenderer : AutoBindObjectModuleRenderer<KSDeclaration, TypeName, ClassName, AnnotationSpec, ParameterSpec, CodeBlock, FileSpec>(
     KotlinPoetRenderEngine,