azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

generators: extract OperationsMap generator to a separate source set

Browse Source 
Refactor generators so that OperationsMapGenerator is in its own
source set with minimal dependencies.
This commit is contained in:
Ilya Gorbunov
2020-01-18 07:14:50 +03:00
parent 2251c27167
commit 7ec04a1bf9
4 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/build.gradle.kts
+49 -29
View File
@@ -4,45 +4,64 @@ plugins {
}
sourceSets {
"main" { }
"main" { java.srcDirs("main") }
"test" { projectDefault() }
}
val builtinsSourceSet = sourceSets.create("builtins") {
java.srcDir("builtins")
fun extraSourceSet(name: String, extendMain: Boolean = true): Pair<SourceSet, Configuration> {
val sourceSet = sourceSets.create(name) {
java.srcDir(name)
}
val api = configurations[sourceSet.apiConfigurationName]
if (extendMain) {
dependencies { api(mainSourceSet.output) }
configurations[sourceSet.runtimeOnlyConfigurationName]
.extendsFrom(configurations.runtimeClasspath.get())
}
return sourceSet to api
}
val builtinsCompile by configurations
val (builtinsSourceSet, builtinsApi) = extraSourceSet("builtins", extendMain = false)
val (evaluateSourceSet, evaluateApi) = extraSourceSet("evaluate")
dependencies {
compile(projectTests(":compiler:cli"))
compile(projectTests(":idea:idea-maven"))
compile(projectTests(":j2k"))
compile(projectTests(":nj2k"))
compile(projectTests(":libraries:tools:new-project-wizard:new-project-wizard-cli"))
compile(projectTests(":idea:idea-android"))
compile(projectTests(":idea:scripting-support"))
compile(projectTests(":jps-plugin"))
compile(projectTests(":plugins:jvm-abi-gen"))
compile(projectTests(":plugins:android-extensions-compiler"))
compile(projectTests(":plugins:android-extensions-ide"))
compile(projectTests(":kotlin-annotation-processing"))
compile(projectTests(":kotlin-annotation-processing-cli"))
compile(projectTests(":kotlin-allopen-compiler-plugin"))
compile(projectTests(":kotlin-noarg-compiler-plugin"))
compile(projectTests(":kotlin-sam-with-receiver-compiler-plugin"))
compile(projectTests(":kotlinx-serialization-compiler-plugin"))
compile(projectTests(":idea:jvm-debugger:jvm-debugger-test"))
compile(projectTests(":generators:test-generator"))
compile(projectTests(":idea"))
builtinsCompile("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion")
// for GeneratorsFileUtil
api(kotlinStdlib())
api(intellijDep()) { includeJars("util") }
builtinsApi("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion") { isTransitive = false }
evaluateApi(project(":core:deserialization"))
testImplementation(builtinsSourceSet.output)
testImplementation(evaluateSourceSet.output)
testImplementation(projectTests(":compiler:cli"))
testImplementation(projectTests(":idea:idea-maven"))
testImplementation(projectTests(":j2k"))
testImplementation(projectTests(":nj2k"))
testImplementation(projectTests(":libraries:tools:new-project-wizard:new-project-wizard-cli"))
testImplementation(projectTests(":idea:idea-android"))
testImplementation(projectTests(":idea:scripting-support"))
testImplementation(projectTests(":jps-plugin"))
testImplementation(projectTests(":plugins:jvm-abi-gen"))
testImplementation(projectTests(":plugins:android-extensions-compiler"))
testImplementation(projectTests(":plugins:android-extensions-ide"))
testImplementation(projectTests(":kotlin-annotation-processing"))
testImplementation(projectTests(":kotlin-annotation-processing-cli"))
testImplementation(projectTests(":kotlin-allopen-compiler-plugin"))
testImplementation(projectTests(":kotlin-noarg-compiler-plugin"))
testImplementation(projectTests(":kotlin-sam-with-receiver-compiler-plugin"))
testImplementation(projectTests(":kotlinx-serialization-compiler-plugin"))
testImplementation(projectTests(":idea:jvm-debugger:jvm-debugger-test"))
testImplementation(projectTests(":generators:test-generator"))
testImplementation(projectTests(":idea"))
testCompileOnly(project(":kotlin-reflect-api"))
testCompile(builtinsSourceSet.output)
testRuntime(intellijDep()) { includeJars("idea_rt") }
testRuntime(project(":kotlin-reflect"))
testRuntimeOnly(intellijDep()) { includeJars("idea_rt") }
testRuntimeOnly(project(":kotlin-reflect"))
if (Ide.IJ()) {
testCompileOnly(jpsBuildTest())
testCompile(jpsBuildTest())
testImplementation(jpsBuildTest())
}
}
@@ -59,5 +78,6 @@ val generateProtoBufCompare by generator("org.jetbrains.kotlin.generators.protob
val generateGradleOptions by generator("org.jetbrains.kotlin.generators.arguments.GenerateGradleOptionsKt")
val generateBuiltins by generator("org.jetbrains.kotlin.generators.builtins.generateBuiltIns.GenerateBuiltInsKt", builtinsSourceSet)
val generateOperationsMap by generator("org.jetbrains.kotlin.generators.evaluate.GenerateOperationsMapKt", evaluateSourceSet)
testsJar()