Kapt3: Output stubs to .java files in verbose mode

2016-10-29 05:02:31 +03:00
parent aa15e0ad67
commit 6b1fc6fc39
4 changed files with 101 additions and 44 deletions
@@ -58,10 +58,26 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
        return File(project.project.buildDir, "generated/source/kapt/$sourceSetName")
    }

+    fun getKaptStubsDir(project: Project, sourceSetName: String): File {
+        val dir = File(project.project.buildDir, "tmp/kapt3/stubs/$sourceSetName")
+        dir.mkdirs()
+        return dir
+    }
+
    private fun Project.findKaptConfiguration(sourceSetName: String): Configuration? {
        return project.configurations.findByName(getKaptConfigurationName(sourceSetName))
    }

+    private class Kapt3SubpluginContext(
+            val project: Project,
+            val kotlinCompile: KotlinCompile,
+            val javaCompile: AbstractCompile,
+            val variantData: Any?,
+            val javaSourceSet: SourceSet?,
+            val sourceSetName: String,
+            val kaptExtension: KaptExtension,
+            val kaptClasspath: MutableList<File>)
+
    override fun apply(
            project: Project, 
            kotlinCompile: KotlinCompile,
@@ -71,7 +87,6 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
    ): List<SubpluginOption> {
        assert((variantData != null) xor (javaSourceSet != null))

-        val pluginOptions = mutableListOf<SubpluginOption>()
        val kaptClasspath = arrayListOf<File>()

        fun handleSourceSet(sourceSetName: String) {
@@ -81,7 +96,7 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
                kaptClasspath.addAll(kaptConfiguration.resolve())
            }
        }
-        
+
        val sourceSetName = if (variantData != null) {
            for (provider in (variantData as BaseVariantData<*>).sourceProviders) {
                handleSourceSet((provider as AndroidSourceSet).name)
@@ -96,6 +111,18 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
            javaSourceSet.name
        }

+        val kaptExtension = project.extensions.getByType(KaptExtension::class.java)
+
+        val context = Kapt3SubpluginContext(project, kotlinCompile, javaCompile,
+                variantData, javaSourceSet, sourceSetName, kaptExtension, kaptClasspath)
+
+        return context.buildOptions()
+    }
+
+    // This method should be called no more than once for each Kapt3SubpluginContext
+    private fun Kapt3SubpluginContext.buildOptions(): List<SubpluginOption> {
+        val pluginOptions = mutableListOf<SubpluginOption>()
+
        val generatedFilesDir = getKaptGeneratedDir(project, sourceSetName)
        if (variantData != null) {
            (variantData as BaseVariantData<*>).addJavaSourceFoldersToModel(generatedFilesDir)
@@ -104,27 +131,13 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
        // Skip annotation processing in kotlinc if no kapt dependencies were provided
        if (kaptClasspath.isEmpty()) return emptyList()
        kaptClasspath.forEach { pluginOptions += SubpluginOption("apclasspath", it.absolutePath) }
-        
+
        javaCompile.source(generatedFilesDir)
-        
-        // Completely disable annotation processing in Java
-        (javaCompile as? JavaCompile)?.let { javaCompile ->
-            val options = javaCompile.options
-            options.compilerArgs = options.compilerArgs.filter { !it.startsWith("-proc:") } + "-proc:none"
-        }
+        disableAnnotationProcessingInJavaTask()

-        pluginOptions += SubpluginOption("generated", generatedFilesDir.canonicalPath)
+        pluginOptions += SubpluginOption("sources", generatedFilesDir.canonicalPath)
        pluginOptions += SubpluginOption("classes", kotlinCompile.destinationDir.canonicalPath)

-        val kaptExtension = project.extensions.getByType(KaptExtension::class.java)
-        if (kaptExtension.generateStubs) {
-            project.logger.warn("'kapt.generateStubs' is not used by the 'kotlin-kapt' plugin")
-        }
-        
-        if (project.hasProperty(VERBOSE_OPTION_NAME) && project.property(VERBOSE_OPTION_NAME) == "true") {
-            pluginOptions += SubpluginOption("verbose", "true")
-        }
-
        val androidPlugin = variantData?.let {
            project.extensions.findByName("android") as? BaseExtension
        }
@@ -136,9 +149,29 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
        val annotationsFile = File(kotlinCompile.taskBuildDirectory, "source-annotations.txt")
        kotlinCompile.sourceAnnotationsRegistry = SourceAnnotationsRegistry(annotationsFile)

+        addMiscOptions(pluginOptions)
+
        return pluginOptions
    }

+    private fun Kapt3SubpluginContext.addMiscOptions(pluginOptions: MutableList<SubpluginOption>) {
+        if (kaptExtension.generateStubs) {
+            project.logger.warn("'kapt.generateStubs' is not used by the 'kotlin-kapt' plugin")
+        }
+
+        if (project.hasProperty(VERBOSE_OPTION_NAME) && project.property(VERBOSE_OPTION_NAME) == "true") {
+            pluginOptions += SubpluginOption("verbose", "true")
+            pluginOptions += SubpluginOption("stubs", getKaptStubsDir(project, sourceSetName).canonicalPath)
+        }
+    }
+
+    private fun Kapt3SubpluginContext.disableAnnotationProcessingInJavaTask() {
+        (javaCompile as? JavaCompile)?.let { javaCompile ->
+            val options = javaCompile.options
+            options.compilerArgs = options.compilerArgs.filter { !it.startsWith("-proc:") } + "-proc:none"
+        }
+    }
+
    private val BaseVariantData<*>.sourceProviders: List<SourceProvider>
        get() = variantConfiguration.sortedSourceProviders

@@ -21,8 +21,8 @@ import org.gradle.api.tasks.compile.AbstractCompile
 import org.gradle.api.tasks.compile.JavaCompile
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptionsImpl
 import org.jetbrains.kotlin.gradle.internal.AnnotationProcessingManager
-import org.jetbrains.kotlin.gradle.internal.Kapt2GradleSubplugin
-import org.jetbrains.kotlin.gradle.internal.Kapt2KotlinGradleSubplugin
+import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin
+import org.jetbrains.kotlin.gradle.internal.Kapt3KotlinGradleSubplugin
 import org.jetbrains.kotlin.gradle.internal.initKapt
 import org.jetbrains.kotlin.gradle.plugin.android.AndroidGradleWrapper
 import org.jetbrains.kotlin.gradle.tasks.*
@@ -123,7 +123,7 @@ internal class Kotlin2JvmSourceSetProcessor(

                var kotlinAfterJavaTask: KotlinCompile? = null

-                if (aptConfiguration.dependencies.size > 1 && !Kapt2GradleSubplugin.isEnabled(project)) {
+                if (aptConfiguration.dependencies.size > 1 && !Kapt3GradleSubplugin.isEnabled(project)) {
                    javaTask.dependsOn(aptConfiguration.buildDependencies)

                    val (aptOutputDir, aptWorkingDir) = project.getAptDirsForSourceSet(sourceSetName)
@@ -340,7 +340,7 @@ internal open class KotlinAndroidPlugin(
            kotlinTask.description = "Compiles the $variantDataName kotlin."
            kotlinTask.setDependsOn(javaTask.dependsOn)

-            val isKapt2Enabled = Kapt2GradleSubplugin.isEnabled(project)
+            val isKapt2Enabled = Kapt3GradleSubplugin.isEnabled(project)

            val aptFiles = arrayListOf<File>()

@@ -553,7 +553,7 @@ private fun Project.getAptDirsForSourceSet(sourceSetName: String): Pair<File, Fi
 }

 private fun Project.createAptConfiguration(sourceSetName: String, kotlinPluginVersion: String): Configuration {
-    val aptConfigurationName = Kapt2KotlinGradleSubplugin.getKaptConfigurationName(sourceSetName)
+    val aptConfigurationName = Kapt3KotlinGradleSubplugin.getKaptConfigurationName(sourceSetName)

    val aptConfiguration = configurations.create(aptConfigurationName)
    val kotlinAnnotationProcessingDep = "org.jetbrains.kotlin:kotlin-annotation-processing:$kotlinPluginVersion"