From 4710fab49fef131c3068663ccf8407c1295d9ff0 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 3 Aug 2016 20:01:49 +0300 Subject: [PATCH] Kapt: Use the base types in KotlinProcessingEnvironment (cherry picked from commit ed8e2e4) --- .../processing/impl/KotlinProcessingEnvironment.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/impl/KotlinProcessingEnvironment.kt b/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/impl/KotlinProcessingEnvironment.kt index 2e5605ad883..4b3868b5669 100644 --- a/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/impl/KotlinProcessingEnvironment.kt +++ b/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/impl/KotlinProcessingEnvironment.kt @@ -17,15 +17,19 @@ package org.jetbrains.kotlin.annotation.processing.impl import java.util.* +import javax.annotation.processing.Filer +import javax.annotation.processing.Messager import javax.annotation.processing.ProcessingEnvironment import javax.lang.model.SourceVersion +import javax.lang.model.util.Elements +import javax.lang.model.util.Types class KotlinProcessingEnvironment( - private val elements: KotlinElements, - private val types: KotlinTypes, - private val messager: KotlinMessager, + private val elements: Elements, + private val types: Types, + private val messager: Messager, options: Map, - private val filer: KotlinFiler + private val filer: Filer ) : ProcessingEnvironment { private val options = Collections.unmodifiableMap(options)