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
ant/build.gradle.kts
+1 -1
View File
@@ -6,7 +6,7 @@ plugins {
}
dependencies {
api(commonDep("org.apache.ant", "ant"))
api(commonDependency("org.apache.ant", "ant"))
api(project(":kotlin-preloader"))
api(kotlinStdlib())
}
build-common/build.gradle.kts
+1 -1
View File
@@ -20,7 +20,7 @@ dependencies {
testCompileOnly(project(":compiler:cli-common"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApi(protobufFull())
testApi(kotlinStdlib())
testImplementation(project(":kotlin-reflect"))
buildSrc/src/main/kotlin/dependencies.kt
+9 -9
View File
@@ -45,22 +45,22 @@ val Project.internalBootstrapRepo: String? get() =
else -> null
}
fun Project.commonDep(coord: String): String {
fun Project.commonDependency(coord: String): String {
val parts = coord.split(':')
return when (parts.size) {
1 -> "$coord:$coord:${commonVer(coord, coord)}"
2 -> "${parts[0]}:${parts[1]}:${commonVer(parts[0], parts[1])}"
1 -> "$coord:$coord:${commonDependencyVersion(coord, coord)}"
2 -> "${parts[0]}:${parts[1]}:${commonDependencyVersion(parts[0], parts[1])}"
3 -> coord
else -> throw IllegalArgumentException("Illegal maven coordinates: $coord")
}
}
fun Project.commonDep(group: String, artifact: String, vararg suffixesAndClassifiers: String): String {
fun Project.commonDependency(group: String, artifact: String, vararg suffixesAndClassifiers: String): String {
val (classifiers, artifactSuffixes) = suffixesAndClassifiers.partition { it.startsWith(':') }
return "$group:$artifact${artifactSuffixes.joinToString("")}:${commonVer(group, artifact)}${classifiers.joinToString("")}"
return "$group:$artifact${artifactSuffixes.joinToString("")}:${commonDependencyVersion(group, artifact)}${classifiers.joinToString("")}"
}
fun Project.commonVer(group: String, artifact: String) =
fun Project.commonDependencyVersion(group: String, artifact: String) =
when {
rootProject.extra.has("versions.$artifact") -> rootProject.extra["versions.$artifact"]
rootProject.extra.has("versions.$group") -> rootProject.extra["versions.$group"]
@@ -209,7 +209,7 @@ fun Project.testApiJUnit5(
jupiterParams: Boolean = false
) {
with(dependencies) {
val platformVersion = commonVer("org.junit", "junit-bom")
val platformVersion = commonDependencyVersion("org.junit", "junit-bom")
testApi(platform("org.junit:junit-bom:$platformVersion"))
testApi("org.junit.jupiter:junit-jupiter")
if (vintageEngine) {
@@ -220,7 +220,7 @@ fun Project.testApiJUnit5(
testApi("org.junit.jupiter:junit-jupiter-params:$platformVersion")
}
val componentsVersion = commonVer("org.junit.platform", "")
val componentsVersion = commonDependencyVersion("org.junit.platform", "")
val components = mutableListOf(
"org.junit.platform:junit-platform-commons",
@@ -244,7 +244,7 @@ fun Project.testApiJUnit5(
}
// This is needed only for using FileComparisonFailure, which relies on JUnit 3 classes
add("testRuntimeOnly", commonDep("junit:junit"))
add("testRuntimeOnly", commonDependency("junit:junit"))
}
}
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 {
core/descriptors.jvm/build.gradle.kts
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
api(project(":core:compiler.common.jvm"))
api(project(":core:deserialization.common.jvm"))
api(project(":core:util.runtime"))
api(commonDep("javax.inject"))
api(commonDependency("javax.inject"))
}
sourceSets {
core/deserialization/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
api(project(":core:deserialization.common"))
api(project(":core:util.runtime"))
api(project(":core:descriptors"))
api(commonDep("javax.inject"))
api(commonDependency("javax.inject"))
}
sourceSets {
generators/test-generator/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ dependencies {
testApi(project(":core:util.runtime"))
testApi(projectTests(":compiler:test-infrastructure-utils"))
testApi(kotlinStdlib())
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApiJUnit5()
testApi(project(":generators"))
js/js.tests/build.gradle.kts
+4 -4
View File
@@ -50,7 +50,7 @@ dependencies {
testApi(project(":js:js.dce"))
testApi(project(":js:js.engines"))
testApi(project(":compiler:incremental-compilation-impl"))
testApi(commonDep("junit:junit"))
testApi(commonDependency("junit:junit"))
testApi(projectTests(":kotlin-build-common"))
testApi(projectTests(":generators:test-generator"))
@@ -71,12 +71,12 @@ dependencies {
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"))
antLauncherJar(commonDep("org.apache.ant", "ant"))
antLauncherJar(commonDependency("org.apache.ant", "ant"))
antLauncherJar(toolsJar())
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${commonVer("org.junit", "junit-bom")}")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${commonDependencyVersion("org.junit", "junit-bom")}")
}
val generationRoot = projectDir.resolve("tests-gen")
kotlin-native/Interop/StubGenerator/build.gradle
+1 -1
View File
@@ -35,7 +35,7 @@ dependencies {
implementation(project(":compiler:util"))
implementation(project(":compiler:ir.serialization.common"))
testImplementation DependenciesKt.commonDep(project, "junit")
testImplementation DependenciesKt.commonDependency(project, "junit")
testImplementation project(":kotlin-test:kotlin-test-junit")
}
kotlin-native/backend.native/tests/build.gradle
+1 -1
View File
@@ -6082,7 +6082,7 @@ dependencies {
api project(kotlinCompilerModule)
api project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements')
api DependenciesKt.commonDep(project, "junit")
api DependenciesKt.commonDependency(project, "junit")
}
project.tasks.named("test").configure {
kotlin-native/klib/build.gradle
+1 -1
View File
@@ -44,7 +44,7 @@ dependencies {
implementation project(":kotlin-stdlib")
implementation project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements')
implementation project(":kotlin-native:utilities:basic-utils")
testImplementation DependenciesKt.commonDep(project, "junit")
testImplementation DependenciesKt.commonDependency(project, "junit")
testImplementation project(":kotlin-test:kotlin-test-junit")
}
kotlin-native/prepare/kotlin-native-embeddable-compiler/build.gradle.kts
+1 -1
View File
@@ -52,7 +52,7 @@ dependencies {
kotlinNativeEmbedded(project(":kotlin-native:klib"))
kotlinNativeEmbedded(project(":kotlin-native:endorsedLibraries:kotlinx.cli", "jvmRuntimeElements"))
kotlinNativeEmbedded(project(":kotlin-compiler")) { isTransitive = false }
testImplementation(commonDep("junit:junit"))
testImplementation(commonDependency("junit:junit"))
testImplementation(project(":kotlin-test:kotlin-test-junit"))
}
kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle
+1 -1
View File
@@ -78,7 +78,7 @@ dependencies {
bundleDependencies "org.jetbrains.kotlin:kotlin-util-io:$kotlinVersion"
bundleDependencies "org.jetbrains.kotlin:kotlin-util-klib:$kotlinVersion"
testImplementation DependenciesKt.commonDep(project, "junit")
testImplementation DependenciesKt.commonDependency(project, "junit")
testImplementation "org.jetbrains.kotlin:kotlin-test:${project.bootstrapKotlinVersion}"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${project.bootstrapKotlinVersion}"
testImplementation "org.tools4j:tools4j-spockito:1.6"
libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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"))
native/commonizer-api/build.gradle.kts
+1 -1
View File
@@ -29,7 +29,7 @@ dependencies {
implementation(kotlinStdlib())
implementation(project(":native:kotlin-native-utils"))
testImplementation(project(":kotlin-test::kotlin-test-junit"))
testImplementation(commonDep("junit:junit"))
testImplementation(commonDependency("junit:junit"))
testImplementation(projectTests(":compiler:tests-common"))
testRuntimeOnly(project(":native:kotlin-klib-commonizer"))
}
native/commonizer/build.gradle.kts
+1 -1
View File
@@ -35,7 +35,7 @@ dependencies {
api(kotlinStdlib())
testImplementation(commonDep("junit:junit"))
testImplementation(commonDependency("junit:junit"))
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(project(":kotlinx-metadata-klib")) { isTransitive = false }
testImplementation(project(":kotlinx-metadata")) { isTransitive = false }
native/utils/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ dependencies {
compileOnly(kotlinStdlib())
api(project(":kotlin-util-io"))
testImplementation(commonDep("junit:junit"))
testImplementation(commonDependency("junit:junit"))
testCompileOnly(project(":kotlin-reflect-api"))
testImplementation(project(":kotlin-reflect"))
}
plugins/allopen/allopen-cli/build.gradle.kts
+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") }
}
plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+2 -2
View File
@@ -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 }
plugins/android-extensions/android-extensions-idea/build.gradle.kts
+1 -1
View File
@@ -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"))
plugins/android-extensions/android-extensions-runtime/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ project.updateJvmTarget("1.6")
dependencies {
api(kotlinStdlib())
compileOnly(commonDep("com.google.android", "android"))
compileOnly(commonDependency("com.google.android", "android"))
}
sourceSets {
plugins/atomicfu/atomicfu-compiler/build.gradle.kts
+2 -2
View File
@@ -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 }
plugins/jvm-abi-gen/build.gradle.kts
+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"))
}
plugins/kapt3/kapt3-base/build.gradle.kts
+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())
plugins/kapt3/kapt3-cli/build.gradle.kts
+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 {
plugins/kapt3/kapt3-compiler/build.gradle.kts
+1 -1
View File
@@ -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())
plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
+1 -1
View File
@@ -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")
plugins/lombok/lombok-compiler-plugin/build.gradle.kts
+1 -1
View File
@@ -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")
plugins/noarg/noarg-cli/build.gradle.kts
+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")}
}
plugins/parcelize/parcelize-compiler/build.gradle.kts
+2 -2
View File
@@ -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 }
plugins/parcelize/parcelize-runtime/build.gradle.kts
+1 -1
View File
@@ -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 {
plugins/pill/generate-all-tests/build.gradle.kts
+1 -1
View File
@@ -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) {
plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+1 -1
View File
@@ -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"))
plugins/scripting/scripting-compiler-impl/build.gradle.kts
+1 -1
View File
@@ -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 {
plugins/scripting/scripting-compiler/build.gradle.kts
+2 -3
View File
@@ -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"))
}
plugins/scripting/scripting-ide-services-test/build.gradle.kts
+6 -6
View File
@@ -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 {
plugins/scripting/scripting-ide-services/build.gradle.kts
+1 -1
View File
@@ -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 {
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 }
wasm/wasm.ir/build.gradle.kts
+1 -1
View File
@@ -6,7 +6,7 @@ plugins {
dependencies {
implementation(kotlinStdlib())
testImplementation(commonDep("junit:junit"))
testImplementation(commonDependency("junit:junit"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
testImplementation(projectTests(":compiler:tests-common"))