Build: Rename commonDep -> commonDependency

This commit is contained in:
Vyacheslav Gerasimov
2021-12-09 01:40:15 +03:00
committed by teamcity
parent 156ecce961
commit bc2f0936bd
90 changed files with 149 additions and 150 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies {
testApi(project(":compiler:backend"))
testApi(project(":compiler:cli"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApi(intellijCoreDep()) { includeJars("intellij-core") }
}
@@ -32,12 +32,12 @@ dependencies {
testApi(project(":kotlin-android-extensions-runtime"))
testApi(projectTests(":compiler:tests-common"))
testApi(project(":kotlin-test:kotlin-test-jvm"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testRuntimeOnly(intellijPluginDep("junit"))
testRuntimeOnly(intellijDep())
robolectricClasspath(commonDep("org.robolectric", "robolectric"))
robolectricClasspath(commonDependency("org.robolectric", "robolectric"))
robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1")
robolectricClasspath(project(":kotlin-android-extensions-runtime")) { isTransitive = false }
@@ -31,7 +31,7 @@ dependencies {
testApi(projectTests(":idea"))
testApi(projectTests(":idea:idea-android"))
testApi(project(":kotlin-test:kotlin-test-jvm"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApi(project(":idea:idea-native")) { isTransitive = false }
testApi(project(":idea:idea-gradle-native")) { isTransitive = false }
testRuntime(project(":native:frontend.native"))
@@ -9,7 +9,7 @@ project.updateJvmTarget("1.6")
dependencies {
api(kotlinStdlib())
compileOnly(commonDep("com.google.android", "android"))
compileOnly(commonDependency("com.google.android", "android"))
}
sourceSets {
@@ -65,13 +65,13 @@ dependencies {
testImplementation(projectTests(":generators:test-generator"))
testImplementation(projectTests(":js:js.tests"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testRuntimeOnly(kotlinStdlib())
testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(project(":kotlin-preloader")) // it's required for ant tests
testRuntimeOnly(project(":compiler:backend-common"))
testRuntimeOnly(commonDep("org.fusesource.jansi", "jansi"))
testRuntimeOnly(commonDependency("org.fusesource.jansi", "jansi"))
atomicfuClasspath("org.jetbrains.kotlinx:atomicfu-js:0.16.3") { isTransitive = false }
atomicfuRuntimeForTests(project(":kotlinx-atomicfu-runtime")) { isTransitive = false }
+2 -2
View File
@@ -34,7 +34,7 @@ dependencies {
// Note that kotlinx-metadata-jvm already includes kotlinx-metadata, core:metadata, core:metadata.jvm,
// and protobuf-lite, so we only need to include kotlinx-metadata-jvm in the shadow jar.
compileOnly(project(":kotlinx-metadata"))
shadows(commonDep("org.jetbrains.kotlinx:kotlinx-metadata-jvm"))
shadows(commonDependency("org.jetbrains.kotlinx:kotlinx-metadata-jvm"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
@@ -42,7 +42,7 @@ dependencies {
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(project(":kotlin-compiler"))
testImplementation(commonDep("junit:junit"))
testImplementation(commonDependency("junit:junit"))
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(projectTests(":compiler:incremental-compilation-impl"))
}
+1 -1
View File
@@ -7,7 +7,7 @@ dependencies {
api(kotlinStdlib())
compileOnly(toolsJarApi())
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testCompileOnly(toolsJarApi())
testRuntimeOnly(toolsJar())
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
testApi(projectTests(":compiler:tests-common"))
testApi(projectTests(":compiler"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
}
sourceSets {
@@ -31,7 +31,7 @@ dependencies {
testApi(projectTests(":compiler:tests-common"))
testApi(project(":kotlin-annotation-processing-base"))
testApi(projectTests(":kotlin-annotation-processing-base"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApi(project(":kotlin-annotation-processing-runtime"))
testCompileOnly(toolsJarApi())
@@ -25,7 +25,7 @@ dependencies {
testApi(projectTests(":compiler:tests-compiler-utils"))
testApi(projectTests(":compiler:tests-common-new"))
testImplementation(projectTests(":generators:test-generator"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApiJUnit5(vintageEngine = true)
testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.2")
@@ -16,7 +16,7 @@ dependencies {
testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
testImplementation(commonDep("junit:junit"))
testImplementation(commonDependency("junit:junit"))
testImplementation(projectTests(":compiler:tests-common"))
testImplementation("org.projectlombok:lombok:1.18.16")
+1 -1
View File
@@ -20,7 +20,7 @@ dependencies {
testApi(project(":compiler:backend"))
testApi(project(":compiler:cli"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApi(intellijCoreDep()) { includeJars("intellij-core")}
}
@@ -60,11 +60,11 @@ dependencies {
testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(project(":core:descriptors.runtime"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testRuntimeOnly(intellijPluginDep("junit"))
robolectricClasspath(commonDep("org.robolectric", "robolectric"))
robolectricClasspath(commonDependency("org.robolectric", "robolectric"))
robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1")
robolectricClasspath(project(":plugins:parcelize:parcelize-runtime")) { isTransitive = false }
robolectricClasspath(project(":kotlin-android-extensions-runtime")) { isTransitive = false }
@@ -10,7 +10,7 @@ project.updateJvmTarget("1.6")
dependencies {
api(kotlinStdlib())
api(project(":kotlin-android-extensions-runtime"))
compileOnly(commonDep("com.google.android", "android"))
compileOnly(commonDependency("com.google.android", "android"))
}
sourceSets {
@@ -24,7 +24,7 @@ dependencies {
}
testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
testRuntimeOnly(platform(commonDep("org.junit:junit-bom")))
testRuntimeOnly(platform(commonDependency("org.junit:junit-bom")))
testRuntimeOnly("org.junit.jupiter:junit-jupiter")
if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
@@ -15,7 +15,7 @@ dependencies {
testApi(project(":compiler:backend"))
testApi(project(":compiler:cli"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testCompileOnly(project(":kotlin-compiler"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testApi(project(":kotlin-scripting-jvm-host-unshaded"))
@@ -32,7 +32,7 @@ dependencies {
testApi(project(":compiler:cli-common"))
testApi(project(":compiler:frontend.java"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
}
sourceSets {
@@ -32,12 +32,11 @@ dependencies {
testApi(project(":compiler:frontend.java"))
testApi(project(":compiler:backend.js"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
testRuntimeOnly(intellijDep()) { includeJars("jps-model", "jna") }
testImplementation(project(":kotlin-reflect"))
}
@@ -19,18 +19,18 @@ val embeddableTestRuntime by configurations.creating {
}
dependencies {
allTestsRuntime(commonDep("junit"))
allTestsRuntime(commonDependency("junit"))
testApi(kotlinStdlib("jdk8"))
testApi(project(":kotlin-scripting-ide-services-unshaded"))
testApi(project(":kotlin-scripting-compiler"))
testApi(project(":kotlin-scripting-dependencies-maven"))
testApi(project(":compiler:cli"))
testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
testImplementation(project(":kotlin-reflect"))
testRuntimeOnly(project(":kotlin-compiler"))
testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
testRuntimeOnly(project(":kotlin-scripting-ide-common")) { isTransitive = false }
embeddableTestRuntime(project(":kotlin-scripting-ide-services"))
@@ -39,8 +39,8 @@ dependencies {
embeddableTestRuntime(project(":kotlin-scripting-dependencies-maven-all"))
embeddableTestRuntime(kotlinStdlib("jdk8"))
embeddableTestRuntime(testSourceSet.output)
embeddableTestRuntime(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
embeddableTestRuntime(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
embeddableTestRuntime(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
embeddableTestRuntime(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
}
sourceSets {
@@ -23,7 +23,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 {