Build: Rename commonDep -> commonDependency

libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts

@@ -25,13 +25,13 @@ dependencies {
     testApi(project(":kotlin-daemon-client"))
     testApi(project(":kotlin-daemon-embeddable"))
     testApi(project(":kotlin-compiler-embeddable"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
     testRuntimeOnly(project(":kotlin-reflect"))
     compilerClasspath(project(":kotlin-reflect"))
     compilerClasspath(kotlinStdlib())
-    compilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j"))
-    compilerClasspath(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    compilerClasspath(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
+    compilerClasspath(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
     compilerClasspath(project(":kotlin-compiler-embeddable"))
     compilerClasspath(project(":kotlin-scripting-compiler-embeddable"))
     compilerClasspath(project(":kotlin-scripting-compiler-impl-embeddable"))

libraries/examples/kotlin-jsr223-local-example/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     api(project(":kotlin-script-util"))
     runtimeOnly(project(":kotlin-scripting-compiler-embeddable"))
     testApi(project(":kotlin-test:kotlin-test-junit"))
-    testApi(commonDep("junit:junit"))
+    testApi(commonDependency("junit:junit"))
     testRuntimeOnly(project(":kotlin-reflect"))
     compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build)
     testCompileOnly(project(":core:util.runtime")) // TODO: fix import (workaround for jps build)

libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     testRuntimeOnly(project(":kotlin-scripting-jvm-host"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
 }
 
 sourceSets {

libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":kotlin-scripting-compiler"))
 
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
 }
 
 sourceSets {

libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     api(project(":kotlin-scripting-jvm"))
     api(project(":kotlin-scripting-dependencies"))
     api(project(":kotlin-scripting-dependencies-maven"))
-    api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
 }
 
 sourceSets {

libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntimeOnly(project(":kotlin-scripting-compiler"))
     testRuntimeOnly(project(":kotlin-reflect"))
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
 }
 
 sourceSets {

libraries/kotlinx-metadata/jvm/build.gradle.kts

@@ -41,7 +41,7 @@ dependencies {
     shadows(project(":core:metadata.jvm"))
     shadows(protobufLite())
     testImplementation(project(":kotlin-test:kotlin-test-junit"))
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
     testImplementation(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
     testCompileOnly(project(":kotlin-reflect-api"))
     testRuntimeOnly(project(":kotlin-reflect"))

libraries/scripting/common/build.gradle.kts

@@ -8,7 +8,7 @@ project.updateJvmTarget("1.6")
 dependencies {
     api(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
 }
 
 sourceSets {

libraries/scripting/dependencies-maven/build.gradle.kts

@@ -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 {

libraries/scripting/dependencies/build.gradle.kts

@@ -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 {

libraries/scripting/js-test/build.gradle.kts

@@ -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"))

libraries/scripting/jsr223-test/build.gradle.kts

@@ -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)

libraries/scripting/jvm-host-test/build.gradle.kts

@@ -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"))

libraries/scripting/jvm-host/build.gradle.kts

@@ -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 {

libraries/scripting/jvm/build.gradle.kts

@@ -9,7 +9,7 @@ dependencies {
     api(project(":kotlin-script-runtime"))
     api(kotlinStdlib())
     api(project(":kotlin-scripting-common"))
-    testApi(commonDep("junit"))
+    testApi(commonDependency("junit"))
 }
 
 sourceSets {

libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 dependencies {
     testImplementation(project(":kotlin-test:kotlin-test-junit"))
-    testImplementation(commonDep("junit:junit"))
+    testImplementation(commonDependency("junit:junit"))
 }
 
 sourceSets {

libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts

@@ -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())

libraries/tools/kotlin-gradle-plugin/build.gradle.kts

@@ -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"))

libraries/tools/kotlin-gradle-statistics/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 dependencies {
     testImplementation(project(":kotlin-test:kotlin-test-junit"))
-    testImplementation(commonDep("junit"))
+    testImplementation(commonDependency("junit"))
 }
 
 sourceSets {

libraries/tools/kotlin-main-kts-test/build.gradle.kts

@@ -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"))
 }

libraries/tools/kotlin-main-kts/build.gradle.kts

@@ -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))

libraries/tools/kotlin-noarg/build.gradle

@@ -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 }
 }

libraries/tools/kotlin-sam-with-receiver/build.gradle

@@ -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 }
 }

libraries/tools/kotlin-script-util/build.gradle.kts

@@ -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"))
     }
 }
 

libraries/tools/kotlinp/build.gradle.kts

@@ -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"))