From d9f9bf7564541c0130df284ff6241a1d014148d2 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Tue, 10 Apr 2018 16:16:37 +0300 Subject: [PATCH] 182: Set picocontainer version to 1.2 --- build.gradle.kts.182 | 2 +- compiler/tests-common/build.gradle.kts.182 | 44 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 compiler/tests-common/build.gradle.kts.182 diff --git a/build.gradle.kts.182 b/build.gradle.kts.182 index 721a901ba23..274f8013f5c 100644 --- a/build.gradle.kts.182 +++ b/build.gradle.kts.182 @@ -166,7 +166,7 @@ extra["IntellijCoreDependencies"] = "jdom", "jna", "log4j", - "picocontainer", + "picocontainer-1.2", "snappy-in-java-0.5.1", "streamex", "trove4j") diff --git a/compiler/tests-common/build.gradle.kts.182 b/compiler/tests-common/build.gradle.kts.182 new file mode 100644 index 00000000000..f496aae35c4 --- /dev/null +++ b/compiler/tests-common/build.gradle.kts.182 @@ -0,0 +1,44 @@ + +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: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(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(projectTests(":compiler:tests-common-jvm6")) + testCompileOnly(project(":kotlin-reflect-api")) + testCompile(commonDep("junit:junit")) + testCompile(androidDxJar()) { isTransitive = false } + testCompile(intellijCoreDep()) { includeJars("intellij-core"); isTransitive = false } + testCompile(intellijDep()) { + includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer-1.2", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject) + isTransitive = false + } +} + +sourceSets { + "main" { } + "test" { projectDefault() } +} + +testsJar {}