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

[8.0.0] Update rules_java v8.5.0 and stop exporting builtins java rules and symbols #24414

Merged
merged 15 commits into from
Nov 20, 2024
Merged

[8.0.0] Update rules_java v8.5.0 and stop exporting builtins java rules and symbols #24414

merged 15 commits into from
Nov 20, 2024

Conversation

hvadehra
Copy link
Member

@hvadehra hvadehra commented Nov 20, 2024 •
edited
Loading

Fixes #24405

Fixes #24178

@hvadehra hvadehra force-pushed the hvd_bazel8_rulesjava branch from 2063d6c to 3b70913 Compare November 20, 2024 15:06
hvadehra and others added 14 commits November 20, 2024 18:41
@hvadehra
Update rules_java v8.3.0
36d2e2b 
Closes #24143.

PiperOrigin-RevId: 693275804
Change-Id: I052d7472beebafb1ca6c021ac4aafceb6b2aa6b7

(cherry picked from commit 8ce1661)
@hvadehra
Prepare for moving the java providers out of builtins
966f05a 
PiperOrigin-RevId: 695293041
Change-Id: I06c293ee1c8ef119d37c3c2188763914041d55fd
(cherry picked from commit da1aba9)
@hvadehra
Use canonical repo name in rules_java provider key labels
892df1d 
PiperOrigin-RevId: 695310715
Change-Id: I55fc8f5e61f9a7f508d1fb77d30c64790c18fb82
(cherry picked from commit 84e6698)
@hvadehra
Add a third variant of native provider wrappers for @rules_java itself
12e7f96 
Needed for when the main repository is `rules_java`

PiperOrigin-RevId: 695621150
Change-Id: I66ff003dcf063ecf7905accfc83a4babedd2d34c
(cherry picked from commit 66ea9a0)
@hvadehra
Fix Autoloads skyframe injection
44dd2ca 
Before this, changing the value of `--enable_bzlmod` did not invalidate the existing skyframe precomputed value as the instances were considered the same/equal (see `src/main/java/com/google/devtools/build/skyframe/AbstractInMemoryMemoizingEvaluator.java#pruneInjectedValues`)

Fixes bazelbuild/rules_python#2387

PiperOrigin-RevId: 695696010
Change-Id: I136f2bec4e2c668d020f6cb1a7d3200f7523e5a0
(cherry picked from commit a5b6c30)
@jin @hvadehra
Encode JavaInfo provider type.
2d04f52 
da1aba9 introduces `BuiltinsJavaInfo`, which uses a different provider type (`LEGACY_BUILTINS_PROVIDER`). This information needs to be encoded along with the serialized provider fields for the deserializer to re-instantiate it back to `BuiltinsJavaInfo` instead of `JavaInfo`.

PiperOrigin-RevId: 695991580
Change-Id: I3b7a5b87a2619d83ca6e7d3a3eee0349769b0640
(cherry picked from commit dc4fb9c)
@hvadehra
Add the fourth (and last) variant of native Java provider wrappers fo…
41e676b 
…r use in `WORKSPACE` mode

PiperOrigin-RevId: 696033794
Change-Id: I0d49b21567a82f673694c558bbcb8a08950559f3
(cherry picked from commit 5b09ab6)
@hvadehra
Prepare tests for moving the Java providers & toolchain rules out of …
e16eeeb 
…`@_builtins`

Mostly just adds `load` statements everywhere.

PiperOrigin-RevId: 696496082
Change-Id: I5dfc4a58c2c9dffd144b2488fd33a8e665b88db1
(cherry picked from commit 00c1b7b)
@hvadehra
Automatic code cleanup.
18072d5 
PiperOrigin-RevId: 697081436
Change-Id: I135693ec26f937f0439939578437f5ce1eec3ffa
(cherry picked from commit 09c848f)
@hvadehra
Add load()s for the java rules to all tests
4069f64 
PiperOrigin-RevId: 697649173
Change-Id: If48cefaae8bb5c6c845ed05de70b2e682c070c15
(cherry picked from commit 89c634f)
@hvadehra
Update rules_java v8.5.0
4afa002 
Closes #24391.

PiperOrigin-RevId: 698301966
Change-Id: I004ae10070354f7f565778a58a1d97be234f55c0

(cherry picked from commit eb2859a)
@cushon @hvadehra
Remove obsolete logic for handling .jar files in deps
5c9e25a 
This logic has been ported to starlark, this method is unused.

PiperOrigin-RevId: 688987600
Change-Id: I932fb9a5f40ded4f5b253d2b447045e52a610656
(cherry picked from commit b3badd3)
@hvadehra
Delete unused java rule code from @_builtins
e84a297 
PiperOrigin-RevId: 685617340
Change-Id: I78937da0298740aa1cf8f09a21c847818a94bea0

(cherry picked from commit 24c3f24)
@hvadehra
Stop exporting java rules / providers from @_builtins
a16d6df 
`java_common` needs to remain (minimally exported) for private APIs

PiperOrigin-RevId: 698412708
Change-Id: I58708761e7abbc63013f75276b1cd1f98c11430f
(cherry picked from commit ae3262f)
@hvadehra hvadehra force-pushed the hvd_bazel8_rulesjava branch from 3b70913 to a16d6df Compare November 20, 2024 17:42
@hvadehra hvadehra changed the title [8.0.0] Update rules_java v8.5.0 and drop builtin JavaInfo / JavaPluginInfo [8.0.0] Update rules_java v8.5.0 and stop exporting builtins java rules and symbols Nov 20, 2024
@hvadehra hvadehra marked this pull request as ready for review November 20, 2024 17:58
@hvadehra hvadehra requested a review from a team as a code owner November 20, 2024 17:58
@github-actions github-actions bot added team-Configurability platforms, toolchains, cquery, select(), config transitions team-Rules-Java Issues for Java rules awaiting-review PR is awaiting review from an assigned reviewer labels Nov 20, 2024
@hvadehra hvadehra removed the team-Configurability platforms, toolchains, cquery, select(), config transitions label Nov 20, 2024
@iancha1992 iancha1992 mentioned this pull request Nov 20, 2024
Closed
@hvadehra
Copy link
Member Author

I just realized this will break documentation, will need another fix for that.

@Wyverald Wyverald added this pull request to the merge queue Nov 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 20, 2024
@hvadehra
Use the toolchain rules from @rules_java in the Bazel Build Encyclo…
f492a47 
…pedia.

PiperOrigin-RevId: 698443050
Change-Id: Ibd7baccd8ef8e865d5006ecc8f19cb135a174ad5
(cherry picked from commit 117d711)
@Wyverald Wyverald enabled auto-merge November 20, 2024 18:52
@hvadehra
Copy link
Member Author

This is good to go

@Wyverald Wyverald added this pull request to the merge queue Nov 20, 2024
Merged via the queue into release-8.0.0 with commit a4bca9f Nov 20, 2024
47 checks passed
@github-actions github-actions bot removed the awaiting-review PR is awaiting review from an assigned reviewer label Nov 20, 2024
@hvadehra hvadehra deleted the hvd_bazel8_rulesjava branch November 22, 2024 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Wyverald Wyverald Wyverald approved these changes

@comius comius Awaiting requested review from comius

@meteorcloudy meteorcloudy Awaiting requested review from meteorcloudy

Assignees
No one assigned
Labels
team-Rules-Java Issues for Java rules
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hvadehra @Wyverald @jin @cushon