From cc709a2ef943224799b456a9e7b5f96953b0003e Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 4 Jun 2020 18:04:39 +0300
Subject: [PATCH] 202: Update dependencies

---
 build.gradle.kts                        | 5 ++++-
 buildSrc/build.gradle.kts               | 2 +-
 compiler/android-tests/build.gradle.kts | 8 +++++++-
 gradle/versions.properties.202          | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 808a42f9044..9b152bcb710 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -200,7 +200,10 @@ extra["intellijSeparateSdks"] = intellijSeparateSdks
 
 extra["IntellijCoreDependencies"] =
     listOf(
-        "asm-all-7.0.1",
+        when {
+            Platform[202].orHigher() -> "asm-all-8.0.1"
+            else -> "asm-all-7.0.1"
+        },
         "guava",
         "jdom",
         "jna",
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 0ce5455f173..3ac41f7b00b 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -105,7 +105,7 @@ dependencies {
 
     implementation("com.github.jengelman.gradle.plugins:shadow:${rootProject.extra["versions.shadow"]}")
     implementation("net.sf.proguard:proguard-gradle:6.2.2")
-    implementation("org.jetbrains.intellij.deps:asm-all:7.0.1")
+    implementation("org.jetbrains.intellij.deps:asm-all:8.0.1")
 
     implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.5")
 }
diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index 467e4bc3601..4a948ac802f 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -29,7 +29,13 @@ dependencies {
         testCompile(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
     }
 
-    testCompile(intellijDep()) { includeJars("util", "idea", "idea_rt", "groovy-all", rootProject = rootProject) }
+    testCompile(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) }
+    Platform[202].orHigher {
+        testCompile(intellijDep()) { includeJars("groovy", rootProject = rootProject) }
+    }
+    Platform[201].orLower {
+        testCompile(intellijDep()) { includeJars("groovy-all", rootProject = rootProject) }
+    }
     Platform[192].orHigher {
         testCompile(intellijPluginDep("java")) { includeJars("jps-builders") }
     }
diff --git a/gradle/versions.properties.202 b/gradle/versions.properties.202
index 724b60a79dc..7b464ab8092 100644
--- a/gradle/versions.properties.202
+++ b/gradle/versions.properties.202
@@ -1,9 +1,9 @@
 versions.intellijSdk=202.5103-EAP-CANDIDATE-SNAPSHOT
 versions.androidBuildTools=r23.0.1
 versions.idea.NodeJS=193.6494.7
-versions.jar.asm-all=7.0.1
+versions.jar.asm-all=8.0.1
 versions.jar.guava=29.0-jre
-versions.jar.groovy-all=2.4.17
+versions.jar.groovy=2.5.11
 versions.jar.lombok-ast=0.2.3
 versions.jar.swingx-core=1.6.2-2
 versions.jar.kxml2=2.3.0