Skip to content

Conversation

@cgrindel
Copy link
Owner

The Sentry package uses an unusual import syntax for the SystemConfiguration framework:

#    import <SystemConfiguration/SystemConfiguration.h>

This PR updates the parsing logic for #import lines to support whitespace between the # and the import.

Related to #510.

@cgrindel cgrindel self-assigned this Sep 30, 2023
@cgrindel cgrindel requested a review from luispadron September 30, 2023 17:19
@cgrindel
Copy link
Owner Author

cc: @Thooms @jpsim

@cgrindel cgrindel enabled auto-merge (squash) September 30, 2023 17:20
@Thooms
Copy link
Contributor

Thooms commented Sep 30, 2023

Awesome!

Copy link
Collaborator

@luispadron luispadron left a comment

Choose a reason for hiding this comment

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

That is odd. Thanks for making it work!

@cgrindel cgrindel merged commit ea6569f into main Sep 30, 2023
@cgrindel cgrindel deleted the gh510_special_flags branch September 30, 2023 18:26
@jpsim
Copy link
Collaborator

jpsim commented Sep 30, 2023

“unusual“ is right, good find!

renovate bot referenced this pull request in bazel-contrib/rules_bazel_integration_test Oct 2, 2023
…#215)

[![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 | patch | `0.12.0` -> `0.12.1`
|
|
[rules_swift_package_manager](https://togithub.com/cgrindel/rules_swift_package_manager)
| http_archive | patch | `v0.12.0` -> `v0.12.1` |

---

### Release Notes

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

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

[Compare
Source](https://togithub.com/cgrindel/rules_swift_package_manager/compare/v0.12.0...v0.12.1)

#### What's Changed

- chore: update README.md for v0.12.0 by
[@&#8203;cgrindel-app-token-generator](https://togithub.com/cgrindel-app-token-generator)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/622](https://togithub.com/cgrindel/rules_swift_package_manager/pull/622)
- chore(deps): update dependency rules_apple to v3 by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/607](https://togithub.com/cgrindel/rules_swift_package_manager/pull/607)
- chore(deps): update dependency cocoalumberjack/cocoalumberjack to
from: "3.8.1" by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/623](https://togithub.com/cgrindel/rules_swift_package_manager/pull/623)
- chore(deps): update dependency rules_apple to v3 by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/624](https://togithub.com/cgrindel/rules_swift_package_manager/pull/624)
- chore(deps): update dependency marmelroy/phonenumberkit to from:
"3.7.3" by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/625](https://togithub.com/cgrindel/rules_swift_package_manager/pull/625)
- fix: support `#import` with whitespace between `#` and `import` by
[@&#8203;cgrindel](https://togithub.com/cgrindel) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/629](https://togithub.com/cgrindel/rules_swift_package_manager/pull/629)

**Full Changelog**:
cgrindel/rules_swift_package_manager@v0.12.0...v0.12.1

#### Bazel Module Snippet

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

#### Workspace Snippet

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

http_archive(
    name = "rules_swift_package_manager",
    sha256 = "cebea7e0937363eb4a4afc2ab8330361213ba5d510df650f6603b4a0fe916df2",
    urls = [
        "https://github.com/cgrindel/rules_swift_package_manager/releases/download/v0.12.1/rules_swift_package_manager.v0.12.1.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.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(
    "@&#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 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:eyJjcmVhdGVkSW5WZXIiOiIzNy4wLjMiLCJ1cGRhdGVkSW5WZXIiOiIzNy4wLjMiLCJ0YXJnZXRCcmFuY2giOiJtYWluIn0=-->

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants