summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEsteban de la Canal <estebandlc@google.com>2021-02-01 19:36:39 -0800
committerEsteban de la Canal <estebandlc@google.com>2021-02-01 19:36:39 -0800
commit44512f050a17b08d9756eed05d29b26575ac2b96 (patch)
tree5dbd8216cbd7496b589c9a5774dd34173c014290
parent8459064beb81bd1df04d620f1e8d7ce5982efd29 (diff)
downloadsamples-mirror-goog-studio-master-dev.tar.gz
This change removes the Guava library from the tools/adt/idea project. Guava is provided by the IntelliJ platform instead. Currently we use a custom Guava as a dependency but then we don't bundle it and use what is provided by the platform. In fact both Guava libraries are in the class path when running tests. Bug: 179064916 Test: Removing a library, existing tests should pass with the other one Change-Id: I1a4bf2abe24359a6711aa25eef4e6fe7ee3ceb8a
-rw-r--r--BUILD1
-rw-r--r--google-samples.iml1
2 files changed, 0 insertions, 2 deletions
diff --git a/BUILD b/BUILD
index 03a4bb1..b85127e 100644
--- a/BUILD
+++ b/BUILD
@@ -10,7 +10,6 @@ iml_module(
# do not sort: must match IML order
deps = [
"//prebuilts/studio/intellij-sdk:studio-sdk",
- "//tools/adt/idea/.idea/libraries:Guava",
"//tools/adt/idea/android:intellij.android.core[module]",
"//tools/studio/google/cloud/tools/google-login-plugin:google-login-as[module]",
"//tools/adt/idea/.idea/libraries:mockito[test]",
diff --git a/google-samples.iml b/google-samples.iml
index bc6904f..bb412bf 100644
--- a/google-samples.iml
+++ b/google-samples.iml
@@ -10,7 +10,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="library" name="studio-sdk" level="project" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Guava" level="project" />
<orderEntry type="module" module-name="intellij.android.core" />
<orderEntry type="module" module-name="google-login-as" />
<orderEntry type="library" scope="TEST" name="mockito" level="project" />