commit 7d35be2643785d2c1dd4c9226325a1c1bbff64ba
author Damien Martin-Guillerez <damienmg@users.noreply.github.com> Thu Feb 16 05:47:36 2017 -0800
committer GitHub <noreply@github.com> Thu Feb 16 05:47:36 2017 -0800
tree f82178a2a2ada9cb1c20faa05ac2bcf0a6cab875
parent 162fa07ca995d1eeeeaeb30d7a2a7f7bcff806ce

Update bazel options to work better with latest bazel (0.4.4) (#28)

- `--watchfs` is no longer a startup option
  - Removed now default `--strategy=Javac=worker` and `--experimental_interleave_loading_and_analysis`
  - Removed not useful `--noexperimental_check_output_files`

com.google.devtools.bazel.e4b/src/com/google/devtools/bazel/e4b/command/BazelCommand.java

diff --git a/com.google.devtools.bazel.e4b/src/com/google/devtools/bazel/e4b/command/BazelCommand.java b/com.google.devtools.bazel.e4b/src/com/google/devtools/bazel/e4b/command/BazelCommand.java
index dfe2d8d..ea6b3bd 100644
--- a/com.google.devtools.bazel.e4b/src/com/google/devtools/bazel/e4b/command/BazelCommand.java
+++ b/com.google.devtools.bazel.e4b/src/com/google/devtools/bazel/e4b/command/BazelCommand.java
@@ -56,9 +56,7 @@
 
   private static final File ASPECT_WORKSPACE = getAspectWorkspace();
   private static final List<String> BUILD_OPTIONS =
-      ImmutableList.of("--experimental_interleave_loading_and_analysis", "--strategy=Javac=worker",
-          "--noexperimental_check_output_files",
-          "--aspects=tools/must/be/unique/e4b_aspect.bzl%e4b_aspect");
+      ImmutableList.of("--watchfs", "--aspects=tools/must/be/unique/e4b_aspect.bzl%e4b_aspect");
   private static final List<String> ASPECT_OPTIONS = ImmutableList
       .<String>builder().addAll(BUILD_OPTIONS).add("-k",
           "--output_groups=ide-info-text,ide-resolve,-_,-defaults", "--experimental_show_artifacts")
@@ -287,7 +285,7 @@
       File directory, List<String> args, Function<String, String> selector)
           throws IOException, InterruptedException {
     Command command = Command.builder().setConsoleName(getConsoleName(type, directory))
-        .setDirectory(directory).addArguments(bazel.toString(), "--watchfs").addArguments(args)
+        .setDirectory(directory).addArguments(bazel.toString()).addArguments(args)
         .setStdoutLineSelector(selector).build();
     if (command.run() == 0) {
       return command.getSelectedOutputLines();
@@ -299,7 +297,7 @@
       File directory, List<String> args, Function<String, String> selector)
           throws IOException, InterruptedException {
     Command command = Command.builder().setConsoleName(getConsoleName(type, directory))
-        .setDirectory(directory).addArguments(bazel.toString(), "--watchfs").addArguments(args)
+        .setDirectory(directory).addArguments(bazel.toString()).addArguments(args)
         .setStderrLineSelector(selector).build();
     if (command.run() == 0) {
       return command.getSelectedErrorLines();
@@ -310,7 +308,7 @@
   private synchronized int runBazel(ConsoleType type, File directory, List<String> args,
       OutputStream stdout, OutputStream stderr) throws IOException, InterruptedException {
     return Command.builder().setConsoleName(getConsoleName(type, directory)).setDirectory(directory)
-        .addArguments(bazel.toString(), "--watchfs").addArguments(args).setStandardOutput(stdout)
+        .addArguments(bazel.toString()).addArguments(args).setStandardOutput(stdout)
         .setStandardError(stderr).build().run();
   }