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 Java 21 compatibilities #1920

Merged
merged 10 commits into from
Dec 3, 2023
Merged

Fix Java 21 compatibilities #1920

merged 10 commits into from
Dec 3, 2023

Conversation

Goooler
Copy link
Member

@Goooler Goooler commented Dec 1, 2023 •
edited
Loading

@Goooler

This comment was marked as outdated.

Sign in to view
@Goooler Goooler mentioned this pull request Dec 1, 2023
Closed
@Goooler Goooler changed the title Bump palantir-java-format for Java 21 Use palantir-java-format 2.38.0 on Java 21 Dec 1, 2023
@slachiewicz @Goooler
Use palantir-java-format 2.38.0 on Java 21
de20ea9 
Co-authored-by: Goooler <wangzongler@gmail.com>
@steven-sheehy
Copy link
Contributor

This doesn't seem to have the java 21 workflow or the guava variant fix?

@Goooler
Copy link
Member Author

Goooler commented Dec 2, 2023

Yeah, I should probably add Java 21 to CI first.

@Goooler Goooler marked this pull request as draft December 2, 2023 04:02
@Goooler
Gradle 8.5
00596df 
https://docs.gradle.org/8.5/release-notes.html
@Goooler
Add Java 21 to CI matrix
1ba268b
@Goooler
Bump default googleJavaFormat version to latest 1.18.1
7b6cefd 
https://github.com/google/google-java-format/releases
@Goooler
Declare TARGET_JVM_ENVIRONMENT_ATTRIBUTE attr for resolving Guava
682dcd6
@Goooler
Use Guava 32.1.3
a6495ed
@Goooler
Fix tests related to Java 21
ce7563c 
* Fix CombinedJavaFormatStepTest

* Fix GoogleJavaFormatStepTest

* Fix PalantirJavaFormatStepTest

* Fix GoogleJavaFormatIntegrationTest

* Fix MultiProjectTest

* Fix MavenProvisionerTest

* Fix PalantirJavaFormatTest

* Fix SpecificFilesTest

* Fix GoogleJavaFormatTest
@Goooler Goooler changed the title Use palantir-java-format 2.38.0 on Java 21 Fix Java 21 compatibilities Dec 3, 2023
@Goooler Goooler marked this pull request as ready for review December 3, 2023 05:46
@Goooler
Copy link
Member Author

Goooler commented Dec 3, 2023

Fixed all tests but jvmLocalCache, which is related to #987, no idea for this.

https://scans.gradle.com/s/6mslfqjw7nhie/tests/overview?outcome=FAILED

@nedtwigg nedtwigg mentioned this pull request Dec 3, 2023
Closed
1 task
@nedtwigg
Copy link
Member

nedtwigg commented Dec 3, 2023

Fascinating. The JvmLocalCache test fails only on Java 21, and I can replicate it on my machine. I'm digging in...

@nedtwigg
jvmLocalCache was failing on Java 21 because the trick we used to t…
c95574f 
…est JvmLocalCache doesn't work with Gradle 8.5.
@nedtwigg nedtwigg mentioned this pull request Dec 3, 2023
Closed
1 task
@nedtwigg nedtwigg merged commit 7717dba into diffplug:main Dec 3, 2023
13 checks passed
@Goooler Goooler deleted the bump-palantir-java-format branch December 4, 2023 00:36
@nedtwigg nedtwigg mentioned this pull request Dec 4, 2023
Closed
@nedtwigg
Copy link
Member

nedtwigg commented Dec 4, 2023

Published in plugin-gradle 6.23.3 and plugin-maven 2.41.1.

@bombcar bombcar mentioned this pull request Dec 8, 2023
Closed
3 tasks
@yashmayya yashmayya mentioned this pull request Apr 23, 2024
Merged
@chia7712 chia7712 mentioned this pull request Jun 3, 2024
Merged
@gongxuanzhang gongxuanzhang mentioned this pull request Jun 3, 2024
Merged
@devtobi devtobi mentioned this pull request Aug 2, 2024
Open
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Test integration with the latest Java version on CI Update default versions for palantir-java-format
4 participants
@Goooler @steven-sheehy @nedtwigg @slachiewicz