diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java | 7 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java | 22 |
2 files changed, 16 insertions, 13 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java index 9ef221822f..24a31d67c0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java @@ -179,11 +179,10 @@ public class AppleConfiguration extends BuildConfiguration.Fragment { /*** * @deprecated use {@link XcodeConfig#getMinimumOsForPlatformType(RuleContext, PlatformType)}. + * + * <p>This is only here because the minimum OS version is currently part of the name of the output + * directory. */ - @SkylarkCallable( - name = "minimum_os_for_platform_type", - doc = "The minimum compatible OS version for target simulator and devices for a particular " - + "platform type.") @Deprecated // Bug tracking the removal of this method: https://github.com/bazelbuild/bazel/issues/3424 public DottedVersion getMinimumOsForPlatformType(PlatformType platformType) { diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java index 826aba25e3..10d60a9827 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java @@ -396,19 +396,20 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { scratch.file( "examples/rule/apple_rules.bzl", "def swift_binary_impl(ctx):", - " ios_sdk_version = ctx.fragments.apple.sdk_version_for_platform\\", + " xcode_config = ctx.attr._xcode_config[apple_common.XcodeVersionConfig]", + " ios_sdk_version = xcode_config.sdk_version_for_platform\\", "(apple_common.platform.ios_device)", - " watchos_sdk_version = ctx.fragments.apple.sdk_version_for_platform\\", + " watchos_sdk_version = xcode_config.sdk_version_for_platform\\", "(apple_common.platform.watchos_device)", - " tvos_sdk_version = ctx.fragments.apple.sdk_version_for_platform\\", + " tvos_sdk_version = xcode_config.sdk_version_for_platform\\", "(apple_common.platform.tvos_device)", - " macos_sdk_version = ctx.fragments.apple.sdk_version_for_platform\\", + " macos_sdk_version = xcode_config.sdk_version_for_platform\\", "(apple_common.platform.macos)", - " ios_minimum_os = ctx.fragments.apple.minimum_os_for_platform_type\\", + " ios_minimum_os = xcode_config.minimum_os_for_platform_type\\", "(apple_common.platform_type.ios)", - " watchos_minimum_os = ctx.fragments.apple.minimum_os_for_platform_type\\", + " watchos_minimum_os = xcode_config.minimum_os_for_platform_type\\", "(apple_common.platform_type.watchos)", - " tvos_minimum_os = ctx.fragments.apple.minimum_os_for_platform_type\\", + " tvos_minimum_os = xcode_config.minimum_os_for_platform_type\\", "(apple_common.platform_type.tvos)", " return struct(", " ios_sdk_version=str(ios_sdk_version),", @@ -420,8 +421,10 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { " tvos_minimum_os=str(tvos_minimum_os)", " )", "swift_binary = rule(", - "implementation = swift_binary_impl,", - "fragments = ['apple']", + " implementation = swift_binary_impl,", + " fragments = ['apple'],", + " attrs = { '_xcode_config': ", + " attr.label(default=Label('//examples/apple_skylark:current_xcode_config')) },", ")"); scratch.file("examples/apple_skylark/a.m"); @@ -429,6 +432,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { "examples/apple_skylark/BUILD", "package(default_visibility = ['//visibility:public'])", "load('/examples/rule/apple_rules', 'swift_binary')", + "xcode_config_alias(name='current_xcode_config')", "swift_binary(", " name='my_target',", ")"); |