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

Add rewrite-java-21 to resolved dependencies #254

Merged
merged 2 commits into from
Jan 3, 2024
Merged

Add rewrite-java-21 to resolved dependencies #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
276ac9c
Add rewrite-java-21 to resolved dependencies
timtebeek Jan 3, 2024
79172d5
Fix failing tests
timtebeek Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions plugin/src/main/java/org/openrewrite/gradle/ResolveRewriteDependenciesTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public Set<File> getResolvedDependencies() {
deps.create("org.openrewrite:rewrite-json:" + rewriteVersion),
deps.create("org.openrewrite:rewrite-kotlin:" + extension.getRewriteKotlinVersion()),
deps.create("org.openrewrite:rewrite-java:" + rewriteVersion),
deps.create("org.openrewrite:rewrite-java-21:" + rewriteVersion),
Copy link
Contributor Author

@timtebeek timtebeek Jan 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The first rewrite version to have rewrite-java-21 is 8.8.0.
Older rewrite versions will now fail to resolve dependencies.
Figured that's ok, but thought to point it out as it failed a test.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I agree that's probably fine. If we ever run into a case where it becomes more difficult, we can always wrap a condition around the version so as to only enable it when it's new enough.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We could add a conditional by looking at the rewriteVersion, but 8.8.0 was released in October and there's likely other incompatibilities between older rewrite versions and the latest gradle plugin version by now anyway, so I figure there's less of a need to handle this differently.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yep, I wasn't meaning to add it now because like you said, it's been out for a while now and there are most certainly going to be other quirks. But more just figured that I'd mention it for the hypothetical of us being on top of the Java 25 LTS more quickly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed; your first comment only showed after I had replied with my second comment; so it wasn't as much a reply as a parallel similar thought. Thanks for the help and quick review!

deps.create("org.openrewrite:rewrite-java-17:" + rewriteVersion),
deps.create("org.openrewrite:rewrite-java-11:" + rewriteVersion),
deps.create("org.openrewrite:rewrite-java-8:" + rewriteVersion),
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/test/kotlin/org/openrewrite/gradle/RewriteResolveDependenciesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class RewriteResolveDependenciesTest : RewritePluginTest {
}
rewrite {
rewriteVersion = "8.6.1"
rewriteVersion = "8.8.0"
}
""")
}
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/test/kotlin/org/openrewrite/gradle/RewriteRunTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ class RewriteRunTest : RewritePluginTest {
}
dependencies {
implementation("com.fasterxml.jackson.core:jackson-core:2.16.0")
implementation("com.fasterxml.jackson.core:jackson-core:2.16.1")
}
rewrite {
Expand Down