Build: Fix deprecated Gradle configurations usages
for migration to Gradle 7+ #KTI-559
This commit is contained in:
@@ -5,29 +5,29 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:psi"))
|
api(project(":compiler:psi"))
|
||||||
compile(project(":compiler:fir:fir2ir"))
|
api(project(":compiler:fir:fir2ir"))
|
||||||
compile(project(":compiler:ir.tree"))
|
api(project(":compiler:ir.tree"))
|
||||||
compile(project(":compiler:fir:resolve"))
|
api(project(":compiler:fir:resolve"))
|
||||||
compile(project(":compiler:fir:checkers"))
|
api(project(":compiler:fir:checkers"))
|
||||||
compile(project(":compiler:fir:checkers:checkers.jvm"))
|
api(project(":compiler:fir:checkers:checkers.jvm"))
|
||||||
compile(project(":compiler:fir:java"))
|
api(project(":compiler:fir:java"))
|
||||||
compile(project(":analysis:low-level-api-fir"))
|
api(project(":analysis:low-level-api-fir"))
|
||||||
compile(project(":analysis:analysis-api"))
|
api(project(":analysis:analysis-api"))
|
||||||
compile(project(":compiler:light-classes"))
|
api(project(":compiler:light-classes"))
|
||||||
compile(intellijCoreDep())
|
api(intellijCoreDep())
|
||||||
implementation(project(":analysis:analysis-api-providers"))
|
implementation(project(":analysis:analysis-api-providers"))
|
||||||
|
|
||||||
testCompile(projectTests(":analysis:low-level-api-fir"))
|
testApi(projectTests(":analysis:low-level-api-fir"))
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompile(projectTests(":compiler:test-infrastructure-utils"))
|
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
||||||
testCompile(projectTests(":compiler:test-infrastructure"))
|
testApi(projectTests(":compiler:test-infrastructure"))
|
||||||
testCompile(projectTests(":compiler:tests-common-new"))
|
testApi(projectTests(":compiler:tests-common-new"))
|
||||||
testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
|
testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
|
||||||
testCompile(project(":kotlin-test:kotlin-test-junit"))
|
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||||
testCompile(toolsJar())
|
testApi(toolsJar())
|
||||||
testApiJUnit5()
|
testApiJUnit5()
|
||||||
testRuntime(project(":analysis:symbol-light-classes"))
|
testRuntimeOnly(project(":analysis:symbol-light-classes"))
|
||||||
|
|
||||||
testRuntimeOnly(intellijDep()) {
|
testRuntimeOnly(intellijDep()) {
|
||||||
includeJars(
|
includeJars(
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ dependencies {
|
|||||||
compileOnly(project(":analysis:low-level-api-fir"))
|
compileOnly(project(":analysis:low-level-api-fir"))
|
||||||
implementation(project(":analysis:analysis-api-providers"))
|
implementation(project(":analysis:analysis-api-providers"))
|
||||||
|
|
||||||
compile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
api(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
|
|||||||
@@ -4,35 +4,35 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:psi"))
|
api(project(":compiler:psi"))
|
||||||
implementation(project(":analysis:project-structure"))
|
implementation(project(":analysis:project-structure"))
|
||||||
compile(project(":compiler:fir:fir2ir"))
|
api(project(":compiler:fir:fir2ir"))
|
||||||
compile(project(":compiler:fir:fir2ir:jvm-backend"))
|
api(project(":compiler:fir:fir2ir:jvm-backend"))
|
||||||
compile(project(":compiler:ir.serialization.common"))
|
api(project(":compiler:ir.serialization.common"))
|
||||||
compile(project(":compiler:fir:resolve"))
|
api(project(":compiler:fir:resolve"))
|
||||||
compile(project(":compiler:fir:checkers"))
|
api(project(":compiler:fir:checkers"))
|
||||||
compile(project(":compiler:fir:checkers:checkers.jvm"))
|
api(project(":compiler:fir:checkers:checkers.jvm"))
|
||||||
compile(project(":compiler:fir:java"))
|
api(project(":compiler:fir:java"))
|
||||||
compile(project(":compiler:backend.common.jvm"))
|
api(project(":compiler:backend.common.jvm"))
|
||||||
testCompile(project(":analysis:analysis-api-fir"))
|
testApi(project(":analysis:analysis-api-fir"))
|
||||||
implementation(project(":compiler:ir.psi2ir"))
|
implementation(project(":compiler:ir.psi2ir"))
|
||||||
implementation(project(":compiler:fir:entrypoint"))
|
implementation(project(":compiler:fir:entrypoint"))
|
||||||
implementation(project(":analysis:analysis-api-providers"))
|
implementation(project(":analysis:analysis-api-providers"))
|
||||||
|
|
||||||
compile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
api(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
||||||
|
|
||||||
|
|
||||||
testCompile(projectTests(":compiler:test-infrastructure-utils"))
|
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
||||||
testCompile(projectTests(":compiler:test-infrastructure"))
|
testApi(projectTests(":compiler:test-infrastructure"))
|
||||||
testCompile(projectTests(":compiler:tests-common-new"))
|
testApi(projectTests(":compiler:tests-common-new"))
|
||||||
|
|
||||||
testImplementation("org.opentest4j:opentest4j:1.2.0")
|
testImplementation("org.opentest4j:opentest4j:1.2.0")
|
||||||
testCompile(toolsJar())
|
testApi(toolsJar())
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
|
testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
|
||||||
testCompile(project(":kotlin-test:kotlin-test-junit"))
|
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||||
testApiJUnit5()
|
testApiJUnit5()
|
||||||
testCompile(project(":kotlin-reflect"))
|
testApi(project(":kotlin-reflect"))
|
||||||
testImplementation(project(":analysis:symbol-light-classes"))
|
testImplementation(project(":analysis:symbol-light-classes"))
|
||||||
|
|
||||||
testRuntimeOnly(intellijDep()) {
|
testRuntimeOnly(intellijDep()) {
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(commonDep("org.apache.ant", "ant"))
|
api(commonDep("org.apache.ant", "ant"))
|
||||||
compile(project(":kotlin-preloader"))
|
api(project(":kotlin-preloader"))
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -9,15 +9,15 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(projectTests(":compiler:tests-common"))
|
api(projectTests(":compiler:tests-common"))
|
||||||
compile(project(":compiler:cli"))
|
api(project(":compiler:cli"))
|
||||||
compile(intellijCoreDep()) { includeJars("intellij-core") }
|
api(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compile(jpsStandalone()) { includeJars("jps-model") }
|
api(jpsStandalone()) { includeJars("jps-model") }
|
||||||
compile(intellijPluginDep("java"))
|
api(intellijPluginDep("java"))
|
||||||
compile(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
api(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
||||||
compile("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:$benchmarks_version")
|
api("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:$benchmarks_version")
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -19,11 +19,11 @@ dependencies {
|
|||||||
compileOnly(project(":kotlin-reflect-api"))
|
compileOnly(project(":kotlin-reflect-api"))
|
||||||
|
|
||||||
testCompileOnly(project(":compiler:cli-common"))
|
testCompileOnly(project(":compiler:cli-common"))
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompile(commonDep("junit:junit"))
|
testApi(commonDep("junit:junit"))
|
||||||
testCompile(protobufFull())
|
testApi(protobufFull())
|
||||||
testCompile(kotlinStdlib())
|
testApi(kotlinStdlib())
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testImplementation(project(":kotlin-reflect"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ import plugins.mainPublicationName
|
|||||||
private const val MAGIC_DO_NOT_CHANGE_TEST_JAR_TASK_NAME = "testJar"
|
private const val MAGIC_DO_NOT_CHANGE_TEST_JAR_TASK_NAME = "testJar"
|
||||||
|
|
||||||
fun Project.testsJar(body: Jar.() -> Unit = {}): Jar {
|
fun Project.testsJar(body: Jar.() -> Unit = {}): Jar {
|
||||||
val testsJarCfg = configurations.getOrCreate("tests-jar").extendsFrom(configurations["testCompile"])
|
val testsJarCfg = configurations.getOrCreate("tests-jar").extendsFrom(configurations["testApi"])
|
||||||
|
|
||||||
return task<Jar>(MAGIC_DO_NOT_CHANGE_TEST_JAR_TASK_NAME) {
|
return task<Jar>(MAGIC_DO_NOT_CHANGE_TEST_JAR_TASK_NAME) {
|
||||||
dependsOn("testClasses")
|
dependsOn("testClasses")
|
||||||
|
|||||||
@@ -142,14 +142,14 @@ fun DependencyHandler.jpsLikeJarDependency(
|
|||||||
JpsDepScope.COMPILE -> {
|
JpsDepScope.COMPILE -> {
|
||||||
if (exported) {
|
if (exported) {
|
||||||
add("api", dependencyNotation, dependencyConfiguration)
|
add("api", dependencyNotation, dependencyConfiguration)
|
||||||
add("testCompile", dependencyNotation, dependencyConfiguration)
|
add("testApi", dependencyNotation, dependencyConfiguration)
|
||||||
} else {
|
} else {
|
||||||
add("implementation", dependencyNotation, dependencyConfiguration)
|
add("implementation", dependencyNotation, dependencyConfiguration)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
JpsDepScope.TEST -> {
|
JpsDepScope.TEST -> {
|
||||||
if (exported) {
|
if (exported) {
|
||||||
add("testCompile", dependencyNotation, dependencyConfiguration)
|
add("testApi", dependencyNotation, dependencyConfiguration)
|
||||||
} else {
|
} else {
|
||||||
add("testImplementation", dependencyNotation, dependencyConfiguration)
|
add("testImplementation", dependencyNotation, dependencyConfiguration)
|
||||||
}
|
}
|
||||||
@@ -160,7 +160,7 @@ fun DependencyHandler.jpsLikeJarDependency(
|
|||||||
JpsDepScope.PROVIDED -> {
|
JpsDepScope.PROVIDED -> {
|
||||||
if (exported) {
|
if (exported) {
|
||||||
add("compileOnlyApi", dependencyNotation, dependencyConfiguration)
|
add("compileOnlyApi", dependencyNotation, dependencyConfiguration)
|
||||||
add("testCompile", dependencyNotation, dependencyConfiguration)
|
add("testApi", dependencyNotation, dependencyConfiguration)
|
||||||
} else {
|
} else {
|
||||||
add("compileOnly", dependencyNotation, dependencyConfiguration)
|
add("compileOnly", dependencyNotation, dependencyConfiguration)
|
||||||
add("testImplementation", dependencyNotation, dependencyConfiguration)
|
add("testImplementation", dependencyNotation, dependencyConfiguration)
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ abstract class IntelliJInstrumentCodeTask : ConventionTask() {
|
|||||||
|
|
||||||
// Instrumentation needs to have access to sources of forms for inclusion
|
// Instrumentation needs to have access to sources of forms for inclusion
|
||||||
private val depSourceDirectorySets by lazy {
|
private val depSourceDirectorySets by lazy {
|
||||||
project.configurations["compile"].dependencies.withType(ProjectDependency::class.java)
|
project.configurations["api"].dependencies.withType(ProjectDependency::class.java)
|
||||||
.map { p -> p.dependencyProject.mainSourceSet.allSource.sourceDirectories }
|
.map { p -> p.dependencyProject.mainSourceSet.allSource.sourceDirectories }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,37 +6,37 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile(project(":core:descriptors"))
|
testApi(project(":core:descriptors"))
|
||||||
testCompile(project(":core:descriptors.jvm"))
|
testApi(project(":core:descriptors.jvm"))
|
||||||
testCompile(project(":compiler:util"))
|
testApi(project(":compiler:util"))
|
||||||
testCompile(project(":compiler:cli"))
|
testApi(project(":compiler:cli"))
|
||||||
testCompile(project(":compiler:frontend"))
|
testApi(project(":compiler:frontend"))
|
||||||
testCompile(project(":compiler:backend"))
|
testApi(project(":compiler:backend"))
|
||||||
testCompile(project(":compiler:incremental-compilation-impl"))
|
testApi(project(":compiler:incremental-compilation-impl"))
|
||||||
testCompile(project(":compiler:frontend.java"))
|
testApi(project(":compiler:frontend.java"))
|
||||||
|
|
||||||
testCompile(kotlinStdlib())
|
testApi(kotlinStdlib())
|
||||||
testCompile(project(":kotlin-reflect"))
|
testApi(project(":kotlin-reflect"))
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompile(commonDep("junit:junit"))
|
testApi(commonDep("junit:junit"))
|
||||||
testApi(projectTests(":compiler:test-infrastructure"))
|
testApi(projectTests(":compiler:test-infrastructure"))
|
||||||
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
||||||
testApi(projectTests(":compiler:tests-compiler-utils"))
|
testApi(projectTests(":compiler:tests-compiler-utils"))
|
||||||
testApi(projectTests(":compiler:tests-common-new"))
|
testApi(projectTests(":compiler:tests-common-new"))
|
||||||
|
|
||||||
testCompile(commonDep("junit:junit"))
|
testApi(commonDep("junit:junit"))
|
||||||
|
|
||||||
testCompile(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) }
|
testApi(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) }
|
||||||
testCompile(intellijDep()) { includeJars("groovy", rootProject = rootProject) }
|
testApi(intellijDep()) { includeJars("groovy", rootProject = rootProject) }
|
||||||
|
|
||||||
testCompile(intellijPluginDep("java")) { includeJars("jps-builders") }
|
testApi(intellijPluginDep("java")) { includeJars("jps-builders") }
|
||||||
testCompile(jpsStandalone()) { includeJars("jps-model") }
|
testApi(jpsStandalone()) { includeJars("jps-model") }
|
||||||
testCompile(jpsBuildTest())
|
testApi(jpsBuildTest())
|
||||||
|
|
||||||
testRuntimeOnly(compile(intellijCoreDep()) { includeJars("intellij-core") })
|
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testRuntimeOnly(compile(intellijDep()) { includeJars("jna", rootProject = rootProject) })
|
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 {
|
sourceSets {
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":core:descriptors"))
|
api(project(":core:descriptors"))
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,12 +4,12 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":kotlin-annotations-jvm"))
|
api(project(":kotlin-annotations-jvm"))
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:backend-common"))
|
api(project(":compiler:backend-common"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:frontend.java"))
|
api(project(":compiler:frontend.java"))
|
||||||
compile(project(":compiler:serialization"))
|
api(project(":compiler:serialization"))
|
||||||
api(project(":compiler:backend.common.jvm"))
|
api(project(":compiler:backend.common.jvm"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
|
||||||
compileOnly(intellijDep()) { includeJars("trove4j", 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
|
val antLauncherJar by configurations.creating
|
||||||
|
|
||||||
dependencies {
|
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"))
|
testApi(project(":kotlin-script-runtime"))
|
||||||
testCompile(project(":kotlin-test:kotlin-test-jvm"))
|
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-jvm"))
|
||||||
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
|
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompile(projectTests(":compiler:fir:raw-fir:psi2fir"))
|
testApi(projectTests(":compiler:fir:raw-fir:psi2fir"))
|
||||||
testCompile(projectTests(":compiler:fir:raw-fir:light-tree2fir"))
|
testApi(projectTests(":compiler:fir:raw-fir:light-tree2fir"))
|
||||||
testCompile(projectTests(":compiler:fir:fir2ir"))
|
testApi(projectTests(":compiler:fir:fir2ir"))
|
||||||
testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
|
testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
|
||||||
testCompile(projectTests(":generators:test-generator"))
|
testApi(projectTests(":generators:test-generator"))
|
||||||
testCompile(project(":compiler:ir.ir2cfg"))
|
testApi(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
|
testApi(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"))
|
testApi(project(":kotlin-scripting-compiler"))
|
||||||
testCompile(project(":kotlin-script-util"))
|
testApi(project(":kotlin-script-util"))
|
||||||
testCompileOnly(project(":kotlin-reflect-api"))
|
testCompileOnly(project(":kotlin-reflect-api"))
|
||||||
otherCompilerModules.forEach {
|
otherCompilerModules.forEach {
|
||||||
testCompileOnly(project(it))
|
testCompileOnly(project(it))
|
||||||
@@ -41,8 +41,8 @@ dependencies {
|
|||||||
|
|
||||||
testRuntimeOnly(intellijPluginDep("java"))
|
testRuntimeOnly(intellijPluginDep("java"))
|
||||||
|
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testImplementation(project(":kotlin-reflect"))
|
||||||
testRuntime(toolsJar())
|
testImplementation(toolsJar())
|
||||||
|
|
||||||
antLauncherJar(commonDep("org.apache.ant", "ant"))
|
antLauncherJar(commonDep("org.apache.ant", "ant"))
|
||||||
antLauncherJar(toolsJar())
|
antLauncherJar(toolsJar())
|
||||||
|
|||||||
@@ -4,35 +4,35 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:cli-common"))
|
api(project(":compiler:cli-common"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:frontend.java"))
|
api(project(":compiler:frontend.java"))
|
||||||
compile(project(":compiler:frontend:cfg"))
|
api(project(":compiler:frontend:cfg"))
|
||||||
compile(project(":compiler:backend-common"))
|
api(project(":compiler:backend-common"))
|
||||||
compile(project(":compiler:backend"))
|
api(project(":compiler:backend"))
|
||||||
compile(project(":compiler:backend.jvm"))
|
api(project(":compiler:backend.jvm"))
|
||||||
implementation(project(":compiler:backend.jvm.lower"))
|
implementation(project(":compiler:backend.jvm.lower"))
|
||||||
implementation(project(":compiler:backend.jvm.entrypoint"))
|
implementation(project(":compiler:backend.jvm.entrypoint"))
|
||||||
compile(project(":compiler:ir.backend.common"))
|
api(project(":compiler:ir.backend.common"))
|
||||||
compile(project(":compiler:light-classes"))
|
api(project(":compiler:light-classes"))
|
||||||
compile(project(":compiler:serialization"))
|
api(project(":compiler:serialization"))
|
||||||
compile(project(":compiler:plugin-api"))
|
api(project(":compiler:plugin-api"))
|
||||||
compile(project(":compiler:javac-wrapper"))
|
api(project(":compiler:javac-wrapper"))
|
||||||
compile(project(":js:js.translator"))
|
api(project(":js:js.translator"))
|
||||||
compile(project(":native:frontend.native"))
|
api(project(":native:frontend.native"))
|
||||||
compile(commonDep("org.fusesource.jansi", "jansi"))
|
api(commonDep("org.fusesource.jansi", "jansi"))
|
||||||
compile(commonDep("org.jline", "jline"))
|
api(commonDep("org.jline", "jline"))
|
||||||
compile(project(":compiler:fir:raw-fir:psi2fir"))
|
api(project(":compiler:fir:raw-fir:psi2fir"))
|
||||||
compile(project(":compiler:fir:resolve"))
|
api(project(":compiler:fir:resolve"))
|
||||||
compile(project(":compiler:fir:java"))
|
api(project(":compiler:fir:java"))
|
||||||
implementation(project(":compiler:fir:entrypoint"))
|
implementation(project(":compiler:fir:entrypoint"))
|
||||||
compile(project(":compiler:fir:fir2ir"))
|
api(project(":compiler:fir:fir2ir"))
|
||||||
compile(project(":compiler:fir:fir2ir:jvm-backend"))
|
api(project(":compiler:fir:fir2ir:jvm-backend"))
|
||||||
compile(project(":compiler:fir:checkers"))
|
api(project(":compiler:fir:checkers"))
|
||||||
compile(project(":compiler:fir:checkers:checkers.jvm"))
|
api(project(":compiler:fir:checkers:checkers.jvm"))
|
||||||
compile(project(":kotlin-util-klib"))
|
api(project(":kotlin-util-klib"))
|
||||||
compile(project(":kotlin-util-io"))
|
api(project(":kotlin-util-io"))
|
||||||
|
|
||||||
// TODO: as soon as cli-jvm is extracted out of this module, move this dependency there
|
// TODO: as soon as cli-jvm is extracted out of this module, move this dependency there
|
||||||
compileOnly(project(":compiler:ir.tree.impl"))
|
compileOnly(project(":compiler:ir.tree.impl"))
|
||||||
@@ -41,10 +41,10 @@ dependencies {
|
|||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
||||||
|
|
||||||
testCompile(project(":compiler:backend"))
|
testApi(project(":compiler:backend"))
|
||||||
testCompile(project(":compiler:cli"))
|
testApi(project(":compiler:cli"))
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompile(commonDep("junit:junit"))
|
testApi(commonDep("junit:junit"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":core:util.runtime"))
|
api(project(":core:util.runtime"))
|
||||||
compile(project(":compiler:config"))
|
api(project(":compiler:config"))
|
||||||
compile(project(":compiler:config.jvm"))
|
api(project(":compiler:config.jvm"))
|
||||||
compile(project(":js:js.config"))
|
api(project(":js:js.config"))
|
||||||
compile(project(":native:kotlin-native-utils"))
|
api(project(":native:kotlin-native-utils"))
|
||||||
compileOnly(project(":kotlin-reflect-api"))
|
compileOnly(project(":kotlin-reflect-api"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
||||||
|
|||||||
@@ -4,20 +4,20 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:cli-common"))
|
api(project(":compiler:cli-common"))
|
||||||
compile(project(":compiler:cli"))
|
api(project(":compiler:cli"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:backend-common"))
|
api(project(":compiler:backend-common"))
|
||||||
compile(project(":compiler:ir.backend.common"))
|
api(project(":compiler:ir.backend.common"))
|
||||||
compile(project(":compiler:ir.serialization.js"))
|
api(project(":compiler:ir.serialization.js"))
|
||||||
compile(project(":compiler:ir.tree.impl"))
|
api(project(":compiler:ir.tree.impl"))
|
||||||
compile(project(":compiler:backend.js"))
|
api(project(":compiler:backend.js"))
|
||||||
compile(project(":compiler:backend.wasm"))
|
api(project(":compiler:backend.wasm"))
|
||||||
compile(project(":js:js.translator"))
|
api(project(":js:js.translator"))
|
||||||
compile(project(":js:js.serializer"))
|
api(project(":js:js.serializer"))
|
||||||
compile(project(":js:js.dce"))
|
api(project(":js:js.dce"))
|
||||||
compile(project(":js:js.sourcemap"))
|
api(project(":js:js.sourcemap"))
|
||||||
|
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -6,17 +6,17 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":kotlin-build-common"))
|
api(project(":kotlin-build-common"))
|
||||||
compileOnly(project(":compiler:cli-common"))
|
compileOnly(project(":compiler:cli-common"))
|
||||||
compileOnly(project(":kotlin-preloader"))
|
compileOnly(project(":kotlin-preloader"))
|
||||||
compileOnly(project(":compiler:frontend.java"))
|
compileOnly(project(":compiler:frontend.java"))
|
||||||
compileOnly(project(":daemon-common"))
|
compileOnly(project(":daemon-common"))
|
||||||
compileOnly(project(":daemon-common-new"))
|
compileOnly(project(":daemon-common-new"))
|
||||||
compile(projectRuntimeJar(":kotlin-daemon-client"))
|
api(projectRuntimeJar(":kotlin-daemon-client"))
|
||||||
compileOnly(project(":compiler:util"))
|
compileOnly(project(":compiler:util"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable"))
|
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 {
|
sourceSets {
|
||||||
|
|||||||
@@ -4,17 +4,17 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":core:util.runtime"))
|
api(project(":core:util.runtime"))
|
||||||
compile(commonDep("javax.inject"))
|
api(commonDep("javax.inject"))
|
||||||
compileOnly(kotlinStdlib())
|
compileOnly(kotlinStdlib())
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testCompile(kotlinStdlib())
|
testApi(kotlinStdlib())
|
||||||
testCompileOnly("org.jetbrains:annotations:13.0")
|
testCompileOnly("org.jetbrains:annotations:13.0")
|
||||||
testCompile(project(":kotlin-test:kotlin-test-jvm"))
|
testApi(project(":kotlin-test:kotlin-test-jvm"))
|
||||||
testCompile(project(":kotlin-test:kotlin-test-junit"))
|
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||||
testCompile(commonDep("junit:junit"))
|
testApi(commonDep("junit:junit"))
|
||||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testRuntime(intellijDep()) { includeJars("trove4j", "util") }
|
testRuntimeOnly(intellijDep()) { includeJars("trove4j", "util") }
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ plugins {
|
|||||||
val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra
|
val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(commonDep("org.fusesource.jansi", "jansi"))
|
api(commonDep("org.fusesource.jansi", "jansi"))
|
||||||
compile(commonDep("org.jline", "jline"))
|
api(commonDep("org.jline", "jline"))
|
||||||
|
|
||||||
compileOnly(project(":compiler:cli"))
|
compileOnly(project(":compiler:cli"))
|
||||||
compileOnly(project(":compiler:cli-js"))
|
compileOnly(project(":compiler:cli-js"))
|
||||||
|
|||||||
@@ -37,10 +37,10 @@ dependencies {
|
|||||||
nativePlatformVariants.forEach {
|
nativePlatformVariants.forEach {
|
||||||
embedded(commonDep("net.rubygrapefruit", "native-platform", "-$it"))
|
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
|
isTransitive = false
|
||||||
}
|
}
|
||||||
compile(commonDep("io.ktor", "ktor-network")) {
|
api(commonDep("io.ktor", "ktor-network")) {
|
||||||
ktorExcludesForDaemon.forEach { (group, module) ->
|
ktorExcludesForDaemon.forEach { (group, module) ->
|
||||||
exclude(group = group, module = module)
|
exclude(group = group, module = module)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,13 +8,13 @@ val ktorExcludesForDaemon: List<Pair<String, String>> by rootProject.extra
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(project(":daemon-common"))
|
compileOnly(project(":daemon-common"))
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
||||||
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
||||||
isTransitive = false
|
isTransitive = false
|
||||||
}
|
}
|
||||||
compile(commonDep("io.ktor", "ktor-network")) {
|
api(commonDep("io.ktor", "ktor-network")) {
|
||||||
ktorExcludesForDaemon.forEach { (group, module) ->
|
ktorExcludesForDaemon.forEach { (group, module) ->
|
||||||
exclude(group = group, module = module)
|
exclude(group = group, module = module)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:cli-common"))
|
api(project(":compiler:cli-common"))
|
||||||
compile(project(":kotlin-build-common"))
|
api(project(":kotlin-build-common"))
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compileOnly(project(":js:js.config"))
|
compileOnly(project(":js:js.config"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
|
||||||
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
||||||
isTransitive = false
|
isTransitive = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,23 +9,23 @@ plugins {
|
|||||||
val ktorExcludesForDaemon: List<Pair<String, String>> by rootProject.extra
|
val ktorExcludesForDaemon: List<Pair<String, String>> by rootProject.extra
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile(project(":kotlin-test:kotlin-test-jvm"))
|
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-jvm"))
|
||||||
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
|
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
|
||||||
testCompile(projectRuntimeJar(":kotlin-daemon-client"))
|
testApi(projectRuntimeJar(":kotlin-daemon-client"))
|
||||||
testCompile(projectRuntimeJar(":kotlin-daemon-client-new"))
|
testApi(projectRuntimeJar(":kotlin-daemon-client-new"))
|
||||||
testCompileOnly(project(":kotlin-daemon"))
|
testCompileOnly(project(":kotlin-daemon"))
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
|
testApi(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
|
||||||
testCompile(commonDep("io.ktor", "ktor-network")) {
|
testApi(commonDep("io.ktor", "ktor-network")) {
|
||||||
ktorExcludesForDaemon.forEach { (group, module) ->
|
ktorExcludesForDaemon.forEach { (group, module) ->
|
||||||
exclude(group = group, module = module)
|
exclude(group = group, module = module)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
testRuntime(project(":kotlin-daemon"))
|
testImplementation(project(":kotlin-daemon"))
|
||||||
testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
|
testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -122,5 +122,5 @@ val jmhExec by tasks.registering(JavaExec::class) {
|
|||||||
workingDir = rootDir
|
workingDir = rootDir
|
||||||
systemProperty("idea.home.path", project.intellijRootDir().absolutePath)
|
systemProperty("idea.home.path", project.intellijRootDir().absolutePath)
|
||||||
systemProperty("idea.max.intellisense.filesize", 5000 * 1024)
|
systemProperty("idea.max.intellisense.filesize", 5000 * 1024)
|
||||||
configurations.plusAssign(project.configurations["compile"])
|
configurations.plusAssign(project.configurations["api"])
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:config"))
|
api(project(":compiler:config"))
|
||||||
compile(project(":compiler:container"))
|
api(project(":compiler:container"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,12 +4,12 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":core:descriptors"))
|
api(project(":core:descriptors"))
|
||||||
compile(project(":core:descriptors.jvm"))
|
api(project(":core:descriptors.jvm"))
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:config.jvm"))
|
api(project(":compiler:config.jvm"))
|
||||||
compile("javax.annotation:jsr250-api:1.0")
|
api("javax.annotation:jsr250-api:1.0")
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
api(project(":compiler:resolution.common.jvm"))
|
api(project(":compiler:resolution.common.jvm"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
|
compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
|
||||||
|
|||||||
@@ -4,18 +4,18 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":kotlin-annotations-jvm"))
|
api(project(":kotlin-annotations-jvm"))
|
||||||
compile(project(":core:descriptors"))
|
api(project(":core:descriptors"))
|
||||||
compile(project(":core:deserialization"))
|
api(project(":core:deserialization"))
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:config"))
|
api(project(":compiler:config"))
|
||||||
compile(project(":compiler:container"))
|
api(project(":compiler:container"))
|
||||||
compile(project(":compiler:resolution"))
|
api(project(":compiler:resolution"))
|
||||||
compile(project(":compiler:psi"))
|
api(project(":compiler:psi"))
|
||||||
compile(project(":compiler:frontend.common"))
|
api(project(":compiler:frontend.common"))
|
||||||
compile(project(":compiler:frontend.common-psi"))
|
api(project(":compiler:frontend.common-psi"))
|
||||||
compile(project(":kotlin-script-runtime"))
|
api(project(":kotlin-script-runtime"))
|
||||||
compile(commonDep("io.javaslang","javaslang"))
|
api(commonDep("io.javaslang","javaslang"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
|
compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
|
compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,28 +5,28 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":core:descriptors"))
|
api(project(":core:descriptors"))
|
||||||
compile(project(":core:descriptors.jvm"))
|
api(project(":core:descriptors.jvm"))
|
||||||
compile(project(":core:deserialization"))
|
api(project(":core:deserialization"))
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:frontend.java"))
|
api(project(":compiler:frontend.java"))
|
||||||
compile(project(":compiler:cli"))
|
api(project(":compiler:cli"))
|
||||||
compile(project(":compiler:cli-js"))
|
api(project(":compiler:cli-js"))
|
||||||
compile(project(":kotlin-build-common"))
|
api(project(":kotlin-build-common"))
|
||||||
compile(project(":daemon-common"))
|
api(project(":daemon-common"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
|
|
||||||
testCompile(commonDep("junit:junit"))
|
testApi(commonDep("junit:junit"))
|
||||||
testCompile(project(":kotlin-test:kotlin-test-junit"))
|
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||||
testCompile(kotlinStdlib())
|
testApi(kotlinStdlib())
|
||||||
testCompile(projectTests(":kotlin-build-common"))
|
testApi(projectTests(":kotlin-build-common"))
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
|
testApi(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testCompile(intellijDep()) { includeJars("log4j", "jdom") }
|
testApi(intellijDep()) { includeJars("log4j", "jdom") }
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
testRuntime(project(":core:descriptors.runtime"))
|
testRuntimeOnly(project(":core:descriptors.runtime"))
|
||||||
testRuntime(intellijDep()) { includeJars("lz4-java", "jna", rootProject = rootProject) }
|
testRuntimeOnly(intellijDep()) { includeJars("lz4-java", "jna", rootProject = rootProject) }
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:backend-common"))
|
api(project(":compiler:backend-common"))
|
||||||
compile(project(":compiler:ir.tree"))
|
api(project(":compiler:ir.tree"))
|
||||||
compile(project(":compiler:ir.interpreter"))
|
api(project(":compiler:ir.interpreter"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,17 +4,17 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:backend-common"))
|
api(project(":compiler:backend-common"))
|
||||||
compile(project(":compiler:ir.tree"))
|
api(project(":compiler:ir.tree"))
|
||||||
compile(project(":compiler:ir.backend.common"))
|
api(project(":compiler:ir.backend.common"))
|
||||||
compile(project(":compiler:ir.serialization.common"))
|
api(project(":compiler:ir.serialization.common"))
|
||||||
compile(project(":compiler:ir.serialization.js"))
|
api(project(":compiler:ir.serialization.js"))
|
||||||
compile(project(":compiler:ir.tree.persistent"))
|
api(project(":compiler:ir.tree.persistent"))
|
||||||
compile(project(":js:js.ast"))
|
api(project(":js:js.ast"))
|
||||||
compile(project(":js:js.frontend"))
|
api(project(":js:js.frontend"))
|
||||||
compile(project(":js:js.sourcemap"))
|
api(project(":js:js.sourcemap"))
|
||||||
|
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":kotlin-annotations-jvm"))
|
api(project(":kotlin-annotations-jvm"))
|
||||||
compile(project(":compiler:backend"))
|
api(project(":compiler:backend"))
|
||||||
compile(project(":compiler:ir.tree"))
|
api(project(":compiler:ir.tree"))
|
||||||
compile(project(":compiler:ir.backend.common"))
|
api(project(":compiler:ir.backend.common"))
|
||||||
api(project(":compiler:backend.common.jvm"))
|
api(project(":compiler:backend.common.jvm"))
|
||||||
compileOnly(project(":compiler:ir.tree.impl"))
|
compileOnly(project(":compiler:ir.tree.impl"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
|
||||||
|
|||||||
@@ -4,17 +4,17 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:backend-common"))
|
api(project(":compiler:backend-common"))
|
||||||
compile(project(":compiler:ir.tree"))
|
api(project(":compiler:ir.tree"))
|
||||||
compile(project(":compiler:ir.backend.common"))
|
api(project(":compiler:ir.backend.common"))
|
||||||
compile(project(":compiler:ir.serialization.common"))
|
api(project(":compiler:ir.serialization.common"))
|
||||||
compile(project(":compiler:ir.serialization.js"))
|
api(project(":compiler:ir.serialization.js"))
|
||||||
compile(project(":js:js.ast"))
|
api(project(":js:js.ast"))
|
||||||
compile(project(":js:js.frontend"))
|
api(project(":js:js.frontend"))
|
||||||
compile(project(":compiler:backend.js"))
|
api(project(":compiler:backend.js"))
|
||||||
compile(project(":wasm:wasm.ir"))
|
api(project(":wasm:wasm.ir"))
|
||||||
|
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:ir.tree"))
|
api(project(":compiler:ir.tree"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:backend-common"))
|
api(project(":compiler:backend-common"))
|
||||||
compile(project(":compiler:ir.tree"))
|
api(project(":compiler:ir.tree"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:ir.tree"))
|
api(project(":compiler:ir.tree"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:ir.tree"))
|
api(project(":compiler:ir.tree"))
|
||||||
compile(project(":compiler:serialization"))
|
api(project(":compiler:serialization"))
|
||||||
compile(project(":kotlin-util-klib"))
|
api(project(":kotlin-util-klib"))
|
||||||
compile(project(":kotlin-util-klib-metadata"))
|
api(project(":kotlin-util-klib-metadata"))
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
implementation(project(":compiler:psi"))
|
implementation(project(":compiler:psi"))
|
||||||
compileOnly(project(":kotlin-reflect-api"))
|
compileOnly(project(":kotlin-reflect-api"))
|
||||||
|
|
||||||
|
|||||||
@@ -7,8 +7,9 @@ dependencies {
|
|||||||
api(project(":compiler:ir.psi2ir"))
|
api(project(":compiler:ir.psi2ir"))
|
||||||
api(project(":compiler:ir.serialization.common"))
|
api(project(":compiler:ir.serialization.common"))
|
||||||
api(project(":js:js.frontend"))
|
api(project(":js:js.frontend"))
|
||||||
|
api(project(":compiler:ir.tree.persistent"))
|
||||||
|
|
||||||
implementation(project(":compiler:ir.backend.common"))
|
implementation(project(":compiler:ir.backend.common"))
|
||||||
compile(project(":compiler:ir.tree.persistent"))
|
|
||||||
compileOnly(project(":kotlin-reflect-api"))
|
compileOnly(project(":kotlin-reflect-api"))
|
||||||
|
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
|
|||||||
@@ -4,12 +4,12 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:ir.tree"))
|
api(project(":compiler:ir.tree"))
|
||||||
compile(project(":compiler:ir.serialization.common"))
|
api(project(":compiler:ir.serialization.common"))
|
||||||
compile(project(":core:descriptors.jvm"))
|
api(project(":core:descriptors.jvm"))
|
||||||
compile(project(":core:metadata.jvm"))
|
api(project(":core:metadata.jvm"))
|
||||||
implementation(project(":core:deserialization.common.jvm"))
|
implementation(project(":core:deserialization.common.jvm"))
|
||||||
compile(project(":compiler:frontend.java"))
|
api(project(":compiler:frontend.java"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend.java"))
|
api(project(":compiler:frontend.java"))
|
||||||
|
|
||||||
compileOnly(toolsJarApi())
|
compileOnly(toolsJarApi())
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:backend"))
|
api(project(":compiler:backend"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:frontend.java"))
|
api(project(":compiler:frontend.java"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
|
|
||||||
compileOnly(intellijDep()) { includeJars("platform-core-ui", "platform-util-ui") }
|
compileOnly(intellijDep()) { includeJars("platform-core-ui", "platform-util-ui") }
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,13 +10,10 @@ repositories {
|
|||||||
val jflexPath by configurations.creating
|
val jflexPath by configurations.creating
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
val compile by configurations
|
api(project(":core:compiler.common"))
|
||||||
val compileOnly by configurations
|
api(project(":compiler:util"))
|
||||||
|
api(project(":compiler:frontend.common"))
|
||||||
compile(project(":core:compiler.common"))
|
api(project(":kotlin-script-runtime"))
|
||||||
compile(project(":compiler:util"))
|
|
||||||
compile(project(":compiler:frontend.common"))
|
|
||||||
compile(project(":kotlin-script-runtime"))
|
|
||||||
|
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeJars("guava", "trove4j", rootProject = rootProject) }
|
compileOnly(intellijDep()) { includeJars("guava", "trove4j", rootProject = rootProject) }
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":core:descriptors"))
|
api(project(":core:descriptors"))
|
||||||
api(project(":compiler:resolution.common"))
|
api(project(":compiler:resolution.common"))
|
||||||
compileOnly(intellijDep()) { includeJars("trove4j") }
|
compileOnly(intellijDep()) { includeJars("trove4j") }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:resolution"))
|
api(project(":compiler:resolution"))
|
||||||
compile(project(":core:deserialization"))
|
api(project(":core:deserialization"))
|
||||||
api(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
|
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
testCompile(projectTests(":generators:test-generator"))
|
testApi(projectTests(":generators:test-generator"))
|
||||||
testApi(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
|
|
||||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ plugins {
|
|||||||
project.updateJvmTarget("1.6")
|
project.updateJvmTarget("1.6")
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
testCompile(project(":kotlin-test:kotlin-test-jvm"))
|
testApi(project(":kotlin-test:kotlin-test-jvm"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -5,59 +5,59 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile(kotlinStdlib("jdk8"))
|
testApi(kotlinStdlib("jdk8"))
|
||||||
testCompile(project(":kotlin-scripting-compiler"))
|
testApi(project(":kotlin-scripting-compiler"))
|
||||||
testCompile(project(":core:descriptors"))
|
testApi(project(":core:descriptors"))
|
||||||
testCompile(project(":core:descriptors.jvm"))
|
testApi(project(":core:descriptors.jvm"))
|
||||||
testCompile(project(":core:deserialization"))
|
testApi(project(":core:deserialization"))
|
||||||
testCompile(project(":compiler:util"))
|
testApi(project(":compiler:util"))
|
||||||
testCompile(project(":compiler:tests-mutes"))
|
testApi(project(":compiler:tests-mutes"))
|
||||||
testCompile(project(":compiler:backend"))
|
testApi(project(":compiler:backend"))
|
||||||
testCompile(project(":compiler:ir.tree.impl"))
|
testApi(project(":compiler:ir.tree.impl"))
|
||||||
testCompile(project(":compiler:fir:tree"))
|
testApi(project(":compiler:fir:tree"))
|
||||||
testCompile(project(":compiler:fir:raw-fir:psi2fir"))
|
testApi(project(":compiler:fir:raw-fir:psi2fir"))
|
||||||
testCompile(project(":compiler:fir:raw-fir:light-tree2fir"))
|
testApi(project(":compiler:fir:raw-fir:light-tree2fir"))
|
||||||
testCompile(project(":compiler:fir:fir2ir"))
|
testApi(project(":compiler:fir:fir2ir"))
|
||||||
testCompile(project(":compiler:fir:fir2ir:jvm-backend"))
|
testApi(project(":compiler:fir:fir2ir:jvm-backend"))
|
||||||
testCompile(project(":compiler:fir:fir-serialization"))
|
testApi(project(":compiler:fir:fir-serialization"))
|
||||||
testCompile(project(":compiler:fir:fir-deserialization"))
|
testApi(project(":compiler:fir:fir-deserialization"))
|
||||||
testCompile(project(":compiler:fir:cones"))
|
testApi(project(":compiler:fir:cones"))
|
||||||
testCompile(project(":compiler:fir:resolve"))
|
testApi(project(":compiler:fir:resolve"))
|
||||||
testCompile(project(":compiler:fir:checkers"))
|
testApi(project(":compiler:fir:checkers"))
|
||||||
testCompile(project(":compiler:fir:checkers:checkers.jvm"))
|
testApi(project(":compiler:fir:checkers:checkers.jvm"))
|
||||||
testCompile(project(":compiler:fir:java"))
|
testApi(project(":compiler:fir:java"))
|
||||||
testCompile(project(":compiler:fir:entrypoint"))
|
testApi(project(":compiler:fir:entrypoint"))
|
||||||
testCompile(project(":compiler:ir.ir2cfg"))
|
testApi(project(":compiler:ir.ir2cfg"))
|
||||||
testCompile(project(":compiler:frontend"))
|
testApi(project(":compiler:frontend"))
|
||||||
testCompile(project(":compiler:frontend.java"))
|
testApi(project(":compiler:frontend.java"))
|
||||||
testCompile(project(":compiler:util"))
|
testApi(project(":compiler:util"))
|
||||||
testCompile(project(":compiler:cli-common"))
|
testApi(project(":compiler:cli-common"))
|
||||||
testCompile(project(":compiler:cli"))
|
testApi(project(":compiler:cli"))
|
||||||
testCompile(project(":compiler:cli-js"))
|
testApi(project(":compiler:cli-js"))
|
||||||
testCompile(project(":compiler:light-classes"))
|
testApi(project(":compiler:light-classes"))
|
||||||
testCompile(project(":compiler:serialization"))
|
testApi(project(":compiler:serialization"))
|
||||||
testCompile(project(":kotlin-preloader"))
|
testApi(project(":kotlin-preloader"))
|
||||||
testCompile(project(":compiler:cli-common"))
|
testApi(project(":compiler:cli-common"))
|
||||||
testCompile(project(":daemon-common"))
|
testApi(project(":daemon-common"))
|
||||||
testCompile(project(":daemon-common-new"))
|
testApi(project(":daemon-common-new"))
|
||||||
testCompile(project(":js:js.serializer"))
|
testApi(project(":js:js.serializer"))
|
||||||
testCompile(project(":js:js.frontend"))
|
testApi(project(":js:js.frontend"))
|
||||||
testCompile(project(":js:js.translator"))
|
testApi(project(":js:js.translator"))
|
||||||
testCompile(project(":native:frontend.native"))
|
testApi(project(":native:frontend.native"))
|
||||||
testCompileOnly(project(":plugins:android-extensions-compiler"))
|
testCompileOnly(project(":plugins:android-extensions-compiler"))
|
||||||
testApi(projectTests(":generators:test-generator"))
|
testApi(projectTests(":generators:test-generator"))
|
||||||
testCompile(projectTests(":compiler:tests-compiler-utils"))
|
testApi(projectTests(":compiler:tests-compiler-utils"))
|
||||||
testCompile(project(":kotlin-test:kotlin-test-jvm"))
|
testApi(project(":kotlin-test:kotlin-test-jvm"))
|
||||||
testCompile(projectTests(":compiler:tests-common-jvm6"))
|
testApi(projectTests(":compiler:tests-common-jvm6"))
|
||||||
testCompile(project(":kotlin-scripting-compiler-impl"))
|
testApi(project(":kotlin-scripting-compiler-impl"))
|
||||||
testCompile(projectTests(":compiler:test-infrastructure-utils"))
|
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
||||||
testCompile(commonDep("junit:junit"))
|
testApi(commonDep("junit:junit"))
|
||||||
testCompile(commonDep("com.android.tools:r8"))
|
testApi(commonDep("com.android.tools:r8"))
|
||||||
testCompileOnly(project(":kotlin-reflect-api"))
|
testCompileOnly(project(":kotlin-reflect-api"))
|
||||||
testCompileOnly(toolsJar())
|
testCompileOnly(toolsJar())
|
||||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") }
|
testApi(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") }
|
||||||
testCompile(intellijDep()) {
|
testApi(intellijDep()) {
|
||||||
includeJars(
|
includeJars(
|
||||||
"guava",
|
"guava",
|
||||||
"trove4j",
|
"trove4j",
|
||||||
|
|||||||
@@ -5,31 +5,31 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile(kotlinStdlib("jdk8"))
|
testApi(kotlinStdlib("jdk8"))
|
||||||
testCompile(project(":kotlin-scripting-compiler"))
|
testApi(project(":kotlin-scripting-compiler"))
|
||||||
testCompile(project(":core:descriptors"))
|
testApi(project(":core:descriptors"))
|
||||||
testCompile(project(":core:descriptors.jvm"))
|
testApi(project(":core:descriptors.jvm"))
|
||||||
testCompile(project(":core:deserialization"))
|
testApi(project(":core:deserialization"))
|
||||||
testCompile(project(":compiler:util"))
|
testApi(project(":compiler:util"))
|
||||||
testCompile(project(":compiler:tests-mutes"))
|
testApi(project(":compiler:tests-mutes"))
|
||||||
testCompile(project(":compiler:backend"))
|
testApi(project(":compiler:backend"))
|
||||||
testCompile(project(":compiler:ir.ir2cfg"))
|
testApi(project(":compiler:ir.ir2cfg"))
|
||||||
testCompile(project(":compiler:frontend"))
|
testApi(project(":compiler:frontend"))
|
||||||
testCompile(project(":compiler:frontend.java"))
|
testApi(project(":compiler:frontend.java"))
|
||||||
testCompile(project(":compiler:util"))
|
testApi(project(":compiler:util"))
|
||||||
testCompile(project(":compiler:psi"))
|
testApi(project(":compiler:psi"))
|
||||||
testCompile(project(":compiler:cli-common"))
|
testApi(project(":compiler:cli-common"))
|
||||||
testCompile(project(":compiler:cli"))
|
testApi(project(":compiler:cli"))
|
||||||
testCompile(project(":compiler:cli-js"))
|
testApi(project(":compiler:cli-js"))
|
||||||
testCompile(project(":compiler:serialization"))
|
testApi(project(":compiler:serialization"))
|
||||||
testCompile(project(":compiler:fir:entrypoint"))
|
testApi(project(":compiler:fir:entrypoint"))
|
||||||
testCompile(project(":compiler:backend.jvm.entrypoint"))
|
testApi(project(":compiler:backend.jvm.entrypoint"))
|
||||||
testCompile(projectTests(":compiler:test-infrastructure-utils"))
|
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
||||||
testCompile(project(":kotlin-preloader"))
|
testApi(project(":kotlin-preloader"))
|
||||||
testCompile(commonDep("com.android.tools:r8"))
|
testApi(commonDep("com.android.tools:r8"))
|
||||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
|
|
||||||
testCompile(intellijDep()) {
|
testApi(intellijDep()) {
|
||||||
includeJars(
|
includeJars(
|
||||||
"jps-model",
|
"jps-model",
|
||||||
"extensions",
|
"extensions",
|
||||||
|
|||||||
@@ -6,17 +6,17 @@ plugins {
|
|||||||
val testJvm6ServerRuntime by configurations.creating
|
val testJvm6ServerRuntime by configurations.creating
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile(projectTests(":compiler"))
|
testApi(projectTests(":compiler"))
|
||||||
testApi(projectTests(":compiler:test-infrastructure"))
|
testApi(projectTests(":compiler:test-infrastructure"))
|
||||||
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
||||||
testApi(projectTests(":compiler:tests-compiler-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)
|
testApiJUnit5(vintageEngine = true, runner = true, suiteApi = true)
|
||||||
|
|
||||||
testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
|
testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
testRuntime(intellijDep())
|
testRuntimeOnly(intellijDep())
|
||||||
testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))
|
testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,13 +6,13 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile(project(":kotlin-scripting-compiler"))
|
testApi(project(":kotlin-scripting-compiler"))
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testCompile(projectTests(":generators:test-generator"))
|
testApi(projectTests(":generators:test-generator"))
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
testRuntimeOnly(toolsJar())
|
testRuntimeOnly(toolsJar())
|
||||||
testRuntime(intellijDep())
|
testRuntimeOnly(intellijDep())
|
||||||
testRuntimeOnly(intellijPluginDep("java"))
|
testRuntimeOnly(intellijPluginDep("java"))
|
||||||
if (isIdeaActive) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
|
if (isIdeaActive) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,21 +4,21 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile(projectTests(":compiler"))
|
testApi(projectTests(":compiler"))
|
||||||
testImplementation(projectTests(":compiler:test-infrastructure"))
|
testImplementation(projectTests(":compiler:test-infrastructure"))
|
||||||
testImplementation(projectTests(":compiler:tests-common-new"))
|
testImplementation(projectTests(":compiler:tests-common-new"))
|
||||||
|
|
||||||
testCompile(intellijDep()) {
|
testApi(intellijDep()) {
|
||||||
includeJars("groovy", "groovy-xml", rootProject = rootProject)
|
includeJars("groovy", "groovy-xml", rootProject = rootProject)
|
||||||
}
|
}
|
||||||
testCompile(intellijDep()) {
|
testApi(intellijDep()) {
|
||||||
includeJars("gson", rootProject = rootProject)
|
includeJars("gson", rootProject = rootProject)
|
||||||
}
|
}
|
||||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testRuntimeOnly(intellijPluginDep("java"))
|
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"))
|
if (isIdeaActive) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
|
|
||||||
testApiJUnit5(vintageEngine = true)
|
testApiJUnit5(vintageEngine = true)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,9 +11,9 @@ dependencies {
|
|||||||
compileOnly(project(":core:deserialization"))
|
compileOnly(project(":core:deserialization"))
|
||||||
compileOnly(project(":compiler:serialization"))
|
compileOnly(project(":compiler:serialization"))
|
||||||
|
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compile(project(":kotlin-util-io"))
|
api(project(":kotlin-util-io"))
|
||||||
compile(project(":kotlin-util-klib"))
|
api(project(":kotlin-util-klib"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ plugins {
|
|||||||
description = "Common klib reader and writer"
|
description = "Common klib reader and writer"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compile(project(":kotlin-util-io"))
|
api(project(":kotlin-util-io"))
|
||||||
testImplementation(commonDep("junit:junit"))
|
testImplementation(commonDep("junit:junit"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ dependencies {
|
|||||||
testImplementation(projectTests(":generators:test-generator"))
|
testImplementation(projectTests(":generators:test-generator"))
|
||||||
|
|
||||||
testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") }
|
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")
|
val generationRoot = projectDir.resolve("tests-gen")
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:fir:raw-fir:psi2fir"))
|
api(project(":compiler:fir:raw-fir:psi2fir"))
|
||||||
compile(project(":compiler:fir:resolve"))
|
api(project(":compiler:fir:resolve"))
|
||||||
compile(project(":compiler:visualizer:common"))
|
api(project(":compiler:visualizer:common"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:visualizer:common"))
|
api(project(":compiler:visualizer:common"))
|
||||||
compile(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ plugins {
|
|||||||
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
|
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":core:util.runtime"))
|
api(project(":core:util.runtime"))
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compile(project(":kotlin-annotations-jvm"))
|
api(project(":kotlin-annotations-jvm"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -6,13 +6,13 @@ plugins {
|
|||||||
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
|
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":kotlin-annotations-jvm"))
|
api(project(":kotlin-annotations-jvm"))
|
||||||
compile(project(":core:descriptors"))
|
api(project(":core:descriptors"))
|
||||||
compile(project(":core:deserialization"))
|
api(project(":core:deserialization"))
|
||||||
api(project(":core:compiler.common.jvm"))
|
api(project(":core:compiler.common.jvm"))
|
||||||
api(project(":core:deserialization.common.jvm"))
|
api(project(":core:deserialization.common.jvm"))
|
||||||
compile(project(":core:util.runtime"))
|
api(project(":core:util.runtime"))
|
||||||
compile(commonDep("javax.inject"))
|
api(commonDep("javax.inject"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -22,8 +22,8 @@ dependencies {
|
|||||||
compileOnly(project(":core:descriptors"))
|
compileOnly(project(":core:descriptors"))
|
||||||
compileOnly(project(":core:descriptors.jvm"))
|
compileOnly(project(":core:descriptors.jvm"))
|
||||||
|
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompile(projectTests(":generators:test-generator"))
|
testApi(projectTests(":generators:test-generator"))
|
||||||
|
|
||||||
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
|
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
|
||||||
|
|||||||
@@ -6,10 +6,10 @@ plugins {
|
|||||||
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
|
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":core:compiler.common"))
|
api(project(":core:compiler.common"))
|
||||||
compile(project(":core:util.runtime"))
|
api(project(":core:util.runtime"))
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compile(project(":kotlin-annotations-jvm"))
|
api(project(":kotlin-annotations-jvm"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ plugins {
|
|||||||
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
|
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":core:metadata"))
|
api(project(":core:metadata"))
|
||||||
api(project(":core:deserialization.common"))
|
api(project(":core:deserialization.common"))
|
||||||
compile(project(":core:util.runtime"))
|
api(project(":core:util.runtime"))
|
||||||
compile(project(":core:descriptors"))
|
api(project(":core:descriptors"))
|
||||||
compile(commonDep("javax.inject"))
|
api(commonDep("javax.inject"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ plugins {
|
|||||||
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
|
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(protobufLite())
|
api(protobufLite())
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -9,14 +9,14 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(kotlinStdlib("jdk8"))
|
api(kotlinStdlib("jdk8"))
|
||||||
|
|
||||||
testCompile(projectTests(":generators:test-generator"))
|
testApi(projectTests(":generators:test-generator"))
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompile(projectTests(":compiler:tests-spec"))
|
testApi(projectTests(":compiler:tests-spec"))
|
||||||
testCompile(projectTests("::analysis:low-level-api-fir"))
|
testApi(projectTests("::analysis:low-level-api-fir"))
|
||||||
testCompile(projectTests(":analysis:analysis-api-fir"))
|
testApi(projectTests(":analysis:analysis-api-fir"))
|
||||||
testCompile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
testApi(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
||||||
testApiJUnit5()
|
testApiJUnit5()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+24
-24
@@ -30,8 +30,8 @@ val (wasmSourceSet, wasmApi) = extraSourceSet("wasm")
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// for GeneratorsFileUtil
|
// for GeneratorsFileUtil
|
||||||
compile(kotlinStdlib("jdk8"))
|
api(kotlinStdlib("jdk8"))
|
||||||
compile(intellijDep()) { includeJars("util") }
|
api(intellijDep()) { includeJars("util") }
|
||||||
|
|
||||||
builtinsApi("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion") { isTransitive = false }
|
builtinsApi("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion") { isTransitive = false }
|
||||||
evaluateApi(project(":core:deserialization"))
|
evaluateApi(project(":core:deserialization"))
|
||||||
@@ -43,33 +43,33 @@ dependencies {
|
|||||||
protobufApi(kotlinStdlib())
|
protobufApi(kotlinStdlib())
|
||||||
protobufCompareApi(projectTests(":kotlin-build-common"))
|
protobufCompareApi(projectTests(":kotlin-build-common"))
|
||||||
|
|
||||||
testCompile(builtinsSourceSet.output)
|
testApi(builtinsSourceSet.output)
|
||||||
testCompile(evaluateSourceSet.output)
|
testApi(evaluateSourceSet.output)
|
||||||
testCompile(interpreterSourceSet.output)
|
testApi(interpreterSourceSet.output)
|
||||||
testCompile(protobufSourceSet.output)
|
testApi(protobufSourceSet.output)
|
||||||
testCompile(protobufCompareSourceSet.output)
|
testApi(protobufCompareSourceSet.output)
|
||||||
|
|
||||||
testCompile(projectTests(":compiler:cli"))
|
testApi(projectTests(":compiler:cli"))
|
||||||
testCompile(projectTests(":compiler:incremental-compilation-impl"))
|
testApi(projectTests(":compiler:incremental-compilation-impl"))
|
||||||
testCompile(projectTests(":plugins:jvm-abi-gen"))
|
testApi(projectTests(":plugins:jvm-abi-gen"))
|
||||||
testCompile(projectTests(":plugins:android-extensions-compiler"))
|
testApi(projectTests(":plugins:android-extensions-compiler"))
|
||||||
testCompile(projectTests(":plugins:parcelize:parcelize-compiler"))
|
testApi(projectTests(":plugins:parcelize:parcelize-compiler"))
|
||||||
testCompile(projectTests(":kotlin-annotation-processing"))
|
testApi(projectTests(":kotlin-annotation-processing"))
|
||||||
testCompile(projectTests(":kotlin-annotation-processing-cli"))
|
testApi(projectTests(":kotlin-annotation-processing-cli"))
|
||||||
testCompile(projectTests(":kotlin-allopen-compiler-plugin"))
|
testApi(projectTests(":kotlin-allopen-compiler-plugin"))
|
||||||
testCompile(projectTests(":kotlin-noarg-compiler-plugin"))
|
testApi(projectTests(":kotlin-noarg-compiler-plugin"))
|
||||||
testCompile(projectTests(":plugins:lombok:lombok-compiler-plugin"))
|
testApi(projectTests(":plugins:lombok:lombok-compiler-plugin"))
|
||||||
testCompile(projectTests(":kotlin-sam-with-receiver-compiler-plugin"))
|
testApi(projectTests(":kotlin-sam-with-receiver-compiler-plugin"))
|
||||||
testCompile(projectTests(":kotlinx-serialization-compiler-plugin"))
|
testApi(projectTests(":kotlinx-serialization-compiler-plugin"))
|
||||||
testCompile(projectTests(":plugins:fir:fir-plugin-prototype"))
|
testApi(projectTests(":plugins:fir:fir-plugin-prototype"))
|
||||||
testCompile(projectTests(":generators:test-generator"))
|
testApi(projectTests(":generators:test-generator"))
|
||||||
testCompileOnly(project(":kotlin-reflect-api"))
|
testCompileOnly(project(":kotlin-reflect-api"))
|
||||||
testRuntime(intellijDep()) { includeJars("idea_rt") }
|
testImplementation(intellijDep()) { includeJars("idea_rt") }
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testImplementation(project(":kotlin-reflect"))
|
||||||
|
|
||||||
if (Ide.IJ()) {
|
if (Ide.IJ()) {
|
||||||
testCompileOnly(jpsBuildTest())
|
testCompileOnly(jpsBuildTest())
|
||||||
testCompile(jpsBuildTest())
|
testApi(jpsBuildTest())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,12 +5,12 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile(intellijDep()) { includeJars("util") }
|
testApi(intellijDep()) { includeJars("util") }
|
||||||
testCompile(project(":core:util.runtime"))
|
testApi(project(":core:util.runtime"))
|
||||||
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
||||||
testCompile(kotlinStdlib())
|
testApi(kotlinStdlib())
|
||||||
testCompile(commonDep("junit:junit"))
|
testApi(commonDep("junit:junit"))
|
||||||
testCompile(project(":generators"))
|
testApi(project(":generators"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":core:descriptors"))
|
api(project(":core:descriptors"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeJars("trove4j") }
|
compileOnly(intellijDep()) { includeJars("trove4j") }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":js:js.ast"))
|
api(project(":js:js.ast"))
|
||||||
compile(project(":js:js.translator"))
|
api(project(":js:js.translator"))
|
||||||
compileOnly(project(":js:js.sourcemap"))
|
compileOnly(project(":js:js.sourcemap"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
|
compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":js:js.ast"))
|
api(project(":js:js.ast"))
|
||||||
compile(project(":js:js.translator"))
|
api(project(":js:js.translator"))
|
||||||
compile(intellijCoreDep()) { includeJars("intellij-core") }
|
api(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -4,12 +4,12 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":js:js.ast"))
|
api(project(":js:js.ast"))
|
||||||
compile(project(":js:js.parser"))
|
api(project(":js:js.parser"))
|
||||||
compile(project(":js:js.serializer"))
|
api(project(":js:js.serializer"))
|
||||||
compile(project(":js:js.config"))
|
api(project(":js:js.config"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
|
compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ plugins {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compile(project(":js:js.ast"))
|
api(project(":js:js.ast"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:serialization"))
|
api(project(":compiler:serialization"))
|
||||||
compile(project(":js:js.ast"))
|
api(project(":js:js.ast"))
|
||||||
compile(project(":js:js.config"))
|
api(project(":js:js.config"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,45 +27,45 @@ val testJsRuntime by configurations.creating {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testRuntime(intellijDep())
|
testRuntimeOnly(intellijDep())
|
||||||
|
|
||||||
testCompile(protobufFull())
|
testApi(protobufFull())
|
||||||
testCompile(projectTests(":compiler:tests-common"))
|
testApi(projectTests(":compiler:tests-common"))
|
||||||
testCompileOnly(project(":compiler:frontend"))
|
testCompileOnly(project(":compiler:frontend"))
|
||||||
testCompileOnly(project(":compiler:cli"))
|
testCompileOnly(project(":compiler:cli"))
|
||||||
testCompileOnly(project(":compiler:cli-js"))
|
testCompileOnly(project(":compiler:cli-js"))
|
||||||
testCompileOnly(project(":compiler:util"))
|
testCompileOnly(project(":compiler:util"))
|
||||||
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util") }
|
testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util") }
|
||||||
testCompile(project(":compiler:backend.js"))
|
testApi(project(":compiler:backend.js"))
|
||||||
testCompile(project(":compiler:backend.wasm"))
|
testApi(project(":compiler:backend.wasm"))
|
||||||
testCompile(project(":js:js.translator"))
|
testApi(project(":js:js.translator"))
|
||||||
testCompile(project(":js:js.serializer"))
|
testApi(project(":js:js.serializer"))
|
||||||
testCompile(project(":js:js.dce"))
|
testApi(project(":js:js.dce"))
|
||||||
testCompile(project(":js:js.engines"))
|
testApi(project(":js:js.engines"))
|
||||||
testCompile(project(":compiler:incremental-compilation-impl"))
|
testApi(project(":compiler:incremental-compilation-impl"))
|
||||||
testCompile(commonDep("junit:junit"))
|
testApi(commonDep("junit:junit"))
|
||||||
testCompile(projectTests(":kotlin-build-common"))
|
testApi(projectTests(":kotlin-build-common"))
|
||||||
testCompile(projectTests(":generators:test-generator"))
|
testApi(projectTests(":generators:test-generator"))
|
||||||
|
|
||||||
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
|
testApi(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
testCompile(project(":compiler:frontend"))
|
testApi(project(":compiler:frontend"))
|
||||||
testCompile(project(":compiler:cli"))
|
testApi(project(":compiler:cli"))
|
||||||
testCompile(project(":compiler:util"))
|
testApi(project(":compiler:util"))
|
||||||
|
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
|
|
||||||
testRuntime(intellijDep()) { includeJars("trove4j", "guava", "jdom", rootProject = rootProject) }
|
testRuntimeOnly(intellijDep()) { includeJars("trove4j", "guava", "jdom", rootProject = rootProject) }
|
||||||
|
|
||||||
testRuntime(kotlinStdlib())
|
testRuntimeOnly(kotlinStdlib())
|
||||||
testJsRuntime(kotlinStdlib("js"))
|
testJsRuntime(kotlinStdlib("js"))
|
||||||
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
|
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
|
||||||
testJsRuntime(project(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned
|
testJsRuntime(project(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned
|
||||||
}
|
}
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
testRuntime(project(":kotlin-preloader")) // it's required for ant tests
|
testRuntimeOnly(project(":kotlin-preloader")) // it's required for ant tests
|
||||||
testRuntime(project(":compiler:backend-common"))
|
testRuntimeOnly(project(":compiler:backend-common"))
|
||||||
testRuntime(commonDep("org.fusesource.jansi", "jansi"))
|
testRuntimeOnly(commonDep("org.fusesource.jansi", "jansi"))
|
||||||
|
|
||||||
antLauncherJar(commonDep("org.apache.ant", "ant"))
|
antLauncherJar(commonDep("org.apache.ant", "ant"))
|
||||||
antLauncherJar(toolsJar())
|
antLauncherJar(toolsJar())
|
||||||
|
|||||||
@@ -7,13 +7,13 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":core:descriptors"))
|
api(project(":core:descriptors"))
|
||||||
compile(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
compile(project(":compiler:frontend"))
|
api(project(":compiler:frontend"))
|
||||||
compile(project(":compiler:backend-common"))
|
api(project(":compiler:backend-common"))
|
||||||
compile(project(":js:js.ast"))
|
api(project(":js:js.ast"))
|
||||||
compile(project(":js:js.frontend"))
|
api(project(":js:js.frontend"))
|
||||||
compile(project(":js:js.parser"))
|
api(project(":js:js.parser"))
|
||||||
compileOnly(project(":js:js.sourcemap"))
|
compileOnly(project(":js:js.sourcemap"))
|
||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||||
compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
|
compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
|
||||||
|
|||||||
@@ -150,8 +150,8 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":kotlin-stdlib"))
|
api(project(":kotlin-stdlib"))
|
||||||
compile(project(":kotlin-native:Interop:Runtime"))
|
api(project(":kotlin-native:Interop:Runtime"))
|
||||||
|
|
||||||
testImplementation(kotlin("test-junit"))
|
testImplementation(kotlin("test-junit"))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,15 +75,11 @@ configurations {
|
|||||||
trove4j_jar
|
trove4j_jar
|
||||||
kotlinCommonSources
|
kotlinCommonSources
|
||||||
|
|
||||||
cli_bcRuntime {
|
cli_bcApiElements {
|
||||||
extendsFrom compilerRuntime
|
extendsFrom cli_bcApi
|
||||||
extendsFrom kotlin_script_runtime_jar
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cli_bc {
|
cli_bcApi.extendsFrom compilerApi
|
||||||
extendsFrom cli_bcRuntime
|
|
||||||
}
|
|
||||||
cli_bcCompile.extendsFrom compilerCompile
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -97,30 +93,30 @@ dependencies {
|
|||||||
kotlinCommonSources(it) { transitive = false }
|
kotlinCommonSources(it) { transitive = false }
|
||||||
}
|
}
|
||||||
|
|
||||||
compilerCompile project(":kotlin-native:utilities:basic-utils")
|
compilerApi project(":kotlin-native:utilities:basic-utils")
|
||||||
|
|
||||||
compilerCompile project(kotlinCompilerModule)
|
compilerApi project(kotlinCompilerModule)
|
||||||
compilerCompile project(":native:kotlin-native-utils")
|
compilerApi project(":native:kotlin-native-utils")
|
||||||
compilerCompile project(":core:descriptors")
|
compilerApi project(":core:descriptors")
|
||||||
compilerCompile project(":compiler:ir.tree")
|
compilerApi project(":compiler:ir.tree")
|
||||||
compilerCompile project(":compiler:ir.tree.impl")
|
compilerApi project(":compiler:ir.tree.impl")
|
||||||
compilerCompile project(":compiler:ir.backend.common")
|
compilerApi project(":compiler:ir.backend.common")
|
||||||
compilerCompile project(":compiler:util")
|
compilerApi project(":compiler:util")
|
||||||
compilerCompile project(":native:frontend.native")
|
compilerApi project(":native:frontend.native")
|
||||||
compilerCompile project(":compiler:cli-common")
|
compilerApi project(":compiler:cli-common")
|
||||||
compilerCompile project(":compiler:cli")
|
compilerApi project(":compiler:cli")
|
||||||
compilerCompile project(":kotlin-util-klib")
|
compilerApi project(":kotlin-util-klib")
|
||||||
compilerCompile project(":kotlin-util-klib-metadata")
|
compilerApi project(":kotlin-util-klib-metadata")
|
||||||
compilerCompile project(":compiler:ir.serialization.common")
|
compilerApi project(":compiler:ir.serialization.common")
|
||||||
compilerCompile project(":compiler:ir.psi2ir")
|
compilerApi project(":compiler:ir.psi2ir")
|
||||||
use(LocalDependenciesKt) {
|
use(LocalDependenciesKt) {
|
||||||
compilerCompile(intellijCoreDep()){
|
compilerApi(intellijCoreDep()){
|
||||||
artifact {
|
artifact {
|
||||||
name = "intellij-core"
|
name = "intellij-core"
|
||||||
type = "jar"
|
type = "jar"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
compilerCompile(intellijDep()){
|
compilerApi(intellijDep()){
|
||||||
artifact {
|
artifact {
|
||||||
name = "util"
|
name = "util"
|
||||||
type = "jar"
|
type = "jar"
|
||||||
@@ -130,13 +126,13 @@ dependencies {
|
|||||||
compileOnly(jpsStandalone())
|
compileOnly(jpsStandalone())
|
||||||
}
|
}
|
||||||
|
|
||||||
compilerCompile kotlinNativeInterop['llvm'].configuration
|
compilerApi kotlinNativeInterop['llvm'].configuration
|
||||||
compilerCompile kotlinNativeInterop['files'].configuration
|
compilerApi kotlinNativeInterop['files'].configuration
|
||||||
|
|
||||||
|
|
||||||
cli_bcCompile sourceSets.compiler.output
|
cli_bcApi sourceSets.compiler.output
|
||||||
|
|
||||||
cli_bc sourceSets.cli_bc.output
|
cli_bcApiElements sourceSets.cli_bc.output
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -41,14 +41,13 @@ configurations {
|
|||||||
update_tests
|
update_tests
|
||||||
update_stdlib_tests
|
update_stdlib_tests
|
||||||
|
|
||||||
compile
|
nopPluginApi
|
||||||
nopPluginCompile
|
api.extendsFrom nopPluginApi
|
||||||
compile.extendsFrom nopPluginCompile
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
|
api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
|
||||||
cli_bc project(path: ':kotlin-native:backend.native', configuration: 'cli_bc')
|
cli_bc project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements')
|
||||||
}
|
}
|
||||||
ext.testOutputRoot = rootProject.file("test.output").absolutePath
|
ext.testOutputRoot = rootProject.file("test.output").absolutePath
|
||||||
ext.externalTestsDir = project.file("build/external")
|
ext.externalTestsDir = project.file("build/external")
|
||||||
@@ -5814,23 +5813,23 @@ pluginTest("runtime_basic_init", "nopPlugin") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
nopPluginCompile project(kotlinCompilerModule)
|
nopPluginApi project(kotlinCompilerModule)
|
||||||
nopPluginCompile project(":native:kotlin-native-utils")
|
nopPluginApi project(":native:kotlin-native-utils")
|
||||||
nopPluginCompile project(":core:descriptors")
|
nopPluginApi project(":core:descriptors")
|
||||||
nopPluginCompile project(":compiler:ir.tree")
|
nopPluginApi project(":compiler:ir.tree")
|
||||||
nopPluginCompile project(":compiler:ir.tree.impl")
|
nopPluginApi project(":compiler:ir.tree.impl")
|
||||||
nopPluginCompile project(":compiler:ir.backend.common")
|
nopPluginApi project(":compiler:ir.backend.common")
|
||||||
nopPluginCompile project(":compiler:util")
|
nopPluginApi project(":compiler:util")
|
||||||
nopPluginCompile project(":native:frontend.native")
|
nopPluginApi project(":native:frontend.native")
|
||||||
nopPluginCompile project(":compiler:cli-common")
|
nopPluginApi project(":compiler:cli-common")
|
||||||
nopPluginCompile project(":compiler:cli")
|
nopPluginApi project(":compiler:cli")
|
||||||
nopPluginCompile project(":kotlin-util-klib")
|
nopPluginApi project(":kotlin-util-klib")
|
||||||
nopPluginCompile project(":kotlin-util-klib-metadata")
|
nopPluginApi project(":kotlin-util-klib-metadata")
|
||||||
nopPluginCompile project(":compiler:ir.serialization.common")
|
nopPluginApi project(":compiler:ir.serialization.common")
|
||||||
|
|
||||||
compile project(kotlinCompilerModule)
|
api project(kotlinCompilerModule)
|
||||||
compile project(path: ':kotlin-native:backend.native', configuration: 'cli_bc')
|
api project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements')
|
||||||
compile 'junit:junit:4.12'
|
api 'junit:junit:4.12'
|
||||||
}
|
}
|
||||||
|
|
||||||
project.tasks.named("test").configure {
|
project.tasks.named("test").configure {
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ repositories {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(":kotlin-stdlib")
|
implementation project(":kotlin-stdlib")
|
||||||
implementation project(path: ':kotlin-native:backend.native', configuration: 'cli_bc')
|
implementation project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements')
|
||||||
implementation project(":kotlin-native:utilities:basic-utils")
|
implementation project(":kotlin-native:utilities:basic-utils")
|
||||||
testImplementation "junit:junit:4.12"
|
testImplementation "junit:junit:4.12"
|
||||||
testImplementation project(":kotlin-test:kotlin-test-junit")
|
testImplementation project(":kotlin-test:kotlin-test-junit")
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ pill {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -12,11 +12,11 @@ pill {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':kotlin-gradle-plugin-api')
|
api project(':kotlin-gradle-plugin-api')
|
||||||
// Use this dependency instead when building apart from the other modules:
|
// Use this dependency instead when building apart from the other modules:
|
||||||
// compile "org.jetbrains.kotlin:kotlin-gradle-plugin-api:$kotlin_version"
|
// compile "org.jetbrains.kotlin:kotlin-gradle-plugin-api:$kotlin_version"
|
||||||
|
|
||||||
compile project(':kotlin-test::kotlin-test-junit')
|
api project(':kotlin-test::kotlin-test-junit')
|
||||||
|
|
||||||
compileOnly kotlinStdlib()
|
compileOnly kotlinStdlib()
|
||||||
compileOnly project(':compiler')
|
compileOnly project(':compiler')
|
||||||
|
|||||||
@@ -19,15 +19,15 @@ val compilerClasspath by configurations.creating {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testCompile(kotlinStdlib())
|
testApi(kotlinStdlib())
|
||||||
testCompile(project(":kotlin-script-runtime"))
|
testApi(project(":kotlin-script-runtime"))
|
||||||
testCompile(project(":kotlin-script-util"))
|
testApi(project(":kotlin-script-util"))
|
||||||
testCompile(projectRuntimeJar(":kotlin-daemon-client"))
|
testApi(projectRuntimeJar(":kotlin-daemon-client"))
|
||||||
testCompile(projectRuntimeJar(":kotlin-daemon-embeddable"))
|
testApi(projectRuntimeJar(":kotlin-daemon-embeddable"))
|
||||||
testCompile(projectRuntimeJar(":kotlin-compiler-embeddable"))
|
testApi(projectRuntimeJar(":kotlin-compiler-embeddable"))
|
||||||
testCompile(commonDep("junit:junit"))
|
testApi(commonDep("junit:junit"))
|
||||||
testCompile(project(":kotlin-test:kotlin-test-junit"))
|
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
compilerClasspath(project(":kotlin-reflect"))
|
compilerClasspath(project(":kotlin-reflect"))
|
||||||
compilerClasspath(kotlinStdlib())
|
compilerClasspath(kotlinStdlib())
|
||||||
compilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j"))
|
compilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j"))
|
||||||
|
|||||||
@@ -12,18 +12,18 @@ pill {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compile(project(":kotlin-script-runtime"))
|
api(project(":kotlin-script-runtime"))
|
||||||
compile(project(":kotlin-compiler-embeddable"))
|
api(project(":kotlin-compiler-embeddable"))
|
||||||
compile(project(":kotlin-script-util"))
|
api(project(":kotlin-script-util"))
|
||||||
runtime(project(":kotlin-scripting-compiler-embeddable"))
|
runtimeOnly(project(":kotlin-scripting-compiler-embeddable"))
|
||||||
testCompile(project(":kotlin-test:kotlin-test-junit"))
|
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||||
testCompile(commonDep("junit:junit"))
|
testApi(commonDep("junit:junit"))
|
||||||
testRuntime(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build)
|
compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build)
|
||||||
testCompileOnly(project(":core:util.runtime")) // TODO: fix import (workaround for jps build)
|
testCompileOnly(project(":core:util.runtime")) // TODO: fix import (workaround for jps build)
|
||||||
testCompileOnly(project(":daemon-common")) // TODO: fix import (workaround for jps build)
|
testCompileOnly(project(":daemon-common")) // TODO: fix import (workaround for jps build)
|
||||||
testRuntime(project(":kotlin-scripting-compiler-embeddable"))
|
testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable"))
|
||||||
}
|
}
|
||||||
|
|
||||||
projectTest()
|
projectTest()
|
||||||
|
|||||||
@@ -4,14 +4,14 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":examples:scripting-jvm-simple-script"))
|
api(project(":examples:scripting-jvm-simple-script"))
|
||||||
compileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
|
compileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||||
testRuntimeOnly(project(":kotlin-compiler-embeddable"))
|
testRuntimeOnly(project(":kotlin-compiler-embeddable"))
|
||||||
testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable"))
|
testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable"))
|
||||||
testRuntimeOnly(project(":kotlin-scripting-jvm-host"))
|
testRuntimeOnly(project(":kotlin-scripting-jvm-host"))
|
||||||
testRuntimeOnly(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
testRuntimeOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
|
testRuntimeOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
|
||||||
testCompile(commonDep("junit"))
|
testApi(commonDep("junit"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":examples:scripting-jvm-maven-deps"))
|
api(project(":examples:scripting-jvm-maven-deps"))
|
||||||
compile(project(":kotlin-scripting-jvm-host-unshaded"))
|
api(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compileOnly(project(":kotlin-reflect-api"))
|
compileOnly(project(":kotlin-reflect-api"))
|
||||||
compileOnly(project(":compiler:util"))
|
compileOnly(project(":compiler:util"))
|
||||||
|
|
||||||
@@ -14,7 +14,7 @@ dependencies {
|
|||||||
testRuntimeOnly(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
testRuntimeOnly(project(":kotlin-scripting-compiler"))
|
testRuntimeOnly(project(":kotlin-scripting-compiler"))
|
||||||
|
|
||||||
testCompile(commonDep("junit"))
|
testApi(commonDep("junit"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":kotlin-scripting-jvm"))
|
api(project(":kotlin-scripting-jvm"))
|
||||||
compile(project(":kotlin-scripting-dependencies"))
|
api(project(":kotlin-scripting-dependencies"))
|
||||||
compile(project(":kotlin-scripting-dependencies-maven"))
|
api(project(":kotlin-scripting-dependencies-maven"))
|
||||||
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":examples:scripting-jvm-simple-script"))
|
api(project(":examples:scripting-jvm-simple-script"))
|
||||||
compile(project(":kotlin-scripting-jvm-host-unshaded"))
|
api(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||||
compile(project(":kotlin-script-util"))
|
api(project(":kotlin-script-util"))
|
||||||
testRuntimeOnly(project(":kotlin-compiler"))
|
testRuntimeOnly(project(":kotlin-compiler"))
|
||||||
testRuntimeOnly(project(":kotlin-scripting-compiler"))
|
testRuntimeOnly(project(":kotlin-scripting-compiler"))
|
||||||
testRuntimeOnly(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
testCompile(commonDep("junit"))
|
testApi(commonDep("junit"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(project(":kotlin-scripting-jvm"))
|
api(project(":kotlin-scripting-jvm"))
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ apply plugin: 'kotlin-platform-common'
|
|||||||
JvmToolchain.updateJvmTarget(project, "1.6")
|
JvmToolchain.updateJvmTarget(project, "1.6")
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile kotlinStdlib("common")
|
api kotlinStdlib("common")
|
||||||
testCompile project(":kotlin-test:kotlin-test-common")
|
testApi project(":kotlin-test:kotlin-test-common")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {
|
tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ apply plugin: 'kotlin-platform-common'
|
|||||||
JvmToolchain.updateJvmTarget(project, "1.6")
|
JvmToolchain.updateJvmTarget(project, "1.6")
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile kotlinStdlib("common")
|
api kotlinStdlib("common")
|
||||||
testCompile project(":kotlin-test:kotlin-test-annotations-common")
|
testApi project(":kotlin-test:kotlin-test-annotations-common")
|
||||||
}
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ configurations {
|
|||||||
dependencies {
|
dependencies {
|
||||||
expectedBy project(':kotlin-test:kotlin-test-common')
|
expectedBy project(':kotlin-test:kotlin-test-common')
|
||||||
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
||||||
compile kotlinStdlib("js")
|
api kotlinStdlib("js")
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin2Js {
|
compileKotlin2Js {
|
||||||
@@ -73,7 +73,6 @@ task sourcesJar(type: Jar, dependsOn: classes) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
runtime libraryJarWithIr
|
|
||||||
archives libraryJarWithIr
|
archives libraryJarWithIr
|
||||||
distLibrary libraryJarWithIr
|
distLibrary libraryJarWithIr
|
||||||
archives sourcesJar
|
archives sourcesJar
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ apply plugin: 'kotlin-platform-js'
|
|||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
nodeModules {
|
nodeModules {
|
||||||
extendsFrom compile
|
extendsFrom api
|
||||||
attributes {
|
attributes {
|
||||||
attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, KotlinUsages.KOTLIN_RUNTIME))
|
attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, KotlinUsages.KOTLIN_RUNTIME))
|
||||||
attribute(KotlinPlatformType.attribute, KotlinPlatformType.js)
|
attribute(KotlinPlatformType.attribute, KotlinPlatformType.js)
|
||||||
@@ -21,7 +21,7 @@ configurations {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':kotlin-test:kotlin-test-js')
|
api project(':kotlin-test:kotlin-test-js')
|
||||||
}
|
}
|
||||||
|
|
||||||
// package.json contains direct links to the builddir
|
// package.json contains direct links to the builddir
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ sourceSets {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
||||||
compile project(':kotlin-test:kotlin-test-jvm')
|
api project(':kotlin-test:kotlin-test-jvm')
|
||||||
compile('junit:junit:4.12')
|
api('junit:junit:4.12')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ project.ext["jpsLibraryPath"] = rootProject.distLibDir
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
||||||
compile project(':kotlin-test:kotlin-test-jvm')
|
api project(':kotlin-test:kotlin-test-jvm')
|
||||||
|
|
||||||
compile("org.junit.jupiter:junit-jupiter-api:5.0.0")
|
api("org.junit.jupiter:junit-jupiter-api:5.0.0")
|
||||||
testRuntime("org.junit.jupiter:junit-jupiter-engine:5.2.0")
|
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.2.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
|
|||||||
@@ -16,9 +16,9 @@ sourceSets {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
expectedBy project(':kotlin-test:kotlin-test-common')
|
expectedBy project(':kotlin-test:kotlin-test-common')
|
||||||
compile kotlinStdlib()
|
api(kotlinStdlib())
|
||||||
testCompile project(":kotlin-test:kotlin-test-junit")
|
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||||
testCompile('junit:junit:4.12')
|
testApi('junit:junit:4.12')
|
||||||
}
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ sourceSets {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
||||||
compile project(':kotlin-test:kotlin-test-jvm')
|
api project(':kotlin-test:kotlin-test-jvm')
|
||||||
compile('org.testng:testng:6.13.1')
|
api('org.testng:testng:6.13.1')
|
||||||
if (includeJava9) {
|
if (includeJava9) {
|
||||||
java9CompileOnly('org.testng:testng:7.0.0')
|
java9CompileOnly('org.testng:testng:7.0.0')
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compileOnly(project(":core:metadata"))
|
compileOnly(project(":core:metadata"))
|
||||||
compileOnly(protobufLite())
|
compileOnly(protobufLite())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ val shadows by configurations.creating {
|
|||||||
isTransitive = false
|
isTransitive = false
|
||||||
}
|
}
|
||||||
configurations.getByName("compileOnly").extendsFrom(shadows)
|
configurations.getByName("compileOnly").extendsFrom(shadows)
|
||||||
configurations.getByName("testCompile").extendsFrom(shadows)
|
configurations.getByName("testApi").extendsFrom(shadows)
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
|
|||||||
@@ -25,10 +25,10 @@ val shadows by configurations.creating {
|
|||||||
isTransitive = false
|
isTransitive = false
|
||||||
}
|
}
|
||||||
configurations.getByName("compileOnly").extendsFrom(shadows)
|
configurations.getByName("compileOnly").extendsFrom(shadows)
|
||||||
configurations.getByName("testCompile").extendsFrom(shadows)
|
configurations.getByName("testApi").extendsFrom(shadows)
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
shadows(project(":kotlinx-metadata"))
|
shadows(project(":kotlinx-metadata"))
|
||||||
shadows(project(":core:compiler.common"))
|
shadows(project(":core:compiler.common"))
|
||||||
shadows(project(":core:metadata"))
|
shadows(project(":core:metadata"))
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user