Build: Fix deprecated Gradle configurations usages
for migration to Gradle 7+ #KTI-559
This commit is contained in:
Vyacheslav Gerasimov
@@ -6,37 +6,37 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testCompile(project(":core:descriptors"))
|
||||
testCompile(project(":core:descriptors.jvm"))
|
||||
testCompile(project(":compiler:util"))
|
||||
testCompile(project(":compiler:cli"))
|
||||
testCompile(project(":compiler:frontend"))
|
||||
testCompile(project(":compiler:backend"))
|
||||
testCompile(project(":compiler:incremental-compilation-impl"))
|
||||
testCompile(project(":compiler:frontend.java"))
|
||||
testApi(project(":core:descriptors"))
|
||||
testApi(project(":core:descriptors.jvm"))
|
||||
testApi(project(":compiler:util"))
|
||||
testApi(project(":compiler:cli"))
|
||||
testApi(project(":compiler:frontend"))
|
||||
testApi(project(":compiler:backend"))
|
||||
testApi(project(":compiler:incremental-compilation-impl"))
|
||||
testApi(project(":compiler:frontend.java"))
|
||||
|
||||
testCompile(kotlinStdlib())
|
||||
testCompile(project(":kotlin-reflect"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testApi(kotlinStdlib())
|
||||
testApi(project(":kotlin-reflect"))
|
||||
testApi(projectTests(":compiler:tests-common"))
|
||||
testApi(commonDep("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"))
|
||||
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testApi(commonDep("junit:junit"))
|
||||
|
||||
testCompile(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) }
|
||||
testCompile(intellijDep()) { includeJars("groovy", rootProject = rootProject) }
|
||||
testApi(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) }
|
||||
testApi(intellijDep()) { includeJars("groovy", rootProject = rootProject) }
|
||||
|
||||
testCompile(intellijPluginDep("java")) { includeJars("jps-builders") }
|
||||
testCompile(jpsStandalone()) { includeJars("jps-model") }
|
||||
testCompile(jpsBuildTest())
|
||||
testApi(intellijPluginDep("java")) { includeJars("jps-builders") }
|
||||
testApi(jpsStandalone()) { includeJars("jps-model") }
|
||||
testApi(jpsBuildTest())
|
||||
|
||||
testRuntimeOnly(compile(intellijCoreDep()) { includeJars("intellij-core") })
|
||||
testRuntimeOnly(compile(intellijDep()) { includeJars("jna", rootProject = rootProject) })
|
||||
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testRuntimeOnly(intellijDep()) { includeJars("jna", rootProject = rootProject) }
|
||||
|
||||
testCompile("org.junit.platform:junit-platform-launcher:${commonVer("org.junit.platform", "")}")
|
||||
testApi("org.junit.platform:junit-platform-launcher:${commonVer("org.junit.platform", "")}")
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -5,9 +5,9 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":core:descriptors"))
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend"))
|
||||
api(project(":core:descriptors"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:frontend"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
|
||||
@@ -4,12 +4,12 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-annotations-jvm"))
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:backend-common"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:frontend.java"))
|
||||
compile(project(":compiler:serialization"))
|
||||
api(project(":kotlin-annotations-jvm"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:backend-common"))
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":compiler:frontend.java"))
|
||||
api(project(":compiler:serialization"))
|
||||
api(project(":compiler:backend.common.jvm"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
|
||||
compileOnly(intellijDep()) { includeJars("trove4j", rootProject = rootProject) }
|
||||
|
||||
+17
-17
@@ -12,26 +12,26 @@ val otherCompilerModules = compilerModules.filter { it != path }
|
||||
val antLauncherJar by configurations.creating
|
||||
|
||||
dependencies {
|
||||
testRuntime(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests
|
||||
testImplementation(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests
|
||||
|
||||
testCompile(project(":kotlin-script-runtime"))
|
||||
testCompile(project(":kotlin-test:kotlin-test-jvm"))
|
||||
testApi(project(":kotlin-script-runtime"))
|
||||
testApi(project(":kotlin-test:kotlin-test-jvm"))
|
||||
|
||||
testCompile(kotlinStdlib())
|
||||
testApi(kotlinStdlib())
|
||||
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testApi(commonDep("junit:junit"))
|
||||
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
|
||||
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(projectTests(":compiler:fir:raw-fir:psi2fir"))
|
||||
testCompile(projectTests(":compiler:fir:raw-fir:light-tree2fir"))
|
||||
testCompile(projectTests(":compiler:fir:fir2ir"))
|
||||
testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
|
||||
testCompile(projectTests(":generators:test-generator"))
|
||||
testCompile(project(":compiler:ir.ir2cfg"))
|
||||
testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward
|
||||
testCompile(project(":kotlin-scripting-compiler"))
|
||||
testCompile(project(":kotlin-script-util"))
|
||||
testApi(projectTests(":compiler:tests-common"))
|
||||
testApi(projectTests(":compiler:fir:raw-fir:psi2fir"))
|
||||
testApi(projectTests(":compiler:fir:raw-fir:light-tree2fir"))
|
||||
testApi(projectTests(":compiler:fir:fir2ir"))
|
||||
testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
|
||||
testApi(projectTests(":generators:test-generator"))
|
||||
testApi(project(":compiler:ir.ir2cfg"))
|
||||
testApi(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward
|
||||
testApi(project(":kotlin-scripting-compiler"))
|
||||
testApi(project(":kotlin-script-util"))
|
||||
testCompileOnly(project(":kotlin-reflect-api"))
|
||||
otherCompilerModules.forEach {
|
||||
testCompileOnly(project(it))
|
||||
@@ -41,8 +41,8 @@ dependencies {
|
||||
|
||||
testRuntimeOnly(intellijPluginDep("java"))
|
||||
|
||||
testRuntime(project(":kotlin-reflect"))
|
||||
testRuntime(toolsJar())
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testImplementation(toolsJar())
|
||||
|
||||
antLauncherJar(commonDep("org.apache.ant", "ant"))
|
||||
antLauncherJar(toolsJar())
|
||||
|
||||
@@ -4,35 +4,35 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:cli-common"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:frontend.java"))
|
||||
compile(project(":compiler:frontend:cfg"))
|
||||
compile(project(":compiler:backend-common"))
|
||||
compile(project(":compiler:backend"))
|
||||
compile(project(":compiler:backend.jvm"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:cli-common"))
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":compiler:frontend.java"))
|
||||
api(project(":compiler:frontend:cfg"))
|
||||
api(project(":compiler:backend-common"))
|
||||
api(project(":compiler:backend"))
|
||||
api(project(":compiler:backend.jvm"))
|
||||
implementation(project(":compiler:backend.jvm.lower"))
|
||||
implementation(project(":compiler:backend.jvm.entrypoint"))
|
||||
compile(project(":compiler:ir.backend.common"))
|
||||
compile(project(":compiler:light-classes"))
|
||||
compile(project(":compiler:serialization"))
|
||||
compile(project(":compiler:plugin-api"))
|
||||
compile(project(":compiler:javac-wrapper"))
|
||||
compile(project(":js:js.translator"))
|
||||
compile(project(":native:frontend.native"))
|
||||
compile(commonDep("org.fusesource.jansi", "jansi"))
|
||||
compile(commonDep("org.jline", "jline"))
|
||||
compile(project(":compiler:fir:raw-fir:psi2fir"))
|
||||
compile(project(":compiler:fir:resolve"))
|
||||
compile(project(":compiler:fir:java"))
|
||||
api(project(":compiler:ir.backend.common"))
|
||||
api(project(":compiler:light-classes"))
|
||||
api(project(":compiler:serialization"))
|
||||
api(project(":compiler:plugin-api"))
|
||||
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(project(":compiler:fir:raw-fir:psi2fir"))
|
||||
api(project(":compiler:fir:resolve"))
|
||||
api(project(":compiler:fir:java"))
|
||||
implementation(project(":compiler:fir:entrypoint"))
|
||||
compile(project(":compiler:fir:fir2ir"))
|
||||
compile(project(":compiler:fir:fir2ir:jvm-backend"))
|
||||
compile(project(":compiler:fir:checkers"))
|
||||
compile(project(":compiler:fir:checkers:checkers.jvm"))
|
||||
compile(project(":kotlin-util-klib"))
|
||||
compile(project(":kotlin-util-io"))
|
||||
api(project(":compiler:fir:fir2ir"))
|
||||
api(project(":compiler:fir:fir2ir:jvm-backend"))
|
||||
api(project(":compiler:fir:checkers"))
|
||||
api(project(":compiler:fir:checkers:checkers.jvm"))
|
||||
api(project(":kotlin-util-klib"))
|
||||
api(project(":kotlin-util-io"))
|
||||
|
||||
// TODO: as soon as cli-jvm is extracted out of this module, move this dependency there
|
||||
compileOnly(project(":compiler:ir.tree.impl"))
|
||||
@@ -41,10 +41,10 @@ dependencies {
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
||||
|
||||
testCompile(project(":compiler:backend"))
|
||||
testCompile(project(":compiler:cli"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testApi(project(":compiler:backend"))
|
||||
testApi(project(":compiler:cli"))
|
||||
testApi(projectTests(":compiler:tests-common"))
|
||||
testApi(commonDep("junit:junit"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -4,11 +4,11 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":core:util.runtime"))
|
||||
compile(project(":compiler:config"))
|
||||
compile(project(":compiler:config.jvm"))
|
||||
compile(project(":js:js.config"))
|
||||
compile(project(":native:kotlin-native-utils"))
|
||||
api(project(":core:util.runtime"))
|
||||
api(project(":compiler:config"))
|
||||
api(project(":compiler:config.jvm"))
|
||||
api(project(":js:js.config"))
|
||||
api(project(":native:kotlin-native-utils"))
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
||||
|
||||
@@ -4,20 +4,20 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:cli-common"))
|
||||
compile(project(":compiler:cli"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:backend-common"))
|
||||
compile(project(":compiler:ir.backend.common"))
|
||||
compile(project(":compiler:ir.serialization.js"))
|
||||
compile(project(":compiler:ir.tree.impl"))
|
||||
compile(project(":compiler:backend.js"))
|
||||
compile(project(":compiler:backend.wasm"))
|
||||
compile(project(":js:js.translator"))
|
||||
compile(project(":js:js.serializer"))
|
||||
compile(project(":js:js.dce"))
|
||||
compile(project(":js:js.sourcemap"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:cli-common"))
|
||||
api(project(":compiler:cli"))
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":compiler:backend-common"))
|
||||
api(project(":compiler:ir.backend.common"))
|
||||
api(project(":compiler:ir.serialization.js"))
|
||||
api(project(":compiler:ir.tree.impl"))
|
||||
api(project(":compiler:backend.js"))
|
||||
api(project(":compiler:backend.wasm"))
|
||||
api(project(":js:js.translator"))
|
||||
api(project(":js:js.serializer"))
|
||||
api(project(":js:js.dce"))
|
||||
api(project(":js:js.sourcemap"))
|
||||
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(kotlinStdlib())
|
||||
api(kotlinStdlib())
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -6,17 +6,17 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-build-common"))
|
||||
api(project(":kotlin-build-common"))
|
||||
compileOnly(project(":compiler:cli-common"))
|
||||
compileOnly(project(":kotlin-preloader"))
|
||||
compileOnly(project(":compiler:frontend.java"))
|
||||
compileOnly(project(":daemon-common"))
|
||||
compileOnly(project(":daemon-common-new"))
|
||||
compile(projectRuntimeJar(":kotlin-daemon-client"))
|
||||
api(projectRuntimeJar(":kotlin-daemon-client"))
|
||||
compileOnly(project(":compiler:util"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable"))
|
||||
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
|
||||
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -4,17 +4,17 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":core:util.runtime"))
|
||||
compile(commonDep("javax.inject"))
|
||||
api(project(":core:util.runtime"))
|
||||
api(commonDep("javax.inject"))
|
||||
compileOnly(kotlinStdlib())
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompile(kotlinStdlib())
|
||||
testApi(kotlinStdlib())
|
||||
testCompileOnly("org.jetbrains:annotations:13.0")
|
||||
testCompile(project(":kotlin-test:kotlin-test-jvm"))
|
||||
testCompile(project(":kotlin-test:kotlin-test-junit"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testApi(project(":kotlin-test:kotlin-test-jvm"))
|
||||
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||
testApi(commonDep("junit:junit"))
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testRuntime(intellijDep()) { includeJars("trove4j", "util") }
|
||||
testRuntimeOnly(intellijDep()) { includeJars("trove4j", "util") }
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -8,8 +8,8 @@ plugins {
|
||||
val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra
|
||||
|
||||
dependencies {
|
||||
compile(commonDep("org.fusesource.jansi", "jansi"))
|
||||
compile(commonDep("org.jline", "jline"))
|
||||
api(commonDep("org.fusesource.jansi", "jansi"))
|
||||
api(commonDep("org.jline", "jline"))
|
||||
|
||||
compileOnly(project(":compiler:cli"))
|
||||
compileOnly(project(":compiler:cli-js"))
|
||||
|
||||
@@ -37,10 +37,10 @@ dependencies {
|
||||
nativePlatformVariants.forEach {
|
||||
embedded(commonDep("net.rubygrapefruit", "native-platform", "-$it"))
|
||||
}
|
||||
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
||||
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
||||
isTransitive = false
|
||||
}
|
||||
compile(commonDep("io.ktor", "ktor-network")) {
|
||||
api(commonDep("io.ktor", "ktor-network")) {
|
||||
ktorExcludesForDaemon.forEach { (group, module) ->
|
||||
exclude(group = group, module = module)
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@ val ktorExcludesForDaemon: List<Pair<String, String>> by rootProject.extra
|
||||
|
||||
dependencies {
|
||||
compileOnly(project(":daemon-common"))
|
||||
compile(kotlinStdlib())
|
||||
api(kotlinStdlib())
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
||||
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
||||
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
||||
isTransitive = false
|
||||
}
|
||||
compile(commonDep("io.ktor", "ktor-network")) {
|
||||
api(commonDep("io.ktor", "ktor-network")) {
|
||||
ktorExcludesForDaemon.forEach { (group, module) ->
|
||||
exclude(group = group, module = module)
|
||||
}
|
||||
|
||||
@@ -4,13 +4,13 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:cli-common"))
|
||||
compile(project(":kotlin-build-common"))
|
||||
compile(kotlinStdlib())
|
||||
api(project(":compiler:cli-common"))
|
||||
api(project(":kotlin-build-common"))
|
||||
api(kotlinStdlib())
|
||||
compileOnly(project(":js:js.config"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
||||
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
||||
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
||||
isTransitive = false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,23 +9,23 @@ plugins {
|
||||
val ktorExcludesForDaemon: List<Pair<String, String>> by rootProject.extra
|
||||
|
||||
dependencies {
|
||||
testCompile(project(":kotlin-test:kotlin-test-jvm"))
|
||||
testCompile(kotlinStdlib())
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testApi(project(":kotlin-test:kotlin-test-jvm"))
|
||||
testApi(kotlinStdlib())
|
||||
testApi(commonDep("junit:junit"))
|
||||
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
|
||||
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
|
||||
testCompile(projectRuntimeJar(":kotlin-daemon-client"))
|
||||
testCompile(projectRuntimeJar(":kotlin-daemon-client-new"))
|
||||
testApi(projectRuntimeJar(":kotlin-daemon-client"))
|
||||
testApi(projectRuntimeJar(":kotlin-daemon-client-new"))
|
||||
testCompileOnly(project(":kotlin-daemon"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
|
||||
testCompile(commonDep("io.ktor", "ktor-network")) {
|
||||
testApi(projectTests(":compiler:tests-common"))
|
||||
testApi(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
|
||||
testApi(commonDep("io.ktor", "ktor-network")) {
|
||||
ktorExcludesForDaemon.forEach { (group, module) ->
|
||||
exclude(group = group, module = module)
|
||||
}
|
||||
}
|
||||
testRuntime(project(":kotlin-daemon"))
|
||||
testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testImplementation(project(":kotlin-daemon"))
|
||||
testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -122,5 +122,5 @@ val jmhExec by tasks.registering(JavaExec::class) {
|
||||
workingDir = rootDir
|
||||
systemProperty("idea.home.path", project.intellijRootDir().absolutePath)
|
||||
systemProperty("idea.max.intellisense.filesize", 5000 * 1024)
|
||||
configurations.plusAssign(project.configurations["compile"])
|
||||
configurations.plusAssign(project.configurations["api"])
|
||||
}
|
||||
|
||||
@@ -4,8 +4,8 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:config"))
|
||||
compile(project(":compiler:container"))
|
||||
api(project(":compiler:config"))
|
||||
api(project(":compiler:container"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
|
||||
@@ -4,12 +4,12 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":core:descriptors"))
|
||||
compile(project(":core:descriptors.jvm"))
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:config.jvm"))
|
||||
compile("javax.annotation:jsr250-api:1.0")
|
||||
compile(project(":compiler:frontend"))
|
||||
api(project(":core:descriptors"))
|
||||
api(project(":core:descriptors.jvm"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:config.jvm"))
|
||||
api("javax.annotation:jsr250-api:1.0")
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":compiler:resolution.common.jvm"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
|
||||
|
||||
@@ -4,18 +4,18 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-annotations-jvm"))
|
||||
compile(project(":core:descriptors"))
|
||||
compile(project(":core:deserialization"))
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:config"))
|
||||
compile(project(":compiler:container"))
|
||||
compile(project(":compiler:resolution"))
|
||||
compile(project(":compiler:psi"))
|
||||
compile(project(":compiler:frontend.common"))
|
||||
compile(project(":compiler:frontend.common-psi"))
|
||||
compile(project(":kotlin-script-runtime"))
|
||||
compile(commonDep("io.javaslang","javaslang"))
|
||||
api(project(":kotlin-annotations-jvm"))
|
||||
api(project(":core:descriptors"))
|
||||
api(project(":core:deserialization"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:config"))
|
||||
api(project(":compiler:container"))
|
||||
api(project(":compiler:resolution"))
|
||||
api(project(":compiler:psi"))
|
||||
api(project(":compiler:frontend.common"))
|
||||
api(project(":compiler:frontend.common-psi"))
|
||||
api(project(":kotlin-script-runtime"))
|
||||
api(commonDep("io.javaslang","javaslang"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:frontend"))
|
||||
api(project(":compiler:frontend"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
|
||||
}
|
||||
|
||||
@@ -5,28 +5,28 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":core:descriptors"))
|
||||
compile(project(":core:descriptors.jvm"))
|
||||
compile(project(":core:deserialization"))
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:frontend.java"))
|
||||
compile(project(":compiler:cli"))
|
||||
compile(project(":compiler:cli-js"))
|
||||
compile(project(":kotlin-build-common"))
|
||||
compile(project(":daemon-common"))
|
||||
api(project(":core:descriptors"))
|
||||
api(project(":core:descriptors.jvm"))
|
||||
api(project(":core:deserialization"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":compiler:frontend.java"))
|
||||
api(project(":compiler:cli"))
|
||||
api(project(":compiler:cli-js"))
|
||||
api(project(":kotlin-build-common"))
|
||||
api(project(":daemon-common"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testCompile(project(":kotlin-test:kotlin-test-junit"))
|
||||
testCompile(kotlinStdlib())
|
||||
testCompile(projectTests(":kotlin-build-common"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompile(intellijDep()) { includeJars("log4j", "jdom") }
|
||||
testRuntime(project(":kotlin-reflect"))
|
||||
testRuntime(project(":core:descriptors.runtime"))
|
||||
testRuntime(intellijDep()) { includeJars("lz4-java", "jna", rootProject = rootProject) }
|
||||
testApi(commonDep("junit:junit"))
|
||||
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||
testApi(kotlinStdlib())
|
||||
testApi(projectTests(":kotlin-build-common"))
|
||||
testApi(projectTests(":compiler:tests-common"))
|
||||
testApi(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testApi(intellijDep()) { includeJars("log4j", "jdom") }
|
||||
testRuntimeOnly(project(":kotlin-reflect"))
|
||||
testRuntimeOnly(project(":core:descriptors.runtime"))
|
||||
testRuntimeOnly(intellijDep()) { includeJars("lz4-java", "jna", rootProject = rootProject) }
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -4,11 +4,11 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:backend-common"))
|
||||
compile(project(":compiler:ir.tree"))
|
||||
compile(project(":compiler:ir.interpreter"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":compiler:backend-common"))
|
||||
api(project(":compiler:ir.tree"))
|
||||
api(project(":compiler:ir.interpreter"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
|
||||
@@ -4,17 +4,17 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:backend-common"))
|
||||
compile(project(":compiler:ir.tree"))
|
||||
compile(project(":compiler:ir.backend.common"))
|
||||
compile(project(":compiler:ir.serialization.common"))
|
||||
compile(project(":compiler:ir.serialization.js"))
|
||||
compile(project(":compiler:ir.tree.persistent"))
|
||||
compile(project(":js:js.ast"))
|
||||
compile(project(":js:js.frontend"))
|
||||
compile(project(":js:js.sourcemap"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":compiler:backend-common"))
|
||||
api(project(":compiler:ir.tree"))
|
||||
api(project(":compiler:ir.backend.common"))
|
||||
api(project(":compiler:ir.serialization.common"))
|
||||
api(project(":compiler:ir.serialization.js"))
|
||||
api(project(":compiler:ir.tree.persistent"))
|
||||
api(project(":js:js.ast"))
|
||||
api(project(":js:js.frontend"))
|
||||
api(project(":js:js.sourcemap"))
|
||||
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
@@ -4,10 +4,10 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-annotations-jvm"))
|
||||
compile(project(":compiler:backend"))
|
||||
compile(project(":compiler:ir.tree"))
|
||||
compile(project(":compiler:ir.backend.common"))
|
||||
api(project(":kotlin-annotations-jvm"))
|
||||
api(project(":compiler:backend"))
|
||||
api(project(":compiler:ir.tree"))
|
||||
api(project(":compiler:ir.backend.common"))
|
||||
api(project(":compiler:backend.common.jvm"))
|
||||
compileOnly(project(":compiler:ir.tree.impl"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
|
||||
|
||||
@@ -4,17 +4,17 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:backend-common"))
|
||||
compile(project(":compiler:ir.tree"))
|
||||
compile(project(":compiler:ir.backend.common"))
|
||||
compile(project(":compiler:ir.serialization.common"))
|
||||
compile(project(":compiler:ir.serialization.js"))
|
||||
compile(project(":js:js.ast"))
|
||||
compile(project(":js:js.frontend"))
|
||||
compile(project(":compiler:backend.js"))
|
||||
compile(project(":wasm:wasm.ir"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":compiler:backend-common"))
|
||||
api(project(":compiler:ir.tree"))
|
||||
api(project(":compiler:ir.backend.common"))
|
||||
api(project(":compiler:ir.serialization.common"))
|
||||
api(project(":compiler:ir.serialization.js"))
|
||||
api(project(":js:js.ast"))
|
||||
api(project(":js:js.frontend"))
|
||||
api(project(":compiler:backend.js"))
|
||||
api(project(":wasm:wasm.ir"))
|
||||
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
@@ -5,9 +5,9 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:ir.tree"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":compiler:ir.tree"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -4,10 +4,10 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:backend-common"))
|
||||
compile(project(":compiler:ir.tree"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":compiler:backend-common"))
|
||||
api(project(":compiler:ir.tree"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:ir.tree"))
|
||||
api(project(":compiler:ir.tree"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
|
||||
@@ -4,11 +4,11 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:ir.tree"))
|
||||
compile(project(":compiler:serialization"))
|
||||
compile(project(":kotlin-util-klib"))
|
||||
compile(project(":kotlin-util-klib-metadata"))
|
||||
compile(project(":compiler:util"))
|
||||
api(project(":compiler:ir.tree"))
|
||||
api(project(":compiler:serialization"))
|
||||
api(project(":kotlin-util-klib"))
|
||||
api(project(":kotlin-util-klib-metadata"))
|
||||
api(project(":compiler:util"))
|
||||
implementation(project(":compiler:psi"))
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
|
||||
|
||||
@@ -7,8 +7,9 @@ dependencies {
|
||||
api(project(":compiler:ir.psi2ir"))
|
||||
api(project(":compiler:ir.serialization.common"))
|
||||
api(project(":js:js.frontend"))
|
||||
api(project(":compiler:ir.tree.persistent"))
|
||||
|
||||
implementation(project(":compiler:ir.backend.common"))
|
||||
compile(project(":compiler:ir.tree.persistent"))
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
|
||||
@@ -4,12 +4,12 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:ir.tree"))
|
||||
compile(project(":compiler:ir.serialization.common"))
|
||||
compile(project(":core:descriptors.jvm"))
|
||||
compile(project(":core:metadata.jvm"))
|
||||
api(project(":compiler:ir.tree"))
|
||||
api(project(":compiler:ir.serialization.common"))
|
||||
api(project(":core:descriptors.jvm"))
|
||||
api(project(":core:metadata.jvm"))
|
||||
implementation(project(":core:deserialization.common.jvm"))
|
||||
compile(project(":compiler:frontend.java"))
|
||||
api(project(":compiler:frontend.java"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -4,8 +4,8 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend.java"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:frontend.java"))
|
||||
|
||||
compileOnly(toolsJarApi())
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
|
||||
@@ -5,10 +5,10 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:backend"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":compiler:frontend.java"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:backend"))
|
||||
api(project(":compiler:frontend"))
|
||||
api(project(":compiler:frontend.java"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
|
||||
compileOnly(intellijDep()) { includeJars("platform-core-ui", "platform-util-ui") }
|
||||
|
||||
@@ -5,8 +5,8 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:frontend"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
|
||||
@@ -10,13 +10,10 @@ repositories {
|
||||
val jflexPath by configurations.creating
|
||||
|
||||
dependencies {
|
||||
val compile by configurations
|
||||
val compileOnly by configurations
|
||||
|
||||
compile(project(":core:compiler.common"))
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend.common"))
|
||||
compile(project(":kotlin-script-runtime"))
|
||||
api(project(":core:compiler.common"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":compiler:frontend.common"))
|
||||
api(project(":kotlin-script-runtime"))
|
||||
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
compileOnly(intellijDep()) { includeJars("guava", "trove4j", rootProject = rootProject) }
|
||||
|
||||
@@ -4,8 +4,8 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":core:descriptors"))
|
||||
api(project(":compiler:util"))
|
||||
api(project(":core:descriptors"))
|
||||
api(project(":compiler:resolution.common"))
|
||||
compileOnly(intellijDep()) { includeJars("trove4j") }
|
||||
}
|
||||
|
||||
@@ -4,8 +4,8 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:resolution"))
|
||||
compile(project(":core:deserialization"))
|
||||
api(project(":compiler:resolution"))
|
||||
api(project(":core:deserialization"))
|
||||
api(project(":compiler:util"))
|
||||
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
|
||||
|
||||
@@ -7,8 +7,8 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(kotlinStdlib())
|
||||
testCompile(projectTests(":generators:test-generator"))
|
||||
api(kotlinStdlib())
|
||||
testApi(projectTests(":generators:test-generator"))
|
||||
testApi(projectTests(":compiler:tests-common"))
|
||||
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
|
||||
@@ -6,8 +6,8 @@ plugins {
|
||||
project.updateJvmTarget("1.6")
|
||||
|
||||
dependencies {
|
||||
compile(kotlinStdlib())
|
||||
testCompile(project(":kotlin-test:kotlin-test-jvm"))
|
||||
api(kotlinStdlib())
|
||||
testApi(project(":kotlin-test:kotlin-test-jvm"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -5,59 +5,59 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testCompile(kotlinStdlib("jdk8"))
|
||||
testCompile(project(":kotlin-scripting-compiler"))
|
||||
testCompile(project(":core:descriptors"))
|
||||
testCompile(project(":core:descriptors.jvm"))
|
||||
testCompile(project(":core:deserialization"))
|
||||
testCompile(project(":compiler:util"))
|
||||
testCompile(project(":compiler:tests-mutes"))
|
||||
testCompile(project(":compiler:backend"))
|
||||
testCompile(project(":compiler:ir.tree.impl"))
|
||||
testCompile(project(":compiler:fir:tree"))
|
||||
testCompile(project(":compiler:fir:raw-fir:psi2fir"))
|
||||
testCompile(project(":compiler:fir:raw-fir:light-tree2fir"))
|
||||
testCompile(project(":compiler:fir:fir2ir"))
|
||||
testCompile(project(":compiler:fir:fir2ir:jvm-backend"))
|
||||
testCompile(project(":compiler:fir:fir-serialization"))
|
||||
testCompile(project(":compiler:fir:fir-deserialization"))
|
||||
testCompile(project(":compiler:fir:cones"))
|
||||
testCompile(project(":compiler:fir:resolve"))
|
||||
testCompile(project(":compiler:fir:checkers"))
|
||||
testCompile(project(":compiler:fir:checkers:checkers.jvm"))
|
||||
testCompile(project(":compiler:fir:java"))
|
||||
testCompile(project(":compiler:fir:entrypoint"))
|
||||
testCompile(project(":compiler:ir.ir2cfg"))
|
||||
testCompile(project(":compiler:frontend"))
|
||||
testCompile(project(":compiler:frontend.java"))
|
||||
testCompile(project(":compiler:util"))
|
||||
testCompile(project(":compiler:cli-common"))
|
||||
testCompile(project(":compiler:cli"))
|
||||
testCompile(project(":compiler:cli-js"))
|
||||
testCompile(project(":compiler:light-classes"))
|
||||
testCompile(project(":compiler:serialization"))
|
||||
testCompile(project(":kotlin-preloader"))
|
||||
testCompile(project(":compiler:cli-common"))
|
||||
testCompile(project(":daemon-common"))
|
||||
testCompile(project(":daemon-common-new"))
|
||||
testCompile(project(":js:js.serializer"))
|
||||
testCompile(project(":js:js.frontend"))
|
||||
testCompile(project(":js:js.translator"))
|
||||
testCompile(project(":native:frontend.native"))
|
||||
testApi(kotlinStdlib("jdk8"))
|
||||
testApi(project(":kotlin-scripting-compiler"))
|
||||
testApi(project(":core:descriptors"))
|
||||
testApi(project(":core:descriptors.jvm"))
|
||||
testApi(project(":core:deserialization"))
|
||||
testApi(project(":compiler:util"))
|
||||
testApi(project(":compiler:tests-mutes"))
|
||||
testApi(project(":compiler:backend"))
|
||||
testApi(project(":compiler:ir.tree.impl"))
|
||||
testApi(project(":compiler:fir:tree"))
|
||||
testApi(project(":compiler:fir:raw-fir:psi2fir"))
|
||||
testApi(project(":compiler:fir:raw-fir:light-tree2fir"))
|
||||
testApi(project(":compiler:fir:fir2ir"))
|
||||
testApi(project(":compiler:fir:fir2ir:jvm-backend"))
|
||||
testApi(project(":compiler:fir:fir-serialization"))
|
||||
testApi(project(":compiler:fir:fir-deserialization"))
|
||||
testApi(project(":compiler:fir:cones"))
|
||||
testApi(project(":compiler:fir:resolve"))
|
||||
testApi(project(":compiler:fir:checkers"))
|
||||
testApi(project(":compiler:fir:checkers:checkers.jvm"))
|
||||
testApi(project(":compiler:fir:java"))
|
||||
testApi(project(":compiler:fir:entrypoint"))
|
||||
testApi(project(":compiler:ir.ir2cfg"))
|
||||
testApi(project(":compiler:frontend"))
|
||||
testApi(project(":compiler:frontend.java"))
|
||||
testApi(project(":compiler:util"))
|
||||
testApi(project(":compiler:cli-common"))
|
||||
testApi(project(":compiler:cli"))
|
||||
testApi(project(":compiler:cli-js"))
|
||||
testApi(project(":compiler:light-classes"))
|
||||
testApi(project(":compiler:serialization"))
|
||||
testApi(project(":kotlin-preloader"))
|
||||
testApi(project(":compiler:cli-common"))
|
||||
testApi(project(":daemon-common"))
|
||||
testApi(project(":daemon-common-new"))
|
||||
testApi(project(":js:js.serializer"))
|
||||
testApi(project(":js:js.frontend"))
|
||||
testApi(project(":js:js.translator"))
|
||||
testApi(project(":native:frontend.native"))
|
||||
testCompileOnly(project(":plugins:android-extensions-compiler"))
|
||||
testApi(projectTests(":generators:test-generator"))
|
||||
testCompile(projectTests(":compiler:tests-compiler-utils"))
|
||||
testCompile(project(":kotlin-test:kotlin-test-jvm"))
|
||||
testCompile(projectTests(":compiler:tests-common-jvm6"))
|
||||
testCompile(project(":kotlin-scripting-compiler-impl"))
|
||||
testCompile(projectTests(":compiler:test-infrastructure-utils"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testCompile(commonDep("com.android.tools:r8"))
|
||||
testApi(projectTests(":compiler:tests-compiler-utils"))
|
||||
testApi(project(":kotlin-test:kotlin-test-jvm"))
|
||||
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"))
|
||||
testCompileOnly(project(":kotlin-reflect-api"))
|
||||
testCompileOnly(toolsJar())
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") }
|
||||
testCompile(intellijDep()) {
|
||||
testApi(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") }
|
||||
testApi(intellijDep()) {
|
||||
includeJars(
|
||||
"guava",
|
||||
"trove4j",
|
||||
|
||||
@@ -5,31 +5,31 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testCompile(kotlinStdlib("jdk8"))
|
||||
testCompile(project(":kotlin-scripting-compiler"))
|
||||
testCompile(project(":core:descriptors"))
|
||||
testCompile(project(":core:descriptors.jvm"))
|
||||
testCompile(project(":core:deserialization"))
|
||||
testCompile(project(":compiler:util"))
|
||||
testCompile(project(":compiler:tests-mutes"))
|
||||
testCompile(project(":compiler:backend"))
|
||||
testCompile(project(":compiler:ir.ir2cfg"))
|
||||
testCompile(project(":compiler:frontend"))
|
||||
testCompile(project(":compiler:frontend.java"))
|
||||
testCompile(project(":compiler:util"))
|
||||
testCompile(project(":compiler:psi"))
|
||||
testCompile(project(":compiler:cli-common"))
|
||||
testCompile(project(":compiler:cli"))
|
||||
testCompile(project(":compiler:cli-js"))
|
||||
testCompile(project(":compiler:serialization"))
|
||||
testCompile(project(":compiler:fir:entrypoint"))
|
||||
testCompile(project(":compiler:backend.jvm.entrypoint"))
|
||||
testCompile(projectTests(":compiler:test-infrastructure-utils"))
|
||||
testCompile(project(":kotlin-preloader"))
|
||||
testCompile(commonDep("com.android.tools:r8"))
|
||||
testApi(kotlinStdlib("jdk8"))
|
||||
testApi(project(":kotlin-scripting-compiler"))
|
||||
testApi(project(":core:descriptors"))
|
||||
testApi(project(":core:descriptors.jvm"))
|
||||
testApi(project(":core:deserialization"))
|
||||
testApi(project(":compiler:util"))
|
||||
testApi(project(":compiler:tests-mutes"))
|
||||
testApi(project(":compiler:backend"))
|
||||
testApi(project(":compiler:ir.ir2cfg"))
|
||||
testApi(project(":compiler:frontend"))
|
||||
testApi(project(":compiler:frontend.java"))
|
||||
testApi(project(":compiler:util"))
|
||||
testApi(project(":compiler:psi"))
|
||||
testApi(project(":compiler:cli-common"))
|
||||
testApi(project(":compiler:cli"))
|
||||
testApi(project(":compiler:cli-js"))
|
||||
testApi(project(":compiler:serialization"))
|
||||
testApi(project(":compiler:fir:entrypoint"))
|
||||
testApi(project(":compiler:backend.jvm.entrypoint"))
|
||||
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
||||
testApi(project(":kotlin-preloader"))
|
||||
testApi(commonDep("com.android.tools:r8"))
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
|
||||
testCompile(intellijDep()) {
|
||||
testApi(intellijDep()) {
|
||||
includeJars(
|
||||
"jps-model",
|
||||
"extensions",
|
||||
|
||||
@@ -6,17 +6,17 @@ plugins {
|
||||
val testJvm6ServerRuntime by configurations.creating
|
||||
|
||||
dependencies {
|
||||
testCompile(projectTests(":compiler"))
|
||||
testApi(projectTests(":compiler"))
|
||||
testApi(projectTests(":compiler:test-infrastructure"))
|
||||
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
||||
testApi(projectTests(":compiler:tests-compiler-utils"))
|
||||
testCompile(projectTests(":compiler:tests-common-new"))
|
||||
testApi(projectTests(":compiler:tests-common-new"))
|
||||
|
||||
testApiJUnit5(vintageEngine = true, runner = true, suiteApi = true)
|
||||
|
||||
testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testRuntime(project(":kotlin-reflect"))
|
||||
testRuntime(intellijDep())
|
||||
testRuntimeOnly(project(":kotlin-reflect"))
|
||||
testRuntimeOnly(intellijDep())
|
||||
testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))
|
||||
}
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testCompile(project(":kotlin-scripting-compiler"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testApi(project(":kotlin-scripting-compiler"))
|
||||
testApi(projectTests(":compiler:tests-common"))
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testCompile(projectTests(":generators:test-generator"))
|
||||
testRuntime(project(":kotlin-reflect"))
|
||||
testApi(projectTests(":generators:test-generator"))
|
||||
testRuntimeOnly(project(":kotlin-reflect"))
|
||||
testRuntimeOnly(toolsJar())
|
||||
testRuntime(intellijDep())
|
||||
testRuntimeOnly(intellijDep())
|
||||
testRuntimeOnly(intellijPluginDep("java"))
|
||||
if (isIdeaActive) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
|
||||
}
|
||||
|
||||
@@ -4,21 +4,21 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testCompile(projectTests(":compiler"))
|
||||
testApi(projectTests(":compiler"))
|
||||
testImplementation(projectTests(":compiler:test-infrastructure"))
|
||||
testImplementation(projectTests(":compiler:tests-common-new"))
|
||||
|
||||
testCompile(intellijDep()) {
|
||||
testApi(intellijDep()) {
|
||||
includeJars("groovy", "groovy-xml", rootProject = rootProject)
|
||||
}
|
||||
testCompile(intellijDep()) {
|
||||
testApi(intellijDep()) {
|
||||
includeJars("gson", rootProject = rootProject)
|
||||
}
|
||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
testRuntimeOnly(intellijPluginDep("java"))
|
||||
compile("org.jsoup:jsoup:1.14.2")
|
||||
api("org.jsoup:jsoup:1.14.2")
|
||||
if (isIdeaActive) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
|
||||
testRuntime(project(":kotlin-reflect"))
|
||||
testRuntimeOnly(project(":kotlin-reflect"))
|
||||
|
||||
testApiJUnit5(vintageEngine = true)
|
||||
}
|
||||
|
||||
@@ -11,9 +11,9 @@ dependencies {
|
||||
compileOnly(project(":core:deserialization"))
|
||||
compileOnly(project(":compiler:serialization"))
|
||||
|
||||
compile(kotlinStdlib())
|
||||
compile(project(":kotlin-util-io"))
|
||||
compile(project(":kotlin-util-klib"))
|
||||
api(kotlinStdlib())
|
||||
api(project(":kotlin-util-io"))
|
||||
api(project(":kotlin-util-klib"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -6,8 +6,8 @@ plugins {
|
||||
description = "Common klib reader and writer"
|
||||
|
||||
dependencies {
|
||||
compile(kotlinStdlib())
|
||||
compile(project(":kotlin-util-io"))
|
||||
api(kotlinStdlib())
|
||||
api(project(":kotlin-util-io"))
|
||||
testImplementation(commonDep("junit:junit"))
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ dependencies {
|
||||
testImplementation(projectTests(":generators:test-generator"))
|
||||
|
||||
testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") }
|
||||
testRuntimeOnly(compile(intellijDep()) { includeJars("jna", rootProject = rootProject) })
|
||||
testRuntimeOnly(intellijDep()) { includeJars("jna", rootProject = rootProject) }
|
||||
}
|
||||
|
||||
val generationRoot = projectDir.resolve("tests-gen")
|
||||
|
||||
@@ -4,7 +4,7 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:frontend"))
|
||||
api(project(":compiler:frontend"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
|
||||
@@ -4,9 +4,9 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:fir:raw-fir:psi2fir"))
|
||||
compile(project(":compiler:fir:resolve"))
|
||||
compile(project(":compiler:visualizer:common"))
|
||||
api(project(":compiler:fir:raw-fir:psi2fir"))
|
||||
api(project(":compiler:fir:resolve"))
|
||||
api(project(":compiler:visualizer:common"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:visualizer:common"))
|
||||
compile(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
api(project(":compiler:visualizer:common"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
Reference in New Issue
Block a user