Skip to content

Commit

Permalink
Move all test iOS app icons to test/testdata (#2589)
Browse files Browse the repository at this point in the history
  • Loading branch information
brentleyjones authored Nov 7, 2024
1 parent 45db53e commit 3e8e825
Show file tree
Hide file tree
Showing 20 changed files with 24 additions and 109 deletions.
4 changes: 2 additions & 2 deletions test/starlark_tests/ios_application_resources_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ If you intend to assign multiple app icons to this target, please declare which
to be the primary app icon with the primary_app_icon attribute on the rule itself.
app_icons was assigned the following: [
test/starlark_tests/resources/app_icons_with_alts_ios.xcassets/app_icon-bazel.appiconset,
test/starlark_tests/resources/app_icons_with_alts_ios.xcassets/app_icon.appiconset
test/testdata/resources/app_icons_with_alts_ios.xcassets/app_icon-bazel.appiconset,
test/testdata/resources/app_icons_with_alts_ios.xcassets/app_icon.appiconset
]
""",
tags = [name],
Expand Down
15 changes: 0 additions & 15 deletions test/starlark_tests/resources/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -554,21 +554,6 @@ filegroup(
srcs = glob(["assets.xcassets/**"]),
)

filegroup(
name = "app_icons_ios",
srcs = glob(["app_icons_ios.xcassets/**"]),
)

filegroup(
name = "alternate_icons_ios",
srcs = glob(["alticons/**"]),
)

filegroup(
name = "app_icons_with_alts_ios",
srcs = glob(["app_icons_with_alts_ios.xcassets/**"]),
)

filegroup(
name = "launch_images_ios",
srcs = glob(["launch_images_ios.xcassets/**"]),
Expand Down

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
24 changes: 12 additions & 12 deletions test/starlark_tests/targets_under_test/ios/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ ios_application(

ios_application(
name = "app",
app_icons = ["//test/starlark_tests/resources:app_icons_ios"],
app_icons = ["//test/testdata/resources:app_icons_ios"],
bundle_id = "com.google.example",
entitlements = "//test/starlark_tests/resources:entitlements.plist",
families = ["iphone"],
Expand Down Expand Up @@ -160,7 +160,7 @@ ios_application(

ios_application(
name = "app_precompiled_resource_bundle",
app_icons = ["//test/starlark_tests/resources:app_icons_ios"],
app_icons = ["//test/testdata/resources:app_icons_ios"],
bundle_id = "com.google.example",
entitlements = "//test/starlark_tests/resources:entitlements.plist",
families = ["iphone"],
Expand Down Expand Up @@ -306,7 +306,7 @@ ios_application(

ios_application(
name = "app_launch_images",
app_icons = ["//test/starlark_tests/resources:app_icons_ios"],
app_icons = ["//test/testdata/resources:app_icons_ios"],
bundle_id = "com.google.example",
families = [
"iphone",
Expand Down Expand Up @@ -378,7 +378,7 @@ ios_application(

ios_application(
name = "app_launch_images_from_library",
app_icons = ["//test/starlark_tests/resources:app_icons_ios"],
app_icons = ["//test/testdata/resources:app_icons_ios"],
bundle_id = "com.google.example",
families = [
"iphone",
Expand All @@ -398,7 +398,7 @@ ios_application(

ios_application(
name = "app_with_duplicated_library_scoped_launch_images",
app_icons = ["//test/starlark_tests/resources:app_icons_ios"],
app_icons = ["//test/testdata/resources:app_icons_ios"],
bundle_id = "com.google.example",
families = [
"iphone",
Expand All @@ -419,7 +419,7 @@ ios_application(

ios_application(
name = "app_with_top_level_and_library_scoped_launch_images",
app_icons = ["//test/starlark_tests/resources:app_icons_ios"],
app_icons = ["//test/testdata/resources:app_icons_ios"],
bundle_id = "com.google.example",
families = [
"iphone",
Expand All @@ -440,8 +440,8 @@ ios_application(

ios_application(
name = "app_with_alternate_icons",
alternate_icons = ["//test/starlark_tests/resources:alternate_icons_ios"],
app_icons = ["//test/starlark_tests/resources:app_icons_ios"],
alternate_icons = ["//test/testdata/resources:alternate_icons_ios"],
app_icons = ["//test/testdata/resources:app_icons_ios"],
bundle_id = "com.google.example",
families = [
"iphone",
Expand All @@ -462,8 +462,8 @@ ios_application(

ios_application(
name = "iphone_only_app_with_alternate_icons",
alternate_icons = ["//test/starlark_tests/resources:alternate_icons_ios"],
app_icons = ["//test/starlark_tests/resources:app_icons_ios"],
alternate_icons = ["//test/testdata/resources:alternate_icons_ios"],
app_icons = ["//test/testdata/resources:app_icons_ios"],
bundle_id = "com.google.example",
families = [
"iphone",
Expand All @@ -483,7 +483,7 @@ ios_application(

ios_application(
name = "app_with_alternate_app_icons",
app_icons = ["//test/starlark_tests/resources:app_icons_with_alts_ios"],
app_icons = ["//test/testdata/resources:app_icons_with_alts_ios"],
bundle_id = "com.google.example",
families = [
"iphone",
Expand All @@ -503,7 +503,7 @@ ios_application(

ios_application(
name = "app_with_alternate_app_icons_without_primary",
app_icons = ["//test/starlark_tests/resources:app_icons_with_alts_ios"],
app_icons = ["//test/testdata/resources:app_icons_with_alts_ios"],
bundle_id = "com.google.example",
families = [
"iphone",
Expand Down
10 changes: 10 additions & 0 deletions test/testdata/resources/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,16 @@ filegroup(
srcs = glob(["app_icons_ios.xcassets/**"]),
)

filegroup(
name = "app_icons_with_alts_ios",
srcs = glob(["app_icons_with_alts_ios.xcassets/**"]),
)

filegroup(
name = "alternate_icons_ios",
srcs = glob(["alticons/**"]),
)

filegroup(
name = "assets",
srcs = glob(["assets.xcassets/**"]),
Expand Down

0 comments on commit 3e8e825

Please sign in to comment.