diff options
| author | Yuriy Solodkyy <solodkyy@google.com> | 2021-02-09 12:35:15 +0000 |
|---|---|---|
| committer | Yuriy Solodkyy <solodkyy@google.com> | 2021-02-09 20:39:19 +0000 |
| commit | 04f1c5604c8311d8fd41dd89278f8f82a244c53d (patch) | |
| tree | 2f830c8cd1194ad9246b205d75a417fab0b46fc7 /project-system-gradle-psd/BUILD | |
| parent | 202b86b3d56c0d1203ec4eae8d6696da50624f97 (diff) | |
| download | idea-04f1c5604c8311d8fd41dd89278f8f82a244c53d.tar.gz | |
Fix AS test compatibility with Gradle Tooling API 6.7+ (part 2)
This change is a follow-up to I94dc9c67de7edee1ab6de5ac1def7bd5be0c6d08,
which brings `studio-plugin-gradle` to the top of module dependency
lists where it has been already present. However, since many tests
that depend on `studio-plugin-Kotlin` also depend on
`studio-plugin-gradle` indirectly the previous change is not enough.
This change adds a compile scope dependency on `studio-plugin-gradle` to
any test module that depends on `studio-plugin-Kotlin` if it also
depends on `studio-plugin-gradle`. The dependency is added before any
direct or transitive dependencies on the Kotlin plugin but preferably
after the dependency on `studio-sdk`.
Any existing test scope dependencies on `studio-plugin-gradle` are
are replaced with compile scope dependencies. This is required to make
sure that no compile scope dependency brings the Kotlin plugin to the
classpath before the Gradle plugin via the production part of an iml
module on which the test part implicitly depends on.
Bug: 179161606
Test: n/a
Change-Id: Icf4ef210bce62aec1e5b5ceafe0a4da63eeac053
Diffstat (limited to 'project-system-gradle-psd/BUILD')
| -rw-r--r-- | project-system-gradle-psd/BUILD | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/project-system-gradle-psd/BUILD b/project-system-gradle-psd/BUILD index 7397a134437..ce306c32bf0 100644 --- a/project-system-gradle-psd/BUILD +++ b/project-system-gradle-psd/BUILD @@ -36,6 +36,7 @@ iml_module( # do not sort: must match IML order deps = [ "//prebuilts/studio/intellij-sdk:studio-sdk", + "//prebuilts/studio/intellij-sdk:studio-sdk-plugin-gradle", "//tools/adt/idea/project-system-gradle-psd:intellij.android.projectSystem.gradle.psd[module, test]", "//tools/adt/idea/.idea/libraries:truth[test]", ], |