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: Use swift_interop_hint instead of swift_module tag #1107

Merged
merged 2 commits into from
Jul 10, 2024
Merged

fix: Use swift_interop_hint instead of swift_module tag #1107

merged 2 commits into from
Jul 10, 2024

Conversation

brentleyjones
Copy link
Collaborator

@brentleyjones brentleyjones commented Jun 14, 2024 •
edited
Loading

Needed for rules_swift 2.0+. Only works with rules_swift 2.0+.

@brentleyjones
Copy link
Collaborator Author

brentleyjones commented Jun 14, 2024 •
edited
Loading

I can't think of a good way to determine if we are depending on rules_swift 2.0 or not, so right now this is unconditional. Ideally we would only make this change if transitively depending on rules_swift 2.0.

edit: Looks like with bzlmod we would be able to determine the version of rules_swift with https://bazel.build/rules/lib/builtins/bazel_module.html#version. Not much we can do in WORKSPACE, afaik.

@brentleyjones brentleyjones changed the title Use swift_interop_hint instead of swift_module tag fix: Use swift_interop_hint instead of swift_module tag Jun 14, 2024
@brentleyjones brentleyjones force-pushed the bj/rules_swift_2.0 branch 2 times, most recently from 2d0d7ab to 22dd201 Compare June 14, 2024 18:14
@brentleyjones
Copy link
Collaborator Author

Once rules_swift 2.0 is released I'll change the DNM commit to a proper bump, then we can merge this.

@brentleyjones brentleyjones force-pushed the bj/rules_swift_2.0 branch 2 times, most recently from b6f0076 to 44260cf Compare June 27, 2024 14:33
@brentleyjones brentleyjones marked this pull request as ready for review July 9, 2024 19:11
@brentleyjones brentleyjones enabled auto-merge (squash) July 9, 2024 19:12
@brentleyjones brentleyjones force-pushed the bj/rules_swift_2.0 branch 2 times, most recently from 9039bb0 to 8acf9aa Compare July 9, 2024 20:50
@brentleyjones
Copy link
Collaborator Author

Needs #1156.

cgrindel
cgrindel approved these changes Jul 10, 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.

Thanks!

@cgrindel
Copy link
Owner

I see this in the firbase example failure:

ERROR: rules_apple@3.6.0 depends on rules_swift@1.18.0 with compatibility level 1, but <root> depends on rules_swift@2.1.0 with compatibility level 2 which is different

Is there a corresponding rules_apple upgrade that needs to be applied?

@brentleyjones
Copy link
Collaborator Author

It's a bad error message (bazelbuild/bazel#22972), it was actually rules_xcodeproj that needed to be updated.

@brentleyjones
Upgrade rules_swift to 2.1.1
95fdfb1 
Signed-off-by: Brentley Jones <github@brentleyjones.com>
@brentleyjones
Use swift_interop_hint instead of swift_module tag
2ddf4e3 
Needed for rules_swift 2.0.

Signed-off-by: Brentley Jones <github@brentleyjones.com>
@brentleyjones brentleyjones merged commit 17d0419 into main Jul 10, 2024
32 checks passed
@brentleyjones brentleyjones deleted the bj/rules_swift_2.0 branch July 10, 2024 16:41
renovate bot added a commit to bazel-contrib/rules_bazel_integration_test that referenced this pull request Jul 11, 2024
@renovate
chore(deps): update dependency rules_swift_package_manager to v0.35.1 (…
5ee507f 
…#344)

[![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.34.1` -> `0.35.1`
|
|
[rules_swift_package_manager](https://github.com/cgrindel/rules_swift_package_manager)
| http_archive | minor | `v0.34.1` -> `v0.35.1` |

---

### Release Notes

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

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

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

#### What's Changed

- fix: sync Bazel version with BCR presubmit by
[@&#8203;cgrindel](https://github.com/cgrindel) in
[cgrindel/rules_swift_package_manager#1163

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

#### Bazel Module Snippet

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

#### Workspace Snippet

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

http_archive(
    name = "rules_swift_package_manager",
    sha256 = "9eddae9925a48774cfa65cfa905bf8f59dd7dc6ce831a07c4b945c57cdea1d77",
    urls = [
        "https://github.com/cgrindel/rules_swift_package_manager/releases/download/v0.35.1/rules_swift_package_manager.v0.35.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.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()
```

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

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

#### What's Changed

- chore: update README.md for v0.34.1 by
[@&#8203;cgrindel-app-token-generator](https://github.com/cgrindel-app-token-generator)
in
[cgrindel/rules_swift_package_manager#1120
- chore(deps): update dependency marmelroy/phonenumberkit to from:
"3.7.11" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1115
- chore(deps): update dependency rules_proto to v6.0.2 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1116
- chore(deps): update dependency vapor/fluent to v4.11.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1049
- chore(deps): update dependency vapor/fluent-sqlite-driver to v4.7.3 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1073
- chore(deps): update dependency vapor/vapor to v4.102.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1037
- chore(deps): update dependency stripe/stripe-ios to from: "23.27.6" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1119
- fix(deps): update module github.com/spf13/cobra to v1.8.1 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1121
- chore(deps): update dependency apple/swift-log to from: "1.6.1" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1122
- chore(deps): update dependency apple/swift-markdown to v0.4.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1123
- docs: update quickstart guide to include swift package manager command
by [@&#8203;adincebic](https://github.com/adincebic) in
[cgrindel/rules_swift_package_manager#1128
- chore: manually upgrade gazelle to 0.37.0 by
[@&#8203;cgrindel](https://github.com/cgrindel) in
[cgrindel/rules_swift_package_manager#1131
- chore(deps): update dependency apple/swift-nio to v2.67.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1124
- chore(deps): update dependency apple/swift-nio to v2.68.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1136
- chore(deps): update dependency apple_support to v1.15.1 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1125
- chore(deps): update dependency cgrindel_bazel_starlib to v0.20.2 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1130
- chore(deps): update dependency firebase/firebase-ios-sdk to from:
"10.28.1" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1132
- chore(deps): update dependency geoswift/geoswift to from: "10.2.0" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1133
- chore(deps): update dependency nicklockwood/swiftformat to from:
"0.54.0" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1134
- chore(deps): update dependency onevcat/kingfisher to from: "7.12.0" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1135
- chore(deps): update dependency
pointfreeco/swift-composable-architecture to from: "1.11.2" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1137
- chore(deps): update dependency rules_apple to v3.6.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1138
- chore(deps): update dependency rules_xcodeproj to v2.4.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1140
- chore(deps): update dependency rules_swift to v1.18.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1139
- chore(deps): update dependency sdwebimage/sdwebimageswiftui to from:
"3.1.1" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1141
- chore(deps): update dependency protobuf to v27 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1142
- chore(deps): update dependency shakebugs/shake-ios to v17 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1143
- chore(deps): update dependency quick/quick to from: "7.6.1" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1144
- chore(deps): update dependency iterable/swift-sdk to from: "6.5.4" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1145
- chore(deps): update dependency bazel_skylib to v1.7.1 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1127
- chore(deps): update dependency bazel_skylib_gazelle_plugin to v1.7.1
by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1129
- fix(deps): update golang.org/x/exp digest to
[`46b0784`](https://github.com/cgrindel/rules_swift_package_manager/commit/46b0784)
by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1151
- chore(deps): update dependency soto-project/soto to v7 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1152
- chore(deps): update dependency firebase/firebase-ios-sdk to from:
"10.29.0" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1153
- chore(deps): Update rules_xcodeproj to 2.5.1 by
[@&#8203;brentleyjones](https://github.com/brentleyjones) in
[cgrindel/rules_swift_package_manager#1156
- chore(deps): update dependency stripe/stripe-ios to from: "23.28.0" by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1158
- chore(deps): update dependency vapor/vapor to v4.102.1 by
[@&#8203;cgrindel-self-hosted-renovate](https://github.com/cgrindel-self-hosted-renovate)
in
[cgrindel/rules_swift_package_manager#1161
- fix: Use `swift_interop_hint` instead of `swift_module` tag by
[@&#8203;brentleyjones](https://github.com/brentleyjones) in
[cgrindel/rules_swift_package_manager#1107

#### New Contributors

- [@&#8203;adincebic](https://github.com/adincebic) made their first
contribution in
[cgrindel/rules_swift_package_manager#1128

**Full Changelog**:
cgrindel/rules_swift_package_manager@v0.34.1...v0.35.0

#### Bazel Module Snippet

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

#### Workspace Snippet

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

http_archive(
    name = "rules_swift_package_manager",
    sha256 = "51ab580ff68b6f214cadb2825094b09afbd27f7b4bee1bcb9370805e2d4413ab",
    urls = [
        "https://github.com/cgrindel/rules_swift_package_manager/releases/download/v0.35.0/rules_swift_package_manager.v0.35.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 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:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjUuMSIsInVwZGF0ZWRJblZlciI6IjM3LjQyNS4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

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

@luispadron luispadron luispadron 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.
3 participants
@brentleyjones @cgrindel @luispadron