From 9c71bb26b80bdd84de4200a0d4bcb2e9b6f29abf Mon Sep 17 00:00:00 2001 From: "Dmitriy.Panov" Date: Mon, 23 Apr 2018 20:20:52 +0300 Subject: [PATCH] Revert "test-discovery-plugin-base removed from gradle script, added as maven library" This reverts commit 36ef0a7 Revert "test-discovery-plugin-base removed from gradle script, added as maven library" This reverts commit 73e1887 --- .../dependencies/setupBuildScriptsDeps.gradle | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/build/dependencies/setupBuildScriptsDeps.gradle b/build/dependencies/setupBuildScriptsDeps.gradle index eb071210c7a0..80a9f3bdc011 100644 --- a/build/dependencies/setupBuildScriptsDeps.gradle +++ b/build/dependencies/setupBuildScriptsDeps.gradle @@ -1,4 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +import java.nio.file.Files +import java.nio.file.Paths + repositories { mavenCentral() if (project.ext.inJetBrainsNetwork) { @@ -6,10 +9,12 @@ repositories { } maven { url "https://jetbrains.bintray.com/intellij-third-party-dependencies" } maven { url "https://jetbrains.bintray.com/test-discovery" } + jcenter() } configurations { buildScriptsDeps + testDiscoveryDeps } List projectLibraries = [ @@ -49,6 +54,23 @@ task setupBuildScriptsDeps(dependsOn: configurations.buildScriptsDeps, type: Syn into "${project.buildDir}/build-scripts-deps" } +task setupTestDiscoveryDeps { + doFirst { + def dir = "${project.buildDir}/test-discovery-deps" + def testDiscoveryDeps = file(dir) + testDiscoveryDeps.deleteDir() + testDiscoveryDeps.mkdirs() + configurations.detachedConfiguration( + (dependencies + .create('org.jetbrains.testDiscovery:test-discovery-plugin-base:0.1.52') as ModuleDependency) + .exclude(group: 'org.codehaus.groovy', module: 'groovy-all') + ).files.each { from -> + def into = Paths.get("$dir/$from.name") + Files.copy(from.toPath(), into) + } + } +} + private Tuple2 loadProjectLibraryProperties(String libraryName) { File file = new File(project.rootDir, "../../.idea/libraries/${libraryName.replace('-', '_')}.xml") if (!file.exists()) {