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
prepare/android-extensions-compiler-gradle/build.gradle.kts
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
compileOnly(project(":compiler:backend"))
compileOnly(project(":kotlin-android-extensions-runtime"))
runtimeOnly(project(":kotlin-compiler-embeddable"))
compileOnly(commonDep("com.google.android", "android"))
compileOnly(commonDependency("com.google.android", "android"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
embedded(project(":plugins:android-extensions-compiler")) { isTransitive = false }
prepare/compiler-client-embeddable/build.gradle.kts
+2 -2
View File
@@ -23,11 +23,11 @@ dependencies {
testApi(project(":daemon-common"))
testApi(project(":daemon-common-new"))
testApi(project(":kotlin-daemon-client"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApi(project(":kotlin-test:kotlin-test-jvm"))
testApi(project(":kotlin-test:kotlin-test-junit"))
testCompilerClasspath(project(":kotlin-compiler"))
testCompilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j"))
testCompilerClasspath(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
testCompilerClasspath(project(":kotlin-scripting-compiler"))
testCompilerClasspath(project(":kotlin-daemon"))
testCompilationClasspath(kotlinStdlib())
prepare/compiler-embeddable/build.gradle.kts
+3 -3
View File
@@ -25,11 +25,11 @@ dependencies {
runtimeOnly(project(":kotlin-script-runtime"))
runtimeOnly(project(":kotlin-reflect"))
runtimeOnly(project(":kotlin-daemon-embeddable"))
runtimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
runtimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
Platform[203].orHigher {
runtimeOnly(commonDep("net.java.dev.jna", "jna"))
runtimeOnly(commonDependency("net.java.dev.jna", "jna"))
}
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApi(project(":kotlin-test:kotlin-test-junit"))
testCompilationClasspath(kotlinStdlib())
}
prepare/compiler/build.gradle.kts
+8 -8
View File
@@ -138,7 +138,7 @@ dependencies {
api(kotlinStdlib())
api(project(":kotlin-script-runtime"))
api(project(":kotlin-reflect"))
api(commonDep("org.jetbrains.intellij.deps", "trove4j"))
api(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
proguardLibraries(project(":kotlin-annotations-jvm"))
@@ -157,7 +157,7 @@ dependencies {
libraries(project(":kotlin-test:kotlin-test-js", configuration = "distLibrary"))
}
librariesStripVersion(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
librariesStripVersion(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
distLibraryProjects.forEach {
libraries(project(it)) { isTransitive = false }
@@ -196,13 +196,13 @@ dependencies {
buildNumber(project(":prepare:build.version", configuration = "buildVersion"))
fatJarContents(kotlinBuiltins())
fatJarContents(commonDep("javax.inject"))
fatJarContents(commonDep("org.jline", "jline"))
fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
fatJarContents(commonDependency("javax.inject"))
fatJarContents(commonDependency("org.jline", "jline"))
fatJarContents(commonDependency("org.fusesource.jansi", "jansi"))
fatJarContents(protobufFull())
fatJarContents(commonDep("com.google.code.findbugs", "jsr305"))
fatJarContents(commonDep("io.javaslang", "javaslang"))
fatJarContents(commonDep("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm")) { isTransitive = false }
fatJarContents(commonDependency("com.google.code.findbugs", "jsr305"))
fatJarContents(commonDependency("io.javaslang", "javaslang"))
fatJarContents(commonDependency("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm")) { isTransitive = false }
fatJarContents(intellijCoreDep()) { includeJars("intellij-core") }
fatJarContents(intellijDep()) { includeJars("jna-platform") }
prepare/parcelize-compiler-gradle/build.gradle.kts
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
compileOnly(project(":compiler:backend"))
compileOnly(project(":plugins:parcelize:parcelize-runtime"))
runtimeOnly(project(":kotlin-compiler-embeddable"))
compileOnly(commonDep("com.google.android", "android"))
compileOnly(commonDependency("com.google.android", "android"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
embedded(project(":plugins:parcelize:parcelize-compiler")) { isTransitive = false }