From 6121d156a1c1a7205954d8209ea03432b6438f39 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 31 May 2021 10:32:21 +0300 Subject: [PATCH] [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) --- libraries/tools/kotlin-gradle-statistics/build.gradle.kts | 8 +++++++- plugins/uast-kotlin/build.gradle.kts | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts index 18ceba29f1d..46d5c7c950a 100644 --- a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts @@ -12,7 +12,13 @@ dependencies { sourceSets { "main" { projectDefault() } - "test" { projectDefault() } + "test" { + if (kotlinBuildProperties.isJpsBuildEnabled) { + none() + } else { + projectDefault() + } + } } projectTest { diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index 5bdeb845a63..9e6f67cb3ac 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -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) }