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 587e9593398ccf..d5d4ac8a69fe62 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 @@ -77,7 +77,7 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl @Option( name = "experimental_build_setting_api", - defaultValue = "true", + defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = OptionEffectTag.BUILD_FILE_SEMANTICS, help = 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 987de0a9d95603..bde6ad9d6422f9 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 @@ -238,7 +238,7 @@ public static Builder builderWithDefaults() { public static final StarlarkSemantics DEFAULT_SEMANTICS = builder() // <== Add new options here in alphabetic order ==> - .experimentalBuildSettingApi(true) + .experimentalBuildSettingApi(false) .experimentalCcSkylarkApiEnabledPackages(ImmutableList.of()) .experimentalAllowIncrementalRepositoryUpdates(false) .experimentalEnableAndroidMigrationApis(false) diff --git a/src/test/shell/integration/starlark_configurations_test.sh b/src/test/shell/integration/starlark_configurations_test.sh index 859d514c3f3ff3..e0b2e59e1edfec 100755 --- a/src/test/shell/integration/starlark_configurations_test.sh +++ b/src/test/shell/integration/starlark_configurations_test.sh @@ -161,6 +161,19 @@ function test_dont_parse_flags_after_dash_dash() { expect_log "invalid package name '-//test_dont_parse_flags_after_dash_dash'" } +function test_doesnt_work_without_experimental_flag() { + local -r pkg=$FUNCNAME + mkdir -p $pkg + + write_build_setting_bzl + + bazel build //$pkg:my_drink --//$pkg:type=coffee > output 2>"$TEST_log" \ + && fail "Expected failure" + + expect_log "Error loading option //$pkg:type:" + expect_log "Extension file '$pkg/build_setting.bzl' has errors" +} + function test_multiple_starlark_flags() { local -r pkg=$FUNCNAME mkdir -p $pkg