From ab5e07f8e4ba8b6eee86dc95775bc68e6152aa54 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 17 Oct 2018 13:14:26 +0300
Subject: [PATCH] 191: asm-all has 7.0-beta version in Intellij 191

Pass project to fetch extra parameters for asm-all work

Original commit: 17421ed14db5390584a57cec0a9730f640cca0a9
---
 jps/jps-plugin/build.gradle.kts      | 4 +++-
 jps/jps-plugin/build.gradle.kts.173  | 4 +++-
 jps/jps-plugin/build.gradle.kts.as31 | 4 +++-
 jps/jps-plugin/build.gradle.kts.as32 | 4 +++-
 jps/jps-plugin/build.gradle.kts.as33 | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts
index 2654e7caeda..0a01af7b5cb 100644
--- a/jps/jps-plugin/build.gradle.kts
+++ b/jps/jps-plugin/build.gradle.kts
@@ -17,7 +17,9 @@ dependencies {
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
     compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
-    compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all") }
+    compileOnly(intellijDep()) {
+        includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject)
+    }
     compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompile(project(":compiler:incremental-compilation-impl"))
diff --git a/jps/jps-plugin/build.gradle.kts.173 b/jps/jps-plugin/build.gradle.kts.173
index ac16e33fd46..d82dceb0827 100644
--- a/jps/jps-plugin/build.gradle.kts.173
+++ b/jps/jps-plugin/build.gradle.kts.173
@@ -17,7 +17,9 @@ dependencies {
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
     compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
-    compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all") }
+    compileOnly(intellijDep()) {
+        includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject)
+    }
     compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompile(project(":compiler:incremental-compilation-impl"))
diff --git a/jps/jps-plugin/build.gradle.kts.as31 b/jps/jps-plugin/build.gradle.kts.as31
index 83d759b136e..198f9eec55b 100644
--- a/jps/jps-plugin/build.gradle.kts.as31
+++ b/jps/jps-plugin/build.gradle.kts.as31
@@ -17,7 +17,9 @@ dependencies {
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
     compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
-    compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all") }
+    compileOnly(intellijDep()) {
+        includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject)
+    }
     compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompile(project(":compiler:incremental-compilation-impl"))
diff --git a/jps/jps-plugin/build.gradle.kts.as32 b/jps/jps-plugin/build.gradle.kts.as32
index 38faa941b7a..1405495bbaa 100644
--- a/jps/jps-plugin/build.gradle.kts.as32
+++ b/jps/jps-plugin/build.gradle.kts.as32
@@ -17,7 +17,9 @@ dependencies {
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
     compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
-    compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all") }
+    compileOnly(intellijDep()) {
+        includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject)
+    }
     compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompile(project(":compiler:incremental-compilation-impl"))
diff --git a/jps/jps-plugin/build.gradle.kts.as33 b/jps/jps-plugin/build.gradle.kts.as33
index 80d8526dd9b..c8cfa68a943 100644
--- a/jps/jps-plugin/build.gradle.kts.as33
+++ b/jps/jps-plugin/build.gradle.kts.as33
@@ -17,7 +17,9 @@ dependencies {
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
     compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
-    compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all") }
+    compileOnly(intellijDep()) {
+        includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject)
+    }
     compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompile(project(":compiler:incremental-compilation-impl"))