From aa8031691e526c4775e52f11b363a68b7de7ecb7 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Tue, 6 Nov 2018 20:57:35 +0300
Subject: [PATCH] Fix picocontainer version

---
 .../tree/visitors-generator/build.gradle.kts  |  2 +-
 compiler/tests-common/build.gradle.kts        |  2 +-
 compiler/tests-common/build.gradle.kts.181    | 48 -------------------
 3 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 compiler/tests-common/build.gradle.kts.181

diff --git a/compiler/fir/tree/visitors-generator/build.gradle.kts b/compiler/fir/tree/visitors-generator/build.gradle.kts
index c9d0e7e7883..616e18b370a 100644
--- a/compiler/fir/tree/visitors-generator/build.gradle.kts
+++ b/compiler/fir/tree/visitors-generator/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
 
     compile(intellijCoreDep()) { includeJars("intellij-core") }
     compile(intellijDep()) {
-        includeJars("trove4j", "picocontainer-1.2", "annotations", rootProject = rootProject)
+        includeJars("trove4j", "picocontainer", "annotations", rootProject = rootProject)
         isTransitive = false
     }
     compile(intellijDep()) { includeJars("guava", rootProject = rootProject) }
diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index bd6b0dc99bf..23ca6111713 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
     testCompile(androidDxJar()) { isTransitive = false }
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testCompile(intellijDep()) {
-        includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer-1.2", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject)
+        includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject)
         isTransitive = false
     }
 }
diff --git a/compiler/tests-common/build.gradle.kts.181 b/compiler/tests-common/build.gradle.kts.181
deleted file mode 100644
index 23ca6111713..00000000000
--- a/compiler/tests-common/build.gradle.kts.181
+++ /dev/null
@@ -1,48 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-dependencies {
-    testCompile(project(":core:descriptors"))
-    testCompile(project(":core:descriptors.jvm"))
-    testCompile(project(":core:deserialization"))
-    testCompile(project(":compiler:util"))
-    testCompile(project(":compiler:backend"))
-    testCompile(project(":compiler:fir:tree"))
-    testCompile(project(":compiler:fir:psi2fir"))
-    testCompile(project(":compiler:fir:cones"))
-    testCompile(project(":compiler:fir:resolve"))
-    testCompile(project(":compiler:ir.ir2cfg"))
-    testCompile(project(":compiler:frontend"))
-    testCompile(project(":compiler:frontend.java"))
-    testCompile(project(":compiler:util"))
-    testCompile(project(":compiler:cli-common"))
-    testCompile(project(":compiler:cli"))
-    testCompile(project(":compiler:light-classes"))
-    testCompile(project(":compiler:serialization"))
-    testCompile(project(":kotlin-preloader"))
-    testCompile(project(":compiler:daemon-common"))
-    testCompile(project(":js:js.serializer"))
-    testCompile(project(":js:js.frontend"))
-    testCompile(project(":js:js.translator"))
-    testCompileOnly(project(":plugins:android-extensions-compiler"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(projectTests(":compiler:tests-common-jvm6"))
-    testCompileOnly(project(":kotlin-reflect-api"))
-    testCompile(commonDep("junit:junit"))
-    testCompile(androidDxJar()) { isTransitive = false }
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testCompile(intellijDep()) {
-        includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject)
-        isTransitive = false
-    }
-}
-
-sourceSets {
-    "main" { }
-    "test" { projectDefault() }
-}
-
-testsJar {}