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.

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

Followup: query xcode parameters from provider based on attributes #7266

Merged
merged 4 commits into from
Feb 3, 2025

Conversation

LeFrosch
Copy link
Collaborator

Followup for #7193 after #7202 was merged.

Bazel 8 introduced new provider located in apple_common module,
which is not available in cquery context, so the implementation
was updated to just find a provider with required attributes to
make implementation also work for bazel 7 and older.

ujohnny and others added 4 commits January 31, 2025 16:22
Bazel 8 introduced new provider located in apple_common module,
which is not available in cquery context, so the implementation
was updated to just find a provider with required attributes to
make implementation also work for bazel 7 and older

fixes bazelbuild#6604
@LeFrosch LeFrosch marked this pull request as ready for review January 31, 2025 15:59
@github-actions github-actions bot added product: CLion CLion plugin awaiting-review Awaiting review from Bazel team on PRs labels Jan 31, 2025

final var scriptLines = Files.readAllLines(compilerSettings.getCompilerExecutable().toPath());

assertContainsPattern("export DEVELOPER_DIR=/.*/Xcode.*.app/Contents/Developer", scriptLines);
Copy link
Collaborator

Choose a reason for hiding this comment

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

I wonder why we do not have similar environment being injected for Apple Clang support in CLion.

@ujohnny ujohnny merged commit 7a82dd6 into bazelbuild:master Feb 3, 2025
7 checks passed
@github-actions github-actions bot removed the awaiting-review Awaiting review from Bazel team on PRs label Feb 3, 2025
LeFrosch added a commit to LeFrosch/intellij-bazel that referenced this pull request Feb 3, 2025
…azelbuild#7266)

* xcode: query xcode parameters from provider based on attributes

Bazel 8 introduced new provider located in apple_common module,
which is not available in cquery context, so the implementation
was updated to just find a provider with required attributes to
make implementation also work for bazel 7 and older

fixes bazelbuild#6604

* use AspectStorageService to resolve the query file

* check xcode environment variables in integration test

* updated patterns to match CI values too

---------

Co-authored-by: Evgenii Novozhilov <[email protected]>
ujohnny pushed a commit to ujohnny/intellij that referenced this pull request Feb 7, 2025
…azelbuild#7266)

* xcode: query xcode parameters from provider based on attributes

Bazel 8 introduced new provider located in apple_common module,
which is not available in cquery context, so the implementation
was updated to just find a provider with required attributes to
make implementation also work for bazel 7 and older

fixes bazelbuild#6604

* use AspectStorageService to resolve the query file

* check xcode environment variables in integration test

* updated patterns to match CI values too

---------

Co-authored-by: Evgenii Novozhilov <[email protected]>
(cherry picked from commit 7a82dd6)
mai93 pushed a commit that referenced this pull request Feb 7, 2025
* Remove dependency on rules_java in aspect BUILD file (#7270)

* Simple test for Bazel 8

* External includes test for Bazel 8

* Virtual includes test for Bazel 8

* LLVM toolchain test for Bazel 8

* Added Bazel 8 to integration tests

* Add bazel build output to test logs

* Remove java dependencies in BUILD file

* Enable bzlmod for tests

* Fix aspect tests

(cherry picked from commit 4e6b7c0)

* Bump CLion to fixed version (#7269)

I must have missed this during review. But the CLion version was
pointing to the latest EAP, breaking builds due to sha mismatch.

(cherry picked from commit 4c7153a)

* Followup: query xcode parameters from provider based on attributes (#7266)

* xcode: query xcode parameters from provider based on attributes

Bazel 8 introduced new provider located in apple_common module,
which is not available in cquery context, so the implementation
was updated to just find a provider with required attributes to
make implementation also work for bazel 7 and older

fixes #6604

* use AspectStorageService to resolve the query file

* check xcode environment variables in integration test

* updated patterns to match CI values too

---------

Co-authored-by: Evgenii Novozhilov <[email protected]>
(cherry picked from commit 7a82dd6)

* update CHANGELOG for v2025.01.21.0.2

---------

Co-authored-by: Daniel Brauner <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
product: CLion CLion plugin
Projects
Development

Successfully merging this pull request may close these issues.

2 participants