From 28689f631caa3ed6a6092d4bad1dceafe31cb019 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 7 Nov 2017 09:54:36 +0100 Subject: [PATCH] Convert instrumentation --- buildSrc/src/main/kotlin/instrument.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/instrument.kt b/buildSrc/src/main/kotlin/instrument.kt index 13c4b2473df..439e2aba16f 100644 --- a/buildSrc/src/main/kotlin/instrument.kt +++ b/buildSrc/src/main/kotlin/instrument.kt @@ -104,7 +104,7 @@ open class IntelliJInstrumentCodeTask : ConventionTask() { output?.deleteRecursively() copyOriginalClasses() - val classpath = project.ideaSdkDeps("javac2.jar", "jdom.jar", "asm-all.jar", "jgoodies-forms.jar") + val classpath = project.intellij { include("javac2.jar", "jdom.jar", "asm-all.jar", "jgoodies-forms.jar") } ant.withGroovyBuilder { "taskdef"("name" to "instrumentIdeaExtensions", @@ -114,7 +114,7 @@ open class IntelliJInstrumentCodeTask : ConventionTask() { } logger.info("Compiling forms and instrumenting code with nullability preconditions") - val instrumentNotNull = prepareNotNullInstrumenting(classpath) + val instrumentNotNull = prepareNotNullInstrumenting(classpath.asPath) instrumentCode(sourceDirs, instrumentNotNull) } @@ -125,10 +125,10 @@ open class IntelliJInstrumentCodeTask : ConventionTask() { } } - private fun prepareNotNullInstrumenting(classpath: ConfigurableFileCollection): Boolean { + private fun prepareNotNullInstrumenting(classpath: String): Boolean { ant.withGroovyBuilder { "typedef"("name" to "skip", - "classpath" to classpath.asPath, + "classpath" to classpath, "loaderref" to LOADER_REF, "classname" to FILTER_ANNOTATION_REGEXP_CLASS) }