From d44a2f6fd359fd9446fb82e947685901013d760d Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Thu, 8 Jul 2021 10:43:35 +0300 Subject: [PATCH] Fix dependency on javac2.jar In 203.8084.24 this jar was moved from intellij dependencies to libraries of intellij java plugin --- gradle/javaInstrumentation.gradle.kts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gradle/javaInstrumentation.gradle.kts b/gradle/javaInstrumentation.gradle.kts index 3ade0e1a54c..e37a94d9a5c 100644 --- a/gradle/javaInstrumentation.gradle.kts +++ b/gradle/javaInstrumentation.gradle.kts @@ -20,12 +20,22 @@ fun Project.configureJavaInstrumentation() { if (plugins.hasPlugin("org.gradle.java")) { val javaInstrumentator by configurations.creating dependencies { - javaInstrumentator(intellijDep()) { - includeJars("javac2", "jdom", "asm-all", rootProject = rootProject) + Platform[202] { + javaInstrumentator(intellijDep()) { + includeJars("javac2", "jdom", "asm-all", rootProject = rootProject) + } + } + Platform[203].orHigher { + javaInstrumentator(intellijDep()) { + includeJars("jdom", "asm-all", rootProject = rootProject) + } + javaInstrumentator(intellijPluginDep("java")) { + includeJars("javac2", rootProject = rootProject) + } } } for (sourceSet in listOf(mainSourceSet, testSourceSet)) { tasks.named(sourceSet.compileJavaTaskName, InstrumentJava(javaInstrumentator, sourceSet)) } } -} \ No newline at end of file +}