[Build] Add workarounds for JPS build

Compilation of `:kotlin-gradle-statistics:test` is broken in gradle
  too, so this module is removed from JPS to allow build project with
  "Rebuild project" action

Dependency on `:kotlin-uast-base` changed to `implementation` because
  project import assumes `shadow` dependency as _Provided_ instead of
  _Compile_ in module structure which leads to problem that this
  dependency is missing during build (this is bug inside JPS itself)
This commit is contained in:
Dmitriy Novozhilov
2021-05-31 10:32:21 +03:00
parent d934c97bf5
commit 6121d156a1
2 changed files with 12 additions and 2 deletions
@@ -12,7 +12,13 @@ dependencies {
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
"test" {
if (kotlinBuildProperties.isJpsBuildEnabled) {
none()
} else {
projectDefault()
}
}
}
projectTest {
+5 -1
View File
@@ -18,7 +18,11 @@ dependencies {
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:light-classes"))
shadows(project(":plugins:uast-kotlin-base"))
if (kotlinBuildProperties.isJpsBuildEnabled) {
compile(project(":plugins:uast-kotlin-base"))
} else {
shadows(project(":plugins:uast-kotlin-base"))
}
// BEWARE: UAST should not depend on IJ platform so that it can work in Android Lint CLI mode (where IDE is not available)
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }