Skip to content

Commit b3ec5aa

Browse files
brentleyjonesbrentleyjones
committed
Use @build_bazel_apple_support//constraints:device in selects
Signed-off-by: Brentley Jones <github@brentleyjones.com>
1 parent 9e989ae commit b3ec5aa

File tree

9 files changed

+14
-75
lines changed

9 files changed

+14
-75
lines changed

‎examples/integration/AppClip/BUILD‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ config_setting(
1717
},
1818
)
1919

20-
config_setting(
21-
name = "device_build",
22-
values = {
23-
"cpu": "ios_arm64",
24-
},
25-
)
26-
2720
ios_app_clip(
2821
name = "AppClip",
2922
app_icons = glob(["Assets.xcassets/AppIcon.appiconset/**"]),
@@ -34,7 +27,7 @@ ios_app_clip(
3427
infoplists = [":Info.plist"],
3528
minimum_os_version = "15.0",
3629
provisioning_profile = select({
37-
":device_build": ":xcode_profile",
30+
"@build_bazel_apple_support//constraints:device": ":xcode_profile",
3831
"//conditions:default": None,
3932
}),
4033
resources = [":ResourceGroup"],

‎examples/integration/ExtensionKitExtension/BUILD‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ load(
88
"TEAMID",
99
)
1010

11-
config_setting(
12-
name = "device_build",
13-
values = {
14-
"cpu": "ios_arm64",
15-
},
16-
)
17-
1811
ios_extension(
1912
name = "ExtensionKitExtension",
2013
bundle_id = "{}.extensionkit-extension".format(IOS_BUNDLE_ID),
@@ -23,7 +16,7 @@ ios_extension(
2316
infoplists = [":Info.plist"],
2417
minimum_os_version = "15.0",
2518
provisioning_profile = select({
26-
":device_build": ":xcode_profile",
19+
"@build_bazel_apple_support//constraints:device": ":xcode_profile",
2720
"//conditions:default": None,
2821
}),
2922
version = "//iOSApp:Version",

‎examples/integration/WidgetExtension/BUILD‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,14 @@ load(
1313
"TEAMID",
1414
)
1515

16-
config_setting(
17-
name = "device_build",
18-
values = {
19-
"cpu": "ios_arm64",
20-
},
21-
)
22-
2316
ios_extension(
2417
name = "WidgetExtension",
2518
bundle_id = "{}.widget-extension".format(IOS_BUNDLE_ID),
2619
families = ["iphone"],
2720
infoplists = ["Info.plist"],
2821
minimum_os_version = "15.0",
2922
provisioning_profile = select({
30-
":device_build": ":xcode_profile",
23+
"@build_bazel_apple_support//constraints:device": ":xcode_profile",
3124
"//conditions:default": None,
3225
}),
3326
resources = [":ResourceGroup"],

‎examples/integration/iOSApp/Source/BUILD‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ config_setting(
2020
},
2121
)
2222

23-
config_setting(
24-
name = "device_build",
25-
values = {
26-
"cpu": "ios_arm64",
27-
},
28-
)
29-
3023
ios_application(
3124
name = "iOSApp",
3225
alternate_icons = glob(["AltIcons/AltIcon-60.alticon/**"]),
@@ -48,7 +41,7 @@ ios_application(
4841
}),
4942
entitlements = "ios app.entitlements",
5043
executable_name = select({
51-
":device_build": None,
44+
"@build_bazel_apple_support//constraints:device": None,
5245
"//conditions:default": "iOSApp_ExecutableName",
5346
}),
5447
extensions = [
@@ -62,16 +55,18 @@ ios_application(
6255
],
6356
infoplists = [":Info.plist"],
6457
launch_images = select({
65-
":device_build": glob(["launch_images_ios.xcassets/**"]),
58+
"@build_bazel_apple_support//constraints:device": glob(
59+
["launch_images_ios.xcassets/**"],
60+
),
6661
"//conditions:default": [],
6762
}),
6863
launch_storyboard = select({
69-
":device_build": None,
64+
"@build_bazel_apple_support//constraints:device": None,
7065
"//conditions:default": "Launch.storyboard",
7166
}),
7267
minimum_os_version = "15.0",
7368
provisioning_profile = select({
74-
":device_build": ":xcode_profile",
69+
"@build_bazel_apple_support//constraints:device": ":xcode_profile",
7570
"//conditions:default": None,
7671
}),
7772
resources = [

‎examples/integration/tvOSApp/Source/BUILD‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ config_setting(
1515
},
1616
)
1717

18-
config_setting(
19-
name = "device_build",
20-
values = {
21-
"cpu": "tvos_arm64",
22-
},
23-
)
24-
2518
tvos_application(
2619
name = "tvOSApp",
2720
bundle_id = TVOS_BUNDLE_ID,
@@ -30,7 +23,7 @@ tvos_application(
3023
infoplists = [":Info.plist"],
3124
minimum_os_version = "15.0",
3225
provisioning_profile = select({
33-
":device_build": ":xcode_profile",
26+
"@build_bazel_apple_support//constraints:device": ":xcode_profile",
3427
"//conditions:default": None,
3528
}),
3629
resources = ["//tvOSApp/Resources:ResourceGroup"],

‎examples/integration/watchOSApp/BUILD‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ load(
88
"WATCHOS_BUNDLE_ID",
99
)
1010

11-
config_setting(
12-
name = "device_build",
13-
values = {
14-
"cpu": "watchos_arm64_32",
15-
},
16-
)
17-
1811
watchos_application(
1912
name = "watchOSApp",
2013
app_icons = ["AppIcon.xcassets"],
@@ -23,7 +16,7 @@ watchos_application(
2316
infoplists = [":infoplist"],
2417
minimum_os_version = "8.0",
2518
provisioning_profile = select({
26-
":device_build": ":xcode_profile",
19+
"@build_bazel_apple_support//constraints:device": ":xcode_profile",
2720
"//conditions:default": None,
2821
}),
2922
version = "//iOSApp:Version",

‎examples/integration/watchOSAppExtension/BUILD‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ config_setting(
1616
},
1717
)
1818

19-
config_setting(
20-
name = "device_build",
21-
values = {
22-
"cpu": "watchos_arm64_32",
23-
},
24-
)
25-
2619
watchos_extension(
2720
name = "watchOSAppExtension",
2821
bundle_id = "{}.extension".format(WATCHOS_BUNDLE_ID),
@@ -31,7 +24,7 @@ watchos_extension(
3124
minimum_deployment_os_version = "8.0",
3225
minimum_os_version = "7.0",
3326
provisioning_profile = select({
34-
":device_build": ":xcode_profile",
27+
"@build_bazel_apple_support//constraints:device": ":xcode_profile",
3528
"//conditions:default": None,
3629
}),
3730
resources = [":ResourceGroup"],

‎examples/rules_ios/WidgetExtension/BUILD‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,14 @@ load(
1919
"TEAMID",
2020
)
2121

22-
config_setting(
23-
name = "device_build",
24-
values = {
25-
"cpu": "ios_arm64",
26-
},
27-
)
28-
2922
rules_ios_ios_extension(
3023
name = "WidgetExtension",
3124
bundle_id = "{}.widget-extension".format(IOS_BUNDLE_ID),
3225
families = ["iphone"],
3326
infoplists = ["Info.plist"],
3427
minimum_os_version = "15.0",
3528
provisioning_profile = select({
36-
":device_build": ":xcode_profile",
29+
"@build_bazel_apple_support//constraints:device": ":xcode_profile",
3730
"//conditions:default": None,
3831
}),
3932
resources = [":ResourceGroup"],

‎examples/rules_ios/iOSApp/Source/BUILD‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@ config_setting(
2323
},
2424
)
2525

26-
config_setting(
27-
name = "device_build",
28-
values = {
29-
"cpu": "ios_arm64",
30-
},
31-
)
32-
3326
rules_ios_ios_application(
3427
name = "iOSApp",
3528
app_icons = glob(["Assets.xcassets/AppIcon.appiconset/**"]),
@@ -43,7 +36,7 @@ rules_ios_ios_application(
4336
launch_storyboard = "Launch.storyboard",
4437
minimum_os_version = "15.0",
4538
provisioning_profile = select({
46-
":device_build": ":xcode_profile",
39+
"@build_bazel_apple_support//constraints:device": ":xcode_profile",
4740
"//conditions:default": None,
4841
}),
4942
resource_bundles = {

0 commit comments

Comments
 (0)