Close kapt context

This commit is contained in:
Alexey Tsvetkov
2018-06-28 22:53:34 +03:00
parent 3b18debee3
commit bfc608de29
2 changed files with 6 additions and 4 deletions
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.kapt3.base.javac.KaptJavaLog
import org.jetbrains.kotlin.kapt3.base.util.KaptLogger
import org.jetbrains.kotlin.kapt3.base.util.isJava9OrLater
import org.jetbrains.kotlin.kapt3.base.util.putJavacOption
import java.io.Closeable
import java.io.File
import javax.tools.JavaFileManager
@@ -27,7 +28,7 @@ open class KaptContext(
private val mapDiagnosticLocations: Boolean,
processorOptions: Map<String, String>,
javacOptions: Map<String, String> = emptyMap()
) : AutoCloseable {
) : Closeable {
val context = Context()
val compiler: KaptJavaCompiler
val fileManager: KaptJavaFileManager
@@ -149,8 +149,9 @@ abstract class AbstractKapt3Extension(
if (aptMode.generateStubs) {
logger.info { "Kotlin files to compile: " + files.map { it.virtualFile?.name ?: "<in memory ${it.hashCode()}>" } }
val kaptContext = compileStubs(project, module, bindingContext, files.toList())
generateKotlinSourceStubs(kaptContext)
contextForStubGeneration(project, module, bindingContext, files.toList()).use { context ->
generateKotlinSourceStubs(context)
}
}
if (!aptMode.runAnnotationProcessing) return doNotGenerateCode()
@@ -212,7 +213,7 @@ abstract class AbstractKapt3Extension(
logger.info { "Annotation processing took $annotationProcessingTime ms" }
}
private fun compileStubs(
private fun contextForStubGeneration(
project: Project,
module: ModuleDescriptor,
bindingContext: BindingContext,