Build: Rename commonDep -> commonDependency
This commit is contained in:
committed by
teamcity
parent
156ecce961
commit
bc2f0936bd
@@ -7,7 +7,7 @@ plugins {
|
||||
|
||||
dependencies {
|
||||
testImplementation(project(":kotlin-test:kotlin-test-junit"))
|
||||
testImplementation(commonDep("junit:junit"))
|
||||
testImplementation(commonDependency("junit:junit"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -39,7 +39,7 @@ dependencies {
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testImplementation(project(":kotlin-android-extensions"))
|
||||
testImplementation(project(":kotlin-parcelize-compiler"))
|
||||
testImplementation(commonDep("org.jetbrains.intellij.deps", "trove4j"))
|
||||
testImplementation(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||
|
||||
testImplementation(gradleApi())
|
||||
testImplementation(gradleTestKit())
|
||||
|
||||
@@ -100,7 +100,7 @@ dependencies {
|
||||
testImplementation(project(":kotlin-android-extensions"))
|
||||
testImplementation(project(":kotlin-compiler-runner"))
|
||||
testImplementation(project(":kotlin-test::kotlin-test-junit"))
|
||||
testImplementation(commonDep("junit:junit"))
|
||||
testImplementation(commonDependency("junit:junit"))
|
||||
testImplementation(project(":kotlin-gradle-statistics"))
|
||||
testCompileOnly(project(":kotlin-reflect-api"))
|
||||
testCompileOnly(project(":kotlin-annotation-processing"))
|
||||
|
||||
@@ -7,7 +7,7 @@ plugins {
|
||||
|
||||
dependencies {
|
||||
testImplementation(project(":kotlin-test:kotlin-test-junit"))
|
||||
testImplementation(commonDep("junit"))
|
||||
testImplementation(commonDependency("junit"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -10,7 +10,7 @@ dependencies {
|
||||
testCompileOnly(project(":compiler:cli"))
|
||||
testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||
testApi(kotlinStdlib("jdk8"))
|
||||
testApi(commonDep("junit"))
|
||||
testApi(commonDependency("junit"))
|
||||
testApi(projectTests(":kotlin-scripting-compiler")) { isTransitive = false }
|
||||
testImplementation(project(":kotlin-compiler-embeddable"))
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ dependencies {
|
||||
embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false }
|
||||
embedded(project(":kotlin-scripting-dependencies-maven-all"))
|
||||
embedded("org.slf4j:slf4j-nop:1.7.30")
|
||||
embedded(commonDep("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm")) {
|
||||
embedded(commonDependency("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm")) {
|
||||
isTransitive = false
|
||||
attributes {
|
||||
attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
|
||||
|
||||
@@ -15,7 +15,7 @@ dependencies {
|
||||
compileOnly project(':kotlin-noarg-compiler-plugin')
|
||||
|
||||
testApi gradleApi()
|
||||
testApi(DependenciesKt.commonDep(project, "junit"))
|
||||
testApi(DependenciesKt.commonDependency(project, "junit"))
|
||||
|
||||
embedded(project(":kotlin-noarg-compiler-plugin")) { transitive = false }
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ dependencies {
|
||||
compileOnly project(':kotlin-sam-with-receiver-compiler-plugin')
|
||||
|
||||
testApi gradleApi()
|
||||
testApi DependenciesKt.commonDep(project, "junit")
|
||||
testApi DependenciesKt.commonDependency(project, "junit")
|
||||
|
||||
embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { transitive = false }
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ dependencies {
|
||||
api(kotlinStdlib())
|
||||
api(project(":kotlin-script-runtime"))
|
||||
api(project(":kotlin-scripting-jvm"))
|
||||
api(commonDep("org.jetbrains.intellij.deps", "trove4j"))
|
||||
api(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||
compileOnly(project(":compiler:cli"))
|
||||
compileOnly(project(":daemon-common"))
|
||||
compileOnly(project(":kotlin-scripting-compiler"))
|
||||
@@ -21,7 +21,7 @@ dependencies {
|
||||
testCompileOnly(project(":compiler:cli"))
|
||||
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testApi(commonDep("junit:junit"))
|
||||
testApi(commonDependency("junit:junit"))
|
||||
testApi(project(":kotlin-scripting-compiler"))
|
||||
testRuntimeOnly(project(":kotlin-compiler"))
|
||||
testImplementation("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
|
||||
@@ -34,7 +34,7 @@ dependencies {
|
||||
|
||||
configurations.all {
|
||||
resolutionStrategy {
|
||||
force(commonDep("junit:junit"))
|
||||
force(commonDependency("junit:junit"))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ dependencies {
|
||||
|
||||
testCompileOnly(project(":kotlinx-metadata"))
|
||||
testCompileOnly(project(":kotlinx-metadata-jvm"))
|
||||
testImplementation(commonDep("junit:junit"))
|
||||
testImplementation(commonDependency("junit:junit"))
|
||||
testImplementation(projectTests(":compiler:tests-common"))
|
||||
testImplementation(projectTests(":generators:test-generator"))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user