azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Rename commonDep -> commonDependency

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/build.gradle.kts
+3 -3
View File
@@ -18,13 +18,13 @@ dependencies {
testApi(kotlinStdlib())
testApi(project(":kotlin-reflect"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApi(projectTests(":compiler:test-infrastructure"))
testApi(projectTests(":compiler:test-infrastructure-utils"))
testApi(projectTests(":compiler:tests-compiler-utils"))
testApi(projectTests(":compiler:tests-common-new"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApi(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) }
testApi(intellijDep()) { includeJars("groovy", rootProject = rootProject) }
@@ -36,7 +36,7 @@ dependencies {
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijDep()) { includeJars("jna", rootProject = rootProject) }
testApi("org.junit.platform:junit-platform-launcher:${commonVer("org.junit.platform", "")}")
testApi("org.junit.platform:junit-platform-launcher:${commonDependencyVersion("org.junit.platform", "")}")
}
sourceSets {
compiler/build.gradle.kts
+2 -2
View File
@@ -19,7 +19,7 @@ dependencies {
testApi(kotlinStdlib())
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
testApi(projectTests(":compiler:tests-common"))
@@ -52,7 +52,7 @@ dependencies {
testImplementation(project(":kotlin-reflect"))
testImplementation(toolsJar())
antLauncherJar(commonDep("org.apache.ant", "ant"))
antLauncherJar(commonDependency("org.apache.ant", "ant"))
antLauncherJar(toolsJar())
}
compiler/cli/build.gradle.kts
+3 -3
View File
@@ -20,8 +20,8 @@ dependencies {
api(project(":compiler:javac-wrapper"))
api(project(":js:js.translator"))
api(project(":native:frontend.native"))
api(commonDep("org.fusesource.jansi", "jansi"))
api(commonDep("org.jline", "jline"))
api(commonDependency("org.fusesource.jansi", "jansi"))
api(commonDependency("org.jline", "jline"))
api(project(":compiler:fir:raw-fir:psi2fir"))
api(project(":compiler:fir:resolve"))
api(project(":compiler:fir:providers"))
@@ -45,7 +45,7 @@ dependencies {
testApi(project(":compiler:backend"))
testApi(project(":compiler:cli"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
}
sourceSets {
compiler/compiler-runner-unshaded/build.gradle.kts
+1 -1
View File
@@ -8,7 +8,7 @@ plugins {
dependencies {
api(project(":kotlin-build-common"))
api(project(":kotlin-daemon-client"))
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
compileOnly(project(":compiler:cli-common"))
compileOnly(project(":kotlin-preloader"))
compiler/compiler-runner/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
api(project(":kotlin-build-common"))
api(project(":kotlin-daemon-client"))
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
runtimeOnly(project(":kotlin-compiler-embeddable"))
}
compiler/container/build.gradle.kts
+2 -2
View File
@@ -5,14 +5,14 @@ plugins {
dependencies {
api(project(":core:util.runtime"))
api(commonDep("javax.inject"))
api(commonDependency("javax.inject"))
compileOnly(kotlinStdlib())
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testApi(kotlinStdlib())
testCompileOnly("org.jetbrains:annotations:13.0")
testApi(project(":kotlin-test:kotlin-test-jvm"))
testApi(project(":kotlin-test:kotlin-test-junit"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijDep()) { includeJars("trove4j", "util") }
}
compiler/daemon/build.gradle.kts
+3 -3
View File
@@ -8,8 +8,8 @@ plugins {
val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra
dependencies {
api(commonDep("org.fusesource.jansi", "jansi"))
api(commonDep("org.jline", "jline"))
api(commonDependency("org.fusesource.jansi", "jansi"))
api(commonDependency("org.jline", "jline"))
compileOnly(project(":compiler:cli"))
compileOnly(project(":compiler:cli-js"))
@@ -22,7 +22,7 @@ dependencies {
runtimeOnly(project(":kotlin-reflect"))
embedded(project(":daemon-common")) { isTransitive = false }
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
isTransitive = false
}
}
compiler/daemon/daemon-client-new/build.gradle.kts
+5 -5
View File
@@ -28,19 +28,19 @@ dependencies {
compileOnly(project(":kotlin-daemon-client"))
compileOnly(project(":js:js.frontend"))
compileOnly(project(":daemon-common")) { isTransitive = false }
compileOnly(commonDep("net.rubygrapefruit", "native-platform"))
compileOnly(commonDependency("net.rubygrapefruit", "native-platform"))
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
embedded(project(":kotlin-daemon-client")) { isTransitive = false }
embedded(project(":daemon-common")) { isTransitive = false }
embedded(commonDep("net.rubygrapefruit", "native-platform"))
embedded(commonDependency("net.rubygrapefruit", "native-platform"))
nativePlatformVariants.forEach {
embedded(commonDep("net.rubygrapefruit", "native-platform", "-$it"))
embedded(commonDependency("net.rubygrapefruit", "native-platform", "-$it"))
}
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
isTransitive = false
}
api(commonDep("io.ktor", "ktor-network")) {
api(commonDependency("io.ktor", "ktor-network")) {
ktorExcludesForDaemon.forEach { (group, module) ->
exclude(group = group, module = module)
}
compiler/daemon/daemon-client/build.gradle.kts
+4 -4
View File
@@ -24,16 +24,16 @@ dependencies {
compileOnly(project(":daemon-common"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":js:js.frontend"))
compileOnly(commonDep("net.rubygrapefruit", "native-platform"))
compileOnly(commonDependency("net.rubygrapefruit", "native-platform"))
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
embedded(project(":daemon-common")) { isTransitive = false }
embedded(commonDep("net.rubygrapefruit", "native-platform"))
embedded(commonDependency("net.rubygrapefruit", "native-platform"))
nativePlatformVariants.forEach {
embedded(commonDep("net.rubygrapefruit", "native-platform", "-$it"))
embedded(commonDependency("net.rubygrapefruit", "native-platform", "-$it"))
}
runtimeOnly(project(":kotlin-reflect"))
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
isTransitive = false
}
}
compiler/daemon/daemon-common-new/build.gradle.kts
+2 -2
View File
@@ -11,10 +11,10 @@ dependencies {
api(kotlinStdlib())
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
isTransitive = false
}
api(commonDep("io.ktor", "ktor-network")) {
api(commonDependency("io.ktor", "ktor-network")) {
ktorExcludesForDaemon.forEach { (group, module) ->
exclude(group = group, module = module)
}
compiler/daemon/daemon-common/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
compileOnly(project(":js:js.config"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
isTransitive = false
}
}
compiler/daemon/daemon-tests/build.gradle.kts
+3 -3
View File
@@ -11,15 +11,15 @@ val ktorExcludesForDaemon: List<Pair<String, String>> by rootProject.extra
dependencies {
testApi(project(":kotlin-test:kotlin-test-jvm"))
testApi(kotlinStdlib())
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
testApi(project(":kotlin-daemon-client"))
testApi(project(":kotlin-daemon-client-new"))
testCompileOnly(project(":kotlin-daemon"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
testApi(commonDep("io.ktor", "ktor-network")) {
testApi(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
testApi(commonDependency("io.ktor", "ktor-network")) {
ktorExcludesForDaemon.forEach { (group, module) ->
exclude(group = group, module = module)
}
compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts
+1 -1
View File
@@ -13,7 +13,7 @@ plugins {
dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
testApi(projectTests(":compiler:tests-common"))
compiler/fir/modularized-tests/build.gradle.kts
+1 -1
View File
@@ -26,7 +26,7 @@ dependencies {
testRuntimeOnly(intellijPluginDep("java"))
testRuntimeOnly(intellijDep()) { includeJars("commons-lang-2.4") }
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
testApi(projectTests(":compiler:tests-common"))
compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
+1 -1
View File
@@ -23,7 +23,7 @@ dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
testImplementation(commonDep("junit:junit"))
testImplementation(commonDependency("junit:junit"))
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(projectTests(":compiler:fir:raw-fir:psi2fir"))
compiler/fir/raw-fir/psi2fir/build.gradle.kts
+1 -1
View File
@@ -19,7 +19,7 @@ dependencies {
testImplementation(intellijDep()) { includeJars("platform-api", rootProject = rootProject) }
testImplementation(commonDep("junit:junit"))
testImplementation(commonDependency("junit:junit"))
testImplementation(projectTests(":compiler:tests-common"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
compiler/frontend/build.gradle.kts
+1 -1
View File
@@ -15,7 +15,7 @@ dependencies {
api(project(":compiler:frontend.common"))
api(project(":compiler:frontend.common-psi"))
api(project(":kotlin-script-runtime"))
api(commonDep("io.javaslang","javaslang"))
api(commonDependency("io.javaslang","javaslang"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
}
compiler/incremental-compilation-impl/build.gradle.kts
+1 -1
View File
@@ -18,7 +18,7 @@ dependencies {
implementation("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}")
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApi(project(":kotlin-test:kotlin-test-junit"))
testApi(kotlinStdlib())
testApi(projectTests(":kotlin-build-common"))
compiler/psi/build.gradle.kts
+1 -1
View File
@@ -18,7 +18,7 @@ dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("guava", "trove4j", rootProject = rootProject) }
jflexPath(commonDep("org.jetbrains.intellij.deps.jflex", "jflex"))
jflexPath(commonDependency("org.jetbrains.intellij.deps.jflex", "jflex"))
}
sourceSets {
compiler/resolution.common.jvm/build.gradle.kts
+1 -1
View File
@@ -8,7 +8,7 @@ dependencies {
api(project(":core:compiler.common.jvm"))
api(project(":compiler:psi"))
implementation(project(":compiler:util"))
implementation(commonDep("io.javaslang","javaslang"))
implementation(commonDependency("io.javaslang","javaslang"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
}
compiler/tests-common/build.gradle.kts
+2 -2
View File
@@ -53,8 +53,8 @@ dependencies {
testApi(projectTests(":compiler:tests-common-jvm6"))
testApi(project(":kotlin-scripting-compiler-impl"))
testApi(projectTests(":compiler:test-infrastructure-utils"))
testApi(commonDep("junit:junit"))
testApi(commonDep("com.android.tools:r8"))
testApi(commonDependency("junit:junit"))
testApi(commonDependency("com.android.tools:r8"))
testCompileOnly(project(":kotlin-reflect-api"))
testCompileOnly(toolsJar())
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compiler/tests-compiler-utils/build.gradle.kts
+1 -1
View File
@@ -26,7 +26,7 @@ dependencies {
testApi(project(":compiler:backend.jvm.entrypoint"))
testApi(projectTests(":compiler:test-infrastructure-utils"))
testApi(project(":kotlin-preloader"))
testApi(commonDep("com.android.tools:r8"))
testApi(commonDependency("com.android.tools:r8"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testApi(intellijDep()) {
compiler/util-io/build.gradle.kts
+1 -1
View File
@@ -5,7 +5,7 @@ plugins {
dependencies {
implementation(kotlinStdlib())
testImplementation(commonDep("junit:junit"))
testImplementation(commonDependency("junit:junit"))
testImplementation(kotlin("test"))
}
compiler/util-klib/build.gradle.kts
+1 -1
View File
@@ -8,7 +8,7 @@ description = "Common klib reader and writer"
dependencies {
api(kotlinStdlib())
api(project(":kotlin-util-io"))
testImplementation(commonDep("junit:junit"))
testImplementation(commonDependency("junit:junit"))
}
sourceSets {