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/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)
}