commit 0aebd6a073ae53b7711ff175a4fd4f067520bc90
author cushon <cushon@google.com> Mon Apr 18 09:27:15 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 18 09:28:39 2022 -0700
tree f482af4bb805dc237d3b8812f2d5ed5c634dc7e4
parent fc43dd99faf2014f977976bef57170fedb6c9541

Normalize `--enable-preview` flags

Similar to the handling of modular flags added in https://github.com/bazelbuild/bazel/commit/90b0714d4827ac21281ba655d500f7bde78ddec5, this filters
out `--enable-preview` flags for Java 8 and earlier language levels.

https://github.com/bazelbuild/bazel/issues/15272

PiperOrigin-RevId: 442559287

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/JavacOptions.java

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/JavacOptions.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/JavacOptions.java
index 065b8aa..a0f4841 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/JavacOptions.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/JavacOptions.java
@@ -232,6 +232,7 @@
     private String target;
     private String release;
     private final List<String> modular = new ArrayList<>();
+    private boolean preview = false;
 
     @Override
     public boolean processOption(String option, Iterator<String> remaining) {
@@ -277,6 +278,10 @@
         modular.add(option);
         return true;
       }
+      if (option.equals("--enable-preview")) {
+        preview = true;
+        return true;
+      }
       return false;
     }
 
@@ -296,6 +301,9 @@
       }
       if (version > 8) {
         normalized.addAll(modular);
+        if (preview) {
+          normalized.add("--enable-preview");
+        }
       }
     }