Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Update bundle name generator to match SPM #1183

Merged
merged 5 commits into from
Jul 29, 2024
Merged

fix: Update bundle name generator to match SPM #1183

merged 5 commits into from
Jul 29, 2024

Conversation

jflan-dd
Copy link
Contributor

@jflan-dd jflan-dd commented Jul 25, 2024 •
edited
Loading

SPM generated bundles appear to have the format <package_name>_<module_name>.bundle rather than <module_name>_<module_name>.bundle.

I added the same test with the same name to both the resources_example bazel tests and directly to the CoolUI example package to prove that the generated names match.

@jflan-dd
Copy link
Contributor Author

@cgrindel This is ready for review when you get a chance

@cgrindel
Copy link
Owner

I am on vacation. I will take a look next week.

cgrindel
cgrindel approved these changes Jul 29, 2024
View reviewed changes
Copy link
Owner

@cgrindel cgrindel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@cgrindel cgrindel merged commit c27daf6 into cgrindel:main Jul 29, 2024
32 checks passed
@jflan-dd jflan-dd deleted the jflan/resource-bundle-name branch July 29, 2024 20:45
renovate bot added a commit to bazel-contrib/rules_bazel_integration_test that referenced this pull request Jul 31, 2024
@renovate
chore(deps): update dependency rules_swift_package_manager to v0.36.0 (…
31437fb 
…#347)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| rules_swift_package_manager | bazel_dep | minor | `0.35.1` -> `0.36.0`
|
|
[rules_swift_package_manager](https://github.com/cgrindel/rules_swift_package_manager)
| http_archive | minor | `v0.35.1` -> `v0.36.0` |

---

### Release Notes

<details>
<summary>cgrindel/rules_swift_package_manager
(rules_swift_package_manager)</summary>

###
[`v0.36.0`](https://github.com/cgrindel/rules_swift_package_manager/releases/tag/v0.36.0)

[Compare
Source](https://github.com/cgrindel/rules_swift_package_manager/compare/v0.35.1...v0.36.0)

#### What Has Changed

#### What's Changed

- chore: update README.md for v0.35.1 by
[@&#8203;cgrindel-app-token-generator](https://github.com/cgrindel-app-token-generator)
in
[cgrindel/rules_swift_package_manager#1164
- chore(deps): update dependency airbnb/lottie-spm to from: "4.5.0" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1159
- chore(deps): update dependency nicklockwood/swiftformat to from:
"0.54.1" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1165
- docs: document how to handle deprecated byName references by
[@&#8203;cgrindel](https://github.com/cgrindel) in
[cgrindel/rules_swift_package_manager#1146
- docs: update patch instructions for bzlmod by
[@&#8203;cgrindel](https://github.com/cgrindel) in
[cgrindel/rules_swift_package_manager#1167
- chore(deps): update dependency apple_support to v1.16.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1160
- docs: generate bzlmod extension docs by
[@&#8203;cgrindel](https://github.com/cgrindel) in
[cgrindel/rules_swift_package_manager#1169
- chore(deps): update dependency vapor/fluent-sqlite-driver to v4.7.4 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1171
- chore: remove legacy code and docs by
[@&#8203;cgrindel](https://github.com/cgrindel) in
[cgrindel/rules_swift_package_manager#1179
- fix: Update bundle name generator to match SPM by
[@&#8203;jflan-dd](https://github.com/jflan-dd) in
[cgrindel/rules_swift_package_manager#1183
- docs: clarify when to enable `declare_swift_deps_info` by
[@&#8203;cgrindel](https://github.com/cgrindel) in
[cgrindel/rules_swift_package_manager#1185
- chore: refactor resource accessors for Swift and ObjC by
[@&#8203;cgrindel](https://github.com/cgrindel) in
[cgrindel/rules_swift_package_manager#1184

**Full Changelog**:
cgrindel/rules_swift_package_manager@v0.35.1...v0.36.0

#### Bazel Module Snippet

```python
bazel_dep(name = "rules_swift_package_manager", version = "0.36.0")
```

#### Workspace Snippet

```python
load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
    name = "rules_swift_package_manager",
    sha256 = "902bdcfd77e2037f889443024087784b49aac42581b07a6b80442177ae2f806d",
    urls = [
        "https://github.com/cgrindel/rules_swift_package_manager/releases/download/v0.36.0/rules_swift_package_manager.v0.36.0.tar.gz",
    ],
)

load("@&#8203;rules_swift_package_manager//:deps.bzl", "swift_bazel_dependencies")

swift_bazel_dependencies()

load("@&#8203;cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies")

bazel_starlib_dependencies()

### MARK: - Gazelle
### gazelle:repo bazel_gazelle

load("@&#8203;bazel_gazelle//:deps.bzl", "gazelle_dependencies")
load("@&#8203;rules_swift_package_manager//:go_deps.bzl", "swift_bazel_go_dependencies")
load("@&#8203;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.21.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(
    "@&#8203;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(
    "@&#8203;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 was generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View the
[repository job
log](https://developer.mend.io/github/bazel-contrib/rules_bazel_integration_test).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

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
Reviewers

@cgrindel cgrindel cgrindel approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jflan-dd @cgrindel