commit 09928d60075649358f297cc329f95d81e3949f57
author laurentlb <laurentlb@google.com> Fri May 24 12:50:54 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri May 24 12:52:07 2019 -0700
tree 554c8719c0517d8c0d4bbcfa952282321111e9e0
parent 669460db5ded637715fa2e4cc857b7a37b931b3e

Flip the flag --incompatible_disable_deprecated_attr_params

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

RELNOTES: --incompatible_disable_deprecated_attr_params is now enabled by default (#5818)
PiperOrigin-RevId: 249883035

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 96d8b5d..68fdb14 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
@@ -198,7 +198,7 @@
 
   @Option(
       name = "incompatible_disable_deprecated_attr_params",
-      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 52e07b8..9114c0a 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
@@ -224,7 +224,7 @@
           .incompatibleDepsetIsNotIterable(false)
           .incompatibleDepsetUnion(true)
           .incompatibleDisableThirdPartyLicenseChecking(true)
-          .incompatibleDisableDeprecatedAttrParams(false)
+          .incompatibleDisableDeprecatedAttrParams(true)
           .incompatibleDisableObjcProviderResources(true)
           .incompatibleDisallowDictPlus(true)
           .incompatibleDisallowFileType(true)

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 13e7565..d45368d 100644
--- a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
+++ b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
@@ -169,6 +169,7 @@
     parser.parseAndExitUponError(args);
     StarlarkSemanticsOptions semanticsOptions = parser.getOptions(StarlarkSemanticsOptions.class);
     semanticsOptions.incompatibleDepsetUnion = false;
+    semanticsOptions.incompatibleDisableDeprecatedAttrParams = false;
     SkydocOptions skydocOptions = parser.getOptions(SkydocOptions.class);
 
     String targetFileLabelString;

src/test/py/bazel/action_temp_test.py

diff --git a/src/test/py/bazel/action_temp_test.py b/src/test/py/bazel/action_temp_test.py
index 92655bc..3f859f2 100644
--- a/src/test/py/bazel/action_temp_test.py
+++ b/src/test/py/bazel/action_temp_test.py
@@ -171,8 +171,8 @@
         'foorule = rule(',
         '    implementation=_impl,',
         '    attrs={"tool": attr.label(executable=True, cfg="host",',
-        '                              allow_files=True, single_file=True),',
-        '           "src": attr.label(allow_files=True, single_file=True)},',
+        '                              allow_single_file=True),',
+        '           "src": attr.label(allow_single_file=True)},',
         '    outputs={"out": "%{name}.txt"},',
         ')',
     ])

src/test/shell/bazel/bazel_sandboxing_test.sh

diff --git a/src/test/shell/bazel/bazel_sandboxing_test.sh b/src/test/shell/bazel/bazel_sandboxing_test.sh
index d2fa83d..93f096e 100755
--- a/src/test/shell/bazel/bazel_sandboxing_test.sh
+++ b/src/test/shell/bazel/bazel_sandboxing_test.sh
@@ -194,7 +194,7 @@
 skylark_breaks1 = rule(
   _skylark_breaks1_impl,
   attrs = {
-    "input": attr.label(mandatory=True, allow_files=True, single_file=True),
+    "input": attr.label(mandatory=True, allow_single_file=True),
     "output": attr.output(mandatory=True),
     "action_tags": attr.string_list(),
   },

src/test/shell/bazel/local_repository_test.sh

diff --git a/src/test/shell/bazel/local_repository_test.sh b/src/test/shell/bazel/local_repository_test.sh
index 2aa08a9..2f596fd 100755
--- a/src/test/shell/bazel/local_repository_test.sh
+++ b/src/test/shell/bazel/local_repository_test.sh
@@ -706,8 +706,7 @@
             default=Label("@other//:a/b"),
             executable=True,
             cfg="host",
-            allow_files=True,
-            single_file=True)
+            allow_single_file=True)
     },
     outputs = {'sh': "%{name}.sh"},
     implementation = impl,