From 294ba51d0b214c200e4e4a5e5fb234cad16e1ecb Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Tue, 29 Jan 2019 19:34:46 +0300 Subject: [PATCH] Build: Drop obsolete dependency handlers --- buildSrc/src/main/kotlin/dependencies.kt | 3 --- ultimate/build.gradle.kts | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt index a4c2d9d2b0d..d047f7c3ab8 100644 --- a/buildSrc/src/main/kotlin/dependencies.kt +++ b/buildSrc/src/main/kotlin/dependencies.kt @@ -67,12 +67,9 @@ fun Project.kotlinStdlib(suffix: String? = null): Any { dependencies.project(listOfNotNull(":kotlin-stdlib", suffix).joinToString("-")) } -@Deprecated("Depend on the default configuration instead", ReplaceWith("project(name)")) -fun DependencyHandler.projectDist(name: String): ProjectDependency = project(name) fun DependencyHandler.projectTests(name: String): ProjectDependency = project(name, configuration = "tests-jar") fun DependencyHandler.projectRuntimeJar(name: String): ProjectDependency = project(name, configuration = "runtimeJar") fun DependencyHandler.projectArchives(name: String): ProjectDependency = project(name, configuration = "archives") -fun DependencyHandler.projectClasses(name: String): ProjectDependency = project(name, configuration = "classes-dirs") val Project.protobufVersion: String get() = findProperty("versions.protobuf") as String diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index 66cdd8a09ce..e62db98d505 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { compile(project(":compiler:frontend.java")) { isTransitive = false } compile(project(":compiler:util")) { isTransitive = false } compile(project(":js:js.frontend")) { isTransitive = false } - compile(projectClasses(":idea")) + compile(project(":idea")) { isTransitive = false } compile(project(":idea:idea-jvm")) { isTransitive = false } compile(project(":idea:idea-core")) { isTransitive = false } compile(project(":idea:ide-common")) { isTransitive = false }