From 2fba80168d33f01a7ecf0cac625067e2ac4932ee Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 14 Oct 2015 00:01:37 +0300 Subject: [PATCH] Remove usages of Delegates.lazy --- .../kotlin/annotation/AnnotationProcessorWrapper.kt | 2 +- .../org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 8 ++++---- .../kotlin/annotation/AnnotationCollectorExtension.kt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt b/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt index a8bbc07bc0a..3f8f6c3881b 100644 --- a/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt +++ b/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt @@ -48,7 +48,7 @@ public abstract class AnnotationProcessorWrapper( val KAPT_ANNOTATION_OPTION = "kapt.annotations" } - private val processor: Processor by Delegates.lazy { + private val processor: Processor by lazy { try { val instance = Class.forName(processorFqName).newInstance() as? Processor instance ?: throw IllegalArgumentException("Instance has a wrong type: $processorFqName") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index f47837c567d..a243c5ffcfd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -53,10 +53,10 @@ abstract class KotlinSourceSetProcessor( protected val sourceSetName: String = sourceSet.getName() protected val sourceRootDir: String = "src/${sourceSetName}/kotlin" protected val absoluteSourceRootDir: String = project.getProjectDir().getPath() + "/" + sourceRootDir - protected val kotlinSourceSet: KotlinSourceSet? by Delegates.lazy { createKotlinSourceSet() } - protected val kotlinDirSet: SourceDirectorySet? by Delegates.lazy { createKotlinDirSet() } - protected val kotlinTask: T by Delegates.lazy { createKotlinCompileTask() } - protected val kotlinTaskName: String by Delegates.lazy { kotlinTask.getName() } + protected val kotlinSourceSet: KotlinSourceSet? by lazy { createKotlinSourceSet() } + protected val kotlinDirSet: SourceDirectorySet? by lazy { createKotlinDirSet() } + protected val kotlinTask: T by lazy { createKotlinCompileTask() } + protected val kotlinTaskName: String by lazy { kotlinTask.getName() } public fun run() { if (kotlinSourceSet == null || kotlinDirSet == null) { diff --git a/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt b/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt index 7f4235f4f6a..80c17ab9a81 100644 --- a/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt +++ b/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt @@ -93,7 +93,7 @@ public abstract class AnnotationCollectorExtensionBase(val supportInheritedAnnot annotationFilters = nullableAnnotations.filterNotNull() } - private val classVisitor: ClassVisitor by Delegates.lazy { + private val classVisitor: ClassVisitor by lazy { object : ClassVisitor(Opcodes.ASM5, super.getVisitor()) { override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor? { recordAnnotation(null, RecordTypes.ANNOTATED_CLASS, desc)