8000 Remove --experimental_apple_mandatory_minimum_version · coderabbit-test/bazel@dbd9e18 · GitHub
[go: up one dir, main page]
Skip to content

Commit dbd9e18

Browse files
nglevincopybara-github
nglevin
authored and
copybara-github
committed
Remove --experimental_apple_mandatory_minimum_version
This was made a no-op a year ago and was always experimental, seems nice to delete before 7.x Closes bazelbuild#19168. PiperOrigin-RevId: 555305000 Change-Id: I44b7d82df2ba3e7c9a37236d998509e08fa5909e
1 parent e6d7c16 commit dbd9e18

File tree

3 files changed

+0
-27
lines changed

3 files changed

+0
-27
lines changed

‎src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java

Lines changed: 0 additions & 11 deletions
-
effectTags = {OptionEffectTag.NO_OP},
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,6 @@
3838

3939
/** Command-line options for building for Apple platforms. */
4040
public class AppleCommandLineOptions extends FragmentOptions {
41-
@Option(
42-
name = "experimental_apple_mandatory_minimum_version",
43-
defaultValue = "false",
44-
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
45
46-
help =
47-
"No-op. Kept here for backwards compatibility. This field will be removed in a "
48-
+ "future release.")
49-
// TODO(b/37096178): This flag should be removed.
50-
public boolean mandatoryMinimumVersion;
51-
5241
@Option(
5342
name = "experimental_objc_provider_from_linked",
5443
defaultValue = "false",

‎src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public class AppleConfiguration extends Fragment implements AppleConfigurationAp
8383
private final Label xcodeConfigLabel;
8484
private final AppleCommandLineOptions options;
8585
private final AppleCpus appleCpus;
86-
private final boolean mandatoryMinimumVersion;
8786
private final String cpu;
8887

8988
public AppleConfiguration(BuildOptions buildOptions) {
@@ -95,7 +94,6 @@ public AppleConfiguration(BuildOptions buildOptions) {
9594
this.configurationDistinguisher = options.configurationDistinguisher;
9695
this.xcodeConfigLabel =
9796
Preconditions.checkNotNull(options.xcodeVersionConfig, "xcodeConfigLabel");
98-
this.mandatoryMinimumVersion = options.mandatoryMinimumVersion;
9997
// AppleConfiguration should not have this knowledge. This is a temporary workaround
10098
// for Starlarkification, until apple rules are toolchainized.
10199
this.cpu = buildOptions.get(CoreOptions.class).cpu;
@@ -422,23 +420,12 @@ public String getOutputDirectoryName() {
422420
return Joiner.on('-').join(components);
423421
}
424422

425-
/** Returns true if the minimum_os_version attribute should be mandatory on rules with linking. */
426-
@Override
427-
public boolean isMandatoryMinimumVersionForStarlark(StarlarkThread thread) throws EvalException {
428-
BuiltinRestriction.failIfCalledOutsideBuiltins(thread);
429-
return isMandatoryMinimumVersion();
430-
}
431-
432423
@Override
433424
public String getCpuForStarlark(StarlarkThread thread) throws EvalException {
434425
BuiltinRestriction.failIfCalledOutsideBuiltins(thread);
435426
return cpu;
436427
}
437428

438-
public boolean isMandatoryMinimumVersion() {
439-
return mandatoryMinimumVersion;
440-
}
441-
442429
@Override
443430
public boolean equals(Object obj) {
444431
if (this == obj) {

‎src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleConfigurationApi.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ public interface AppleConfigurationApi<ApplePlatformTypeApiT extends ApplePlatfo
7373
structField = true)
7474
String getBitcodeMode();
7575

76-
@StarlarkMethod(name = "mandatory_minimum_version", documented = false, useStarlarkThread = true)
77-
boolean isMandatoryMinimumVersionForStarlark(StarlarkThread thread) throws EvalException;
78-
7976
@StarlarkMethod(name = "cpu", documented = false, useStarlarkThread = true)
8077
String getCpuForStarlark(StarlarkThread thread) throws EvalException;
8178
}

0 commit comments

Comments
 (0)
0