Build: Rename commonDep -> commonDependency
This commit is contained in:
committed by
teamcity
parent
156ecce961
commit
bc2f0936bd
@@ -8,7 +8,7 @@ project.updateJvmTarget("1.6")
|
||||
dependencies {
|
||||
api(kotlinStdlib())
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
testApi(commonDep("junit"))
|
||||
testApi(commonDependency("junit"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -30,10 +30,10 @@ dependencies {
|
||||
implementation("org.apache.maven:maven-core:3.8.1")
|
||||
implementation("org.apache.maven.wagon:wagon-http:3.4.3")
|
||||
testImplementation(projectTests(":kotlin-scripting-dependencies"))
|
||||
testImplementation(commonDep("junit"))
|
||||
testImplementation(commonDependency("junit"))
|
||||
testRuntimeOnly("org.slf4j:slf4j-nop:1.7.30")
|
||||
testImplementation(kotlin("reflect"))
|
||||
testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -8,8 +8,8 @@ project.updateJvmTarget("1.6")
|
||||
dependencies {
|
||||
api(kotlinStdlib())
|
||||
api(project(":kotlin-scripting-common"))
|
||||
testApi(commonDep("junit"))
|
||||
testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||
testApi(commonDependency("junit"))
|
||||
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -5,7 +5,7 @@ plugins {
|
||||
val embeddableTestRuntime by configurations.creating
|
||||
|
||||
dependencies {
|
||||
testApi(commonDep("junit"))
|
||||
testApi(commonDependency("junit"))
|
||||
|
||||
testApi(project(":kotlin-scripting-js"))
|
||||
testApi(project(":compiler:plugin-api"))
|
||||
|
||||
@@ -17,7 +17,7 @@ val testJsr223Runtime by configurations.creating {
|
||||
val testCompilationClasspath by configurations.creating
|
||||
|
||||
dependencies {
|
||||
testApi(commonDep("junit"))
|
||||
testApi(commonDependency("junit"))
|
||||
testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||
testCompileOnly(project(":compiler:cli"))
|
||||
testCompileOnly(project(":core:util.runtime"))
|
||||
@@ -29,7 +29,7 @@ dependencies {
|
||||
testRuntimeOnly(project(":kotlin-compiler"))
|
||||
testRuntimeOnly(project(":kotlin-reflect"))
|
||||
|
||||
embeddableTestRuntime(commonDep("junit"))
|
||||
embeddableTestRuntime(commonDependency("junit"))
|
||||
embeddableTestRuntime(project(":kotlin-scripting-jsr223"))
|
||||
embeddableTestRuntime(project(":kotlin-scripting-compiler-embeddable"))
|
||||
embeddableTestRuntime(testSourceSet.output)
|
||||
|
||||
@@ -11,18 +11,18 @@ val embeddableTestRuntime by configurations.creating {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
allTestsRuntime(commonDep("junit"))
|
||||
allTestsRuntime(commonDependency("junit"))
|
||||
allTestsRuntime(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") }
|
||||
testApi(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||
testApi(projectTests(":compiler:tests-common"))
|
||||
testApi(project(":kotlin-scripting-compiler"))
|
||||
testApi(project(":daemon-common")) // TODO: fix import (workaround for jps build)
|
||||
testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||
|
||||
testRuntimeOnly(project(":kotlin-compiler"))
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
|
||||
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||
|
||||
embeddableTestRuntime(project(":kotlin-scripting-jvm-host"))
|
||||
embeddableTestRuntime(project(":kotlin-test:kotlin-test-jvm"))
|
||||
|
||||
@@ -18,7 +18,7 @@ dependencies {
|
||||
publishedRuntime(project(":kotlin-compiler"))
|
||||
publishedRuntime(project(":kotlin-scripting-compiler"))
|
||||
publishedRuntime(project(":kotlin-reflect"))
|
||||
publishedRuntime(commonDep("org.jetbrains.intellij.deps", "trove4j"))
|
||||
publishedRuntime(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -9,7 +9,7 @@ dependencies {
|
||||
api(project(":kotlin-script-runtime"))
|
||||
api(kotlinStdlib())
|
||||
api(project(":kotlin-scripting-common"))
|
||||
testApi(commonDep("junit"))
|
||||
testApi(commonDependency("junit"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
Reference in New Issue
Block a user