Skip to content

feat: add more built in frameworks #750

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
Merged
merged 1 commit into from
Nov 17, 2023
Merged

feat: add more built in frameworks #750

merged 1 commit into from
Nov 17, 2023

Conversation

@luispadron
Copy link
Collaborator

@luispadron luispadron commented Nov 15, 2023 •
edited
Loading

This resolves the first part of issue #742.

It adds support for finding built-in "frameworks" that are not included as .frameworks. In addition to the existing framework searching, we now also search in the usr/lib/swift directory of the target SDK.

This allows including more builtin frameworks, such as os and Darwin.

Support is added in a way where the frameworks and modules under /usr/lib/swift are split. This is important for supporting obc_library and frameworks attr. The swift modules are not valid objective-c frameworks.

NOTE: this bumps the SDK version to 14.0 since I generated this file using Xcode 15.0.0. The deletions seem reasonable as they have been deprecated frameworks for a bit.

Depends on: #756

@luispadron luispadron requested a review from cgrindel November 15, 2023 05:31
@luispadron luispadron mentioned this pull request Nov 15, 2023
Closed
2 tasks
@luispadron luispadron force-pushed the luis/add-more-built-in-frameworks branch from 2223bfc to 7b0bb13 Compare November 15, 2023 05:34
@luispadron
Copy link
Collaborator Author

luispadron commented Nov 15, 2023 •
edited
Loading

@cgrindel both simple_test and objc_code_test seem to be failing in CI but when testing locally they are passing. I did have to pass --macos_minimum_os=13.0 locally though to get them to pass is there something I'm missing here?

I cant tell why they'd be failing in CI

@luispadron luispadron force-pushed the luis/add-more-built-in-frameworks branch from 7b0bb13 to 9fa9fd1 Compare November 15, 2023 16:22
@cgrindel
Copy link
Owner

cgrindel commented Nov 16, 2023

I am merging #747 now with the flags. Should we try rebasing once that and #735 are merged?

@luispadron
Copy link
Collaborator Author

luispadron commented Nov 16, 2023

Yeah I'll rebase when those merge and try to see if we still hit issues in CI

@luispadron luispadron force-pushed the luis/add-more-built-in-frameworks branch 2 times, most recently from ae09ed0 to c2f213e Compare November 17, 2023 07:03
@luispadron luispadron changed the base branch from main to luis/fix-prioritize-workspace-modules-over-built-in-with-same-name November 17, 2023 07:03
@luispadron
Copy link
Collaborator Author

luispadron commented Nov 17, 2023

@cgrindel Turns out i was able to repro the CI issue and it was legitimate. Adding all swift modules into one builtin frameworks list breaks for Objective-C targets as these are not importable there.

Ive updated the PR to split this into frameworks and swift modules, the code then handles it as expected (only allowing swift modules to be considered built in frameworks for Swift targets)

@luispadron luispadron requested a review from cgrindel November 17, 2023 07:08
cgrindel
cgrindel reviewed Nov 17, 2023
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.

Just a couple of comments. Also, it looks like a CI test is failing.

Base automatically changed from luis/fix-prioritize-workspace-modules-over-built-in-with-same-name to main November 17, 2023 13:53
@luispadron luispadron force-pushed the luis/add-more-built-in-frameworks branch 2 times, most recently from 448a44a to d3d2a9d Compare November 17, 2023 15:10
@luispadron luispadron enabled auto-merge (squash) November 17, 2023 15:10
@luispadron luispadron force-pushed the luis/add-more-built-in-frameworks branch from d3d2a9d to 503024b Compare November 17, 2023 17:48
@luispadron luispadron merged commit f1512c1 into main Nov 17, 2023
@luispadron luispadron deleted the luis/add-more-built-in-frameworks branch November 17, 2023 19:09
renovate bot referenced this pull request in bazel-contrib/rules_bazel_integration_test Nov 27, 2023
@renovate
chore(deps): update dependency rules_swift_package_manager to v0.22.0 (…
2c1ae9f 
…#253)

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

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
|
[rules_swift_package_manager](https://togithub.com/cgrindel/rules_swift_package_manager)
| http_archive | minor | `v0.21.0` -> `v0.22.0` |

---

### Release Notes

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

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

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

#### What's Changed

- chore: update README.md for v0.21.0 by
[@&#8203;cgrindel-app-token-generator](https://togithub.com/cgrindel-app-token-generator)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/736](https://togithub.com/cgrindel/rules_swift_package_manager/pull/736)
- fix: only configure remote cache if the API key is available by
[@&#8203;cgrindel](https://togithub.com/cgrindel) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/746](https://togithub.com/cgrindel/rules_swift_package_manager/pull/746)
- chore(deps): update dependency firebase/firebase-ios-sdk to from:
"10.18.0" by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/739](https://togithub.com/cgrindel/rules_swift_package_manager/pull/739)
- chore(deps): update dependency nicklockwood/swiftformat to from:
"0.52.10" by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/745](https://togithub.com/cgrindel/rules_swift_package_manager/pull/745)
- fix: only add dependency when unresolved by
[@&#8203;luispadron](https://togithub.com/luispadron) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/749](https://togithub.com/cgrindel/rules_swift_package_manager/pull/749)
- chore(deps): update dependency
pointfreeco/swift-composable-architecture to from: "1.4.2" by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/737](https://togithub.com/cgrindel/rules_swift_package_manager/pull/737)
- feat: add support for Swift macros by
[@&#8203;jpsim](https://togithub.com/jpsim) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/753](https://togithub.com/cgrindel/rules_swift_package_manager/pull/753)
- fix: correctly differentiate built-in and local modules with same name
by [@&#8203;luispadron](https://togithub.com/luispadron) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/756](https://togithub.com/cgrindel/rules_swift_package_manager/pull/756)
- chore(deps): update dependency apple/swift-nio to v2.62.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/754](https://togithub.com/cgrindel/rules_swift_package_manager/pull/754)
- feat: add more built in frameworks by
[@&#8203;luispadron](https://togithub.com/luispadron) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/750](https://togithub.com/cgrindel/rules_swift_package_manager/pull/750)
- chore: upgrade Bazel to 7.0.0rc4 by
[@&#8203;cgrindel](https://togithub.com/cgrindel) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/757](https://togithub.com/cgrindel/rules_swift_package_manager/pull/757)
- chore(deps): update dependency marmelroy/phonenumberkit to from:
"3.7.5" by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/759](https://togithub.com/cgrindel/rules_swift_package_manager/pull/759)
- chore: update CI to use Xcode 15 and Swift 5.9 by
[@&#8203;jpsim](https://togithub.com/jpsim) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/760](https://togithub.com/cgrindel/rules_swift_package_manager/pull/760)
- chore: add more Xcode 14.3.1 CI exceptions by
[@&#8203;jpsim](https://togithub.com/jpsim) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/765](https://togithub.com/cgrindel/rules_swift_package_manager/pull/765)
- chore: update TCA example by
[@&#8203;jpsim](https://togithub.com/jpsim) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/755](https://togithub.com/cgrindel/rules_swift_package_manager/pull/755)
- chore(deps): update dependency vapor/vapor to v4.87.1 by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/767](https://togithub.com/cgrindel/rules_swift_package_manager/pull/767)
- fix: only add `generates_header` attribute if target is a library by
[@&#8203;cgrindel](https://togithub.com/cgrindel) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/766](https://togithub.com/cgrindel/rules_swift_package_manager/pull/766)
- chore(deps): update dependency io_bazel_rules_go to v0.43.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/763](https://togithub.com/cgrindel/rules_swift_package_manager/pull/763)
- fix(deps): update module github.com/deckarep/golang-set/v2 to v2.4.0
by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/768](https://togithub.com/cgrindel/rules_swift_package_manager/pull/768)
- chore: upgrade gazelle to 0.34.0 and rules_go to 0.43.0 by
[@&#8203;cgrindel](https://togithub.com/cgrindel) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/588](https://togithub.com/cgrindel/rules_swift_package_manager/pull/588)
- fix(deps): update module github.com/bazelbuild/bazel-gazelle to
v0.34.0 by
[@&#8203;cgrindel-self-hosted-renovate](https://togithub.com/cgrindel-self-hosted-renovate)
in
[https://github.com/cgrindel/rules_swift_package_manager/pull/486](https://togithub.com/cgrindel/rules_swift_package_manager/pull/486)
- chore: avoid adding `.build` directory to client's workspace by
[@&#8203;cgrindel](https://togithub.com/cgrindel) in
[https://github.com/cgrindel/rules_swift_package_manager/pull/771](https://togithub.com/cgrindel/rules_swift_package_manager/pull/771)

**Full Changelog**:
cgrindel/rules_swift_package_manager@v0.21.0...v0.22.0

#### Bazel Module Snippet

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

#### Workspace Snippet

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

http_archive(
    name = "rules_swift_package_manager",
    sha256 = "f1ddf074651bf7b3f4977026ae49f9182e44ade975df29740e8ff6666a136f3a",
    urls = [
        "https://github.com/cgrindel/rules_swift_package_manager/releases/download/v0.22.0/rules_swift_package_manager.v0.22.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.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 this update
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:eyJjcmVhdGVkSW5WZXIiOiIzNy41OS44IiwidXBkYXRlZEluVmVyIjoiMzcuNTkuOCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

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.

3 participants

@luispadron @cgrindel