-
Notifications
You must be signed in to change notification settings - Fork 46
Conversation
fbb1c7b
to
8088e91
Compare
1. Main Repository Target Label Prefixes. In Bazel 5 and older, the target labels were strigified to "//"-prefixed names. Since 6.0.0, they are stringified to "@//"-prefixed names. Unfortunately, this does not apply to data coming from BEP. Targets references in BEP events payload are "//"-prefixed. For this reason we need to add "@" manually after retrieving data from BEP. 2. aspects.bzl: Retrieve runtime toolchain in the new way (Bazel 6.0.0) 3. cpp-project: Old GTest version is incompatible with Bazel 6.0.0, the new one required cpp version bump (--std=c++17) 4. e2e tests are now adapted to run across multiple Bazel versions (currently 5 and 6) 5. JdkResolver: JDK version was inferred from source version, which is not always true. That's why it is safer just to pass null.
a049af4
to
1da7dc2
Compare
1da7dc2
to
31f3efd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i feel that we can do it without bazel version - the bazel version is used only in 3 places:
isWorkspaceTarget
- we can just check does the id starts with//
or@//
- similar for extracting the relative path
but then we could do it without passing BazelInfo
around, what d u think about it?
bazelrunner/src/main/java/org/jetbrains/bsp/bazel/bazelrunner/BazelInfo.kt
Show resolved
Hide resolved
e2e/src/main/java/org/jetbrains/bsp/bazel/base/BazelBspTestBaseScenario.kt
Show resolved
Hide resolved
server/src/main/java/org/jetbrains/bsp/bazel/server/sync/languages/java/JdkResolver.kt
Outdated
Show resolved
Hide resolved
It was based on "source" version of the jdk, which was not always equal to the JDK version. Now, we always call "java -version" to retrieve the version number
@abrams27 It would be good and less code indeed, but when I've been working on it, I considered |
Main Repository Target Label Prefixes.
In Bazel 5 and older, the target labels were strigified to "//"-prefixed names. Since
6.0.0, they are stringified to "@//"-prefixed names. Unfortunately, this does not apply
to data coming from BEP. Targets references in BEP events payload are "//"-prefixed.
For this reason we need to add "@" manually after retrieving data from BEP.
aspects.bzl: Retrieve runtime toolchain in the new way (Bazel 6.0.0)
cpp-project: Old GTest version is incompatible with Bazel 6.0.0, the
new one required cpp version bump (--std=c++17)
e2e tests are now adapted to run across multiple Bazel versions (currently 5 and 6)
JdkResolver: JDK version was inferred from source version, which is not always true. That's
why it is safer just to pass null.