commit 2cfa0198ebacd4a9e964d29e90966ecd848f281f
author laurentlb <laurentlb@google.com> Fri Apr 26 06:34:47 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Apr 26 06:35:49 2019 -0700
tree 5387c13bd0f6c1fd634ea303a41406b81528d3fc
parent cbe6aeddd2eff1c642896e92c570b997387d8efa

Enable --incompatible_depset_union by default in Bazel.

Fixes https://github.com/bazelbuild/bazel/issues/5817

RELNOTES[INC]: --incompatible_depset_union is enabled by default.

PiperOrigin-RevId: 245411420

src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index deb1d5f..9785c84 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -182,7 +182,7 @@
 
   @Option(
       name = "incompatible_depset_union",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
       metadataTags = {

src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index 7aa8453..66aa24f 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -226,7 +226,7 @@
           .experimentalStarlarkConfigTransitions(false)
           .incompatibleBzlDisallowLoadAfterStatement(true)
           .incompatibleDepsetIsNotIterable(false)
-          .incompatibleDepsetUnion(false)
+          .incompatibleDepsetUnion(true)
           .incompatibleDisableThirdPartyLicenseChecking(true)
           .incompatibleDisableDeprecatedAttrParams(false)
           .incompatibleDisableObjcProviderResources(false)

src/main/java/com/google/devtools/build/skydoc/SkydocMain.java

diff --git a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
index 93a0b68..13e7565 100644
--- a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
+++ b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
@@ -168,6 +168,7 @@
         OptionsParser.newOptionsParser(StarlarkSemanticsOptions.class, SkydocOptions.class);
     parser.parseAndExitUponError(args);
     StarlarkSemanticsOptions semanticsOptions = parser.getOptions(StarlarkSemanticsOptions.class);
+    semanticsOptions.incompatibleDepsetUnion = false;
     SkydocOptions skydocOptions = parser.getOptions(SkydocOptions.class);
 
     String targetFileLabelString;