Remove Compose Compiler dependencies and refactor IDE plugin

Change-Id: Ib6b6788eec050d19172988739879eb8b294480a1

1 files changed, 37 insertions, 1 deletions

diff --git a/compose-ide-plugin/BUILD b/compose-ide-plugin/BUILD
index 14d36b32a02..20c3431a1cf 100644
--- a/compose-ide-plugin/BUILD
+++ b/compose-ide-plugin/BUILD
@@ -7,22 +7,58 @@ iml_module(
     iml_files = ["intellij.android.compose-ide-plugin.iml"],
     lint_baseline = "//tools/base/lint:studio-checks/empty_baseline.xml",
     resources = ["src/main/resources"],
+    # do not sort: must match IML order
+    test_runtime_deps = [
+        "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps",
+        "//tools/idea/plugins/groovy/jps-plugin:intellij.groovy.jps",
+        "//tools/idea/plugins/java-decompiler/plugin:intellij.java.decompiler",
+        "//tools/idea/plugins/properties:intellij.properties",
+        "//tools/idea/jvm/jvm-analysis-java-tests:intellij.jvm.analysis.java.tests",
+        "//tools/idea/uast/uast-tests:intellij.platform.uast.tests",
+        "//tools/idea/java/typeMigration:intellij.java.typeMigration",
+        "//tools/idea/java/manifest:intellij.java.manifest",
+        "//tools/idea/plugins/java-i18n:intellij.java.i18n",
+        "//tools/idea/plugins/IntelliLang:intellij.java.langInjection",
+        "//tools/idea/plugins/testng:intellij.testng",
+        "//tools/idea/plugins/junit:intellij.junit",
+        "//tools/idea:intellij.java.ui.tests",
+        "//tools/idea/plugins/coverage:intellij.java.coverage",
+        "//tools/idea/plugins/ui-designer:intellij.java.guiForms.designer",
+        "//tools/idea/plugins/groovy/groovy-psi:intellij.groovy.psi",
+        "//tools/idea/plugins/eclipse:intellij.eclipse",
+        "//tools/idea/java/plugin:intellij.java.plugin",
+        "//tools/idea/.idea/libraries:precompiled_jshell-frontend",
+    ],
     visibility = ["//visibility:public"],
     # do not sort: must match IML order
     runtime_deps = [
         "//tools/idea/.idea/libraries:delight-rhino-sandbox",
         "//tools/idea/.idea/libraries:rhino",
         "//tools/idea/.idea/libraries:netty-handler-proxy",
+        "//tools/idea/platform/credential-store:intellij.platform.credentialStore",
+        "//tools/idea/platform/lvcs-impl:intellij.platform.lvcs.impl",
+        "//tools/idea/platform/statistics/devkit:intellij.platform.statistics.devkit",
+        "//tools/idea/platform/workspaceModel-ide:intellij.platform.workspaceModel.ide",
+        "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl",
+        "//tools/idea/json:intellij.json",
+        "//tools/idea/.idea/libraries:javassist",
+        "//tools/idea/platform/diagnostic:intellij.platform.diagnostic",
+        "//tools/idea/.idea/libraries:error-prone-annotations",
+        "//tools/idea/adt-branding:intellij.android.adt.branding",
+        "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl",
+        "//tools/idea/java/ide-resources:intellij.java.ide.resources",
+        "//prebuilts/tools/common/m2/repository/com/jetbrains/intellij/documentation/tips-intellij-idea-community/201.11:jar",
+        "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8",
     ],
     # do not sort: must match IML order
     deps = [
         "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:kotlin-plugin",
-        "//prebuilts/tools/common/m2/repository/androidx/compose/compose-compiler-hosted/0.1.0-dev14:jar",
         "//tools/idea/java/java-psi-api:intellij.java.psi[module]",
         "//tools/idea/platform/core-impl:intellij.platform.core.impl[module]",
         "//tools/idea/platform/lang-api:intellij.platform.lang[module]",
         "//tools/idea/platform/projectModel-api:intellij.platform.projectModel[module]",
+        "//tools/adt/idea/project-system:intellij.android.projectSystem[module]",
     ],
 )