Enable --incompatible_disallow_filetype by default.
Fixes #5831
RELNOTES: --incompatible_disallow_filetype is enabled by default.
PiperOrigin-RevId: 233808118
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
index 30ea540..bb92321 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
@@ -276,15 +276,14 @@
@Option(
name = "incompatible_disallow_filetype",
- defaultValue = "false",
+ defaultValue = "true",
documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
},
- help = "If set to true, function `FileType` is not available."
- )
+ help = "If set to true, function `FileType` is not available.")
public boolean incompatibleDisallowFileType;
@Option(
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
index 3a7882a..de054dc 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
@@ -222,7 +222,7 @@
.incompatibleDisableObjcProviderResources(false)
.incompatibleDisallowDataTransition(true)
.incompatibleDisallowDictPlus(false)
- .incompatibleDisallowFileType(false)
+ .incompatibleDisallowFileType(true)
.incompatibleDisallowLegacyJavaProvider(false)
.incompatibleDisallowLegacyJavaInfo(false)
.incompatibleDisallowLoadLabelsToCrossPackageBoundaries(false)
