chore: refactor how resources are specified on apple_resource_bundle
#577
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
luispadron
approved these changes
Sep 7, 2023
cgrindel
force-pushed
the
gh575_refactor_resource_glob
branch
from
b52a7b8 to
9b4c43c
Compare
Owner
Author
|
@luispadron One of the examples was failing. While I was investigating, I realized that the description JSON contains auto-discovered resources. So, I removed the code that searched for auto-discovered resources. 🤞 |
cgrindel
force-pushed
the
gh575_refactor_resource_glob
branch
from
8bd3c08 to
e27f0f4
Compare
Owner
Author
Well, it looks like SPM does not list all of the resources. So,I am going to add back the auto-discovery and dedupe the results with what SPM provides. |
cgrindel
force-pushed
the
gh575_refactor_resource_glob
branch
from
e27f0f4 to
430da8f
Compare
renovate bot
referenced
this pull request
in bazel-contrib/rules_bazel_integration_test
Sep 14, 2023
…#203) [](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_swift_package_manager | bazel_dep | minor | `0.9.0` -> `0.11.0` | | [rules_swift_package_manager](https://togithub.com/cgrindel/rules_swift_package_manager) | http_archive | minor | `v0.10.0` -> `v0.11.0` | --- ### Release Notes <details> <summary>cgrindel/rules_swift_package_manager (rules_swift_package_manager)</summary> ### [`v0.11.0`](https://togithub.com/cgrindel/rules_swift_package_manager/releases/tag/v0.11.0) [Compare Source](https://togithub.com/cgrindel/rules_swift_package_manager/compare/v0.10.0...v0.11.0) #### What's Changed - chore: update README.md for v0.10.0 by [@​cgrindel-app-token-generator](https://togithub.com/cgrindel-app-token-generator) in [https://github.com/cgrindel/rules_swift_package_manager/pull/571](https://togithub.com/cgrindel/rules_swift_package_manager/pull/571) - chore(deps): update dependency build_bazel_rules_swift to v1.10.1 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/564](https://togithub.com/cgrindel/rules_swift_package_manager/pull/564) - chore(deps): update dependency rules_xcodeproj to v1.10.1 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/570](https://togithub.com/cgrindel/rules_swift_package_manager/pull/570) - chore: mark `swift_library` declarations as manual by [@​cgrindel](https://togithub.com/cgrindel) in [https://github.com/cgrindel/rules_swift_package_manager/pull/578](https://togithub.com/cgrindel/rules_swift_package_manager/pull/578) - fix: auto discover select resources in external Swift packages by [@​cgrindel](https://togithub.com/cgrindel) in [https://github.com/cgrindel/rules_swift_package_manager/pull/576](https://togithub.com/cgrindel/rules_swift_package_manager/pull/576) - chore(deps): update dependency marmelroy/phonenumberkit to from: "3.6.8" by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/572](https://togithub.com/cgrindel/rules_swift_package_manager/pull/572) - chore(deps): update dependency build_bazel_rules_swift to v1.11.0 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/573](https://togithub.com/cgrindel/rules_swift_package_manager/pull/573) - chore: refactor how resources are specified on `apple_resource_bundle` by [@​cgrindel](https://togithub.com/cgrindel) in [https://github.com/cgrindel/rules_swift_package_manager/pull/577](https://togithub.com/cgrindel/rules_swift_package_manager/pull/577) - chore(deps): update dependency onevcat/kingfisher to v7 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/580](https://togithub.com/cgrindel/rules_swift_package_manager/pull/580) - chore(deps): update tibdex/github-app-token action to v2 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/581](https://togithub.com/cgrindel/rules_swift_package_manager/pull/581) - chore(deps): update dependency rules_swift to v1.11.0 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/574](https://togithub.com/cgrindel/rules_swift_package_manager/pull/574) - chore(deps): update dependency firebase/firebase-ios-sdk to from: "10.15.0" by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/584](https://togithub.com/cgrindel/rules_swift_package_manager/pull/584) - feat: detect xcframework type to determine how to import by [@​cgrindel](https://togithub.com/cgrindel) in [https://github.com/cgrindel/rules_swift_package_manager/pull/583](https://togithub.com/cgrindel/rules_swift_package_manager/pull/583) **Full Changelog**: cgrindel/rules_swift_package_manager@v0.10.0...v0.11.0 #### Bazel Module Snippet ```python bazel_dep(name = "rules_swift_package_manager", version = "0.11.0") ``` #### Workspace Snippet ```python load("@​bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_swift_package_manager", sha256 = "31c7052950d0fdd5269d04c4e9b1218029d14f88997f2921cebf8506a85c4cbe", urls = [ "https://github.com/cgrindel/rules_swift_package_manager/releases/download/v0.11.0/rules_swift_package_manager.v0.11.0.tar.gz", ], ) load("@​rules_swift_package_manager//:deps.bzl", "swift_bazel_dependencies") swift_bazel_dependencies() load("@​cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies") bazel_starlib_dependencies() ### MARK: - Gazelle ### gazelle:repo bazel_gazelle load("@​bazel_gazelle//:deps.bzl", "gazelle_dependencies") load("@​rules_swift_package_manager//:go_deps.bzl", "swift_bazel_go_dependencies") load("@​io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") ### Declare Go dependencies before calling go_rules_dependencies. swift_bazel_go_dependencies() go_rules_dependencies() go_register_toolchains(version = "1.19.1") gazelle_dependencies() ### MARK: - Swift Toolchain http_archive( name = "build_bazel_rules_swift", ### Populate with your preferred release ### https://github.com/bazelbuild/rules_swift/releases ) load( "@​build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependencies", ) load("//:swift_deps.bzl", "swift_dependencies") ### gazelle:repository_macro swift_deps.bzl%swift_dependencies swift_dependencies() swift_rules_dependencies() load( "@​build_bazel_rules_swift//swift:extras.bzl", "swift_rules_extra_dependencies", ) swift_rules_extra_dependencies() ``` </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/bazel-contrib/rules_bazel_integration_test). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi44My4wIiwidXBkYXRlZEluVmVyIjoiMzYuODMuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
cgrindel
referenced
this pull request
in k1nkreet/rules_bazel_integration_test
Sep 27, 2023
…bazel-contrib#203) [](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_swift_package_manager | bazel_dep | minor | `0.9.0` -> `0.11.0` | | [rules_swift_package_manager](https://togithub.com/cgrindel/rules_swift_package_manager) | http_archive | minor | `v0.10.0` -> `v0.11.0` | --- ### Release Notes <details> <summary>cgrindel/rules_swift_package_manager (rules_swift_package_manager)</summary> ### [`v0.11.0`](https://togithub.com/cgrindel/rules_swift_package_manager/releases/tag/v0.11.0) [Compare Source](https://togithub.com/cgrindel/rules_swift_package_manager/compare/v0.10.0...v0.11.0) #### What's Changed - chore: update README.md for v0.10.0 by [@​cgrindel-app-token-generator](https://togithub.com/cgrindel-app-token-generator) in [https://github.com/cgrindel/rules_swift_package_manager/pull/571](https://togithub.com/cgrindel/rules_swift_package_manager/pull/571) - chore(deps): update dependency build_bazel_rules_swift to v1.10.1 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/564](https://togithub.com/cgrindel/rules_swift_package_manager/pull/564) - chore(deps): update dependency rules_xcodeproj to v1.10.1 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/570](https://togithub.com/cgrindel/rules_swift_package_manager/pull/570) - chore: mark `swift_library` declarations as manual by [@​cgrindel](https://togithub.com/cgrindel) in [https://github.com/cgrindel/rules_swift_package_manager/pull/578](https://togithub.com/cgrindel/rules_swift_package_manager/pull/578) - fix: auto discover select resources in external Swift packages by [@​cgrindel](https://togithub.com/cgrindel) in [https://github.com/cgrindel/rules_swift_package_manager/pull/576](https://togithub.com/cgrindel/rules_swift_package_manager/pull/576) - chore(deps): update dependency marmelroy/phonenumberkit to from: "3.6.8" by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/572](https://togithub.com/cgrindel/rules_swift_package_manager/pull/572) - chore(deps): update dependency build_bazel_rules_swift to v1.11.0 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/573](https://togithub.com/cgrindel/rules_swift_package_manager/pull/573) - chore: refactor how resources are specified on `apple_resource_bundle` by [@​cgrindel](https://togithub.com/cgrindel) in [https://github.com/cgrindel/rules_swift_package_manager/pull/577](https://togithub.com/cgrindel/rules_swift_package_manager/pull/577) - chore(deps): update dependency onevcat/kingfisher to v7 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/580](https://togithub.com/cgrindel/rules_swift_package_manager/pull/580) - chore(deps): update tibdex/github-app-token action to v2 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/581](https://togithub.com/cgrindel/rules_swift_package_manager/pull/581) - chore(deps): update dependency rules_swift to v1.11.0 by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/574](https://togithub.com/cgrindel/rules_swift_package_manager/pull/574) - chore(deps): update dependency firebase/firebase-ios-sdk to from: "10.15.0" by [@​cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate) in [https://github.com/cgrindel/rules_swift_package_manager/pull/584](https://togithub.com/cgrindel/rules_swift_package_manager/pull/584) - feat: detect xcframework type to determine how to import by [@​cgrindel](https://togithub.com/cgrindel) in [https://github.com/cgrindel/rules_swift_package_manager/pull/583](https://togithub.com/cgrindel/rules_swift_package_manager/pull/583) **Full Changelog**: cgrindel/rules_swift_package_manager@v0.10.0...v0.11.0 #### Bazel Module Snippet ```python bazel_dep(name = "rules_swift_package_manager", version = "0.11.0") ``` #### Workspace Snippet ```python load("@​bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_swift_package_manager", sha256 = "31c7052950d0fdd5269d04c4e9b1218029d14f88997f2921cebf8506a85c4cbe", urls = [ "https://github.com/cgrindel/rules_swift_package_manager/releases/download/v0.11.0/rules_swift_package_manager.v0.11.0.tar.gz", ], ) load("@​rules_swift_package_manager//:deps.bzl", "swift_bazel_dependencies") swift_bazel_dependencies() load("@​cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies") bazel_starlib_dependencies() ### MARK: - Gazelle ### gazelle:repo bazel_gazelle load("@​bazel_gazelle//:deps.bzl", "gazelle_dependencies") load("@​rules_swift_package_manager//:go_deps.bzl", "swift_bazel_go_dependencies") load("@​io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") ### Declare Go dependencies before calling go_rules_dependencies. swift_bazel_go_dependencies() go_rules_dependencies() go_register_toolchains(version = "1.19.1") gazelle_dependencies() ### MARK: - Swift Toolchain http_archive( name = "build_bazel_rules_swift", ### Populate with your preferred release ### https://github.com/bazelbuild/rules_swift/releases ) load( "@​build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependencies", ) load("//:swift_deps.bzl", "swift_dependencies") ### gazelle:repository_macro swift_deps.bzl%swift_dependencies swift_dependencies() swift_rules_dependencies() load( "@​build_bazel_rules_swift//swift:extras.bzl", "swift_rules_extra_dependencies", ) swift_rules_extra_dependencies() ``` </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/bazel-contrib/rules_bazel_integration_test). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi44My4wIiwidXBkYXRlZEluVmVyIjoiMzYuODMuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
](https://renovatebot.com){kind=link}
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It turns out that the auto-discovered Swift package resources (#576) are listed in the description JSON. This PR ended up removing the auto-discovery code and having each resource listed as a file path.
Updated the
testutilsto support stub calls torepository_files.is_directory().Closes #575.