commit 248106cae8143c612ddbfe0099e91d82f6949639
author David Pursehouse <dpursehouse@collab.net> Wed Nov 28 11:17:13 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed Nov 28 11:17:13 2018 +0900
tree 045c8bfed0df52c96490acd4aed633c89b671da9
parent 7a093b7bbcec36ab2b2ac7da7f8829343f2061cf
parent 141277e8b9e60b1434fd8aacbecd3f065a4c4ab1

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix Eclipse project generation

Change-Id: I34251f09c8c17a71c307e6118d990fb45e048295

.gitignore

diff --git a/.gitignore b/.gitignore
index f6006e3..acae119 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 /bazel-*
+/eclipse-out
 /target
 /.classpath
 /.project
 /.settings/org.maven.ide.eclipse.prefs
 /.settings/org.eclipse.m2e.core.prefs
 /.idea
+/.apt_generated/

tools/eclipse/BUILD

diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD
index fae4e9f..515cbeb 100644
--- a/tools/eclipse/BUILD
+++ b/tools/eclipse/BUILD
@@ -1,14 +1,16 @@
 load(
     "//tools/bzl:plugin.bzl",
     "GWT_PLUGIN_DEPS",
+    "PLUGIN_DEPS",
 )
 load("//tools/bzl:classpath.bzl", "classpath_collector")
 
 classpath_collector(
     name = "main_classpath_collect",
     testonly = 1,
-    deps = GWT_PLUGIN_DEPS + [
+    deps = PLUGIN_DEPS + GWT_PLUGIN_DEPS + [
         "//external:gwt-dev",
         "//external:gwt-user",
+        "//:serviceuser__plugin",
     ],
 )