Skip to content

Upgrade to Groovy 3.0.7 #24946

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

Closed
wants to merge 2 commits into from
Closed

Conversation

dreis2211
Copy link
Contributor

Hi,

this PR tackles #20119 as discussed.

Let me know what you think.
Cheers,
Christoph

@@ -87,7 +87,8 @@ void setUpExpectations() {

@Test
void transformationOfAnnotationOnImport() {
this.moduleNode.addImport(null, null, Arrays.asList(this.grabAnnotation));
ClassNode classNode = new ClassNode("Test", 0, new ClassNode(Object.class));
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Passing null throws an NPE these days.

@philwebb philwebb added the type: dependency-upgrade A dependency upgrade label Jan 20, 2021
@philwebb philwebb added this to the 2.5.x milestone Jan 20, 2021
@dreis2211
Copy link
Contributor Author

Apparently, I need to check why my local builds didn't report the same build failure as on Concourse. I will work on the build error of course.

@@ -17,7 +16,7 @@ class Example implements CommandLineRunner {

void run(String... args) {
def port = context.webServer.port
def world = new RESTClient("http://localhost:" + port).get(path:"/").data.text
def world = new RestTemplate().getForObject("http://localhost:" + port + "/", String.class);
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
def world = new RestTemplate().getForObject("http://localhost:" + port + "/", String.class);
def world = new RestTemplate().getForObject("http://localhost:$port/", String.class);

It's more the Groovy way :).

Copy link
Contributor

@szpak szpak Jan 20, 2021

Choose a reason for hiding this comment

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

Anyway, I would put here int and String instead of just def for clarity.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for taking a look, @szpak. Those are good changes to make, but they're unrelated to an upgrade to Groovy 3.0 so let's keep them separate from this PR please.

Copy link
Contributor

@szpak szpak left a comment

Choose a reason for hiding this comment

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

In general LGTM.

@wilkinsona wilkinsona self-assigned this Jan 21, 2021
wilkinsona pushed a commit that referenced this pull request Jan 21, 2021
@wilkinsona
Copy link
Member

Thank you very much, @dreis2211. Much appreciated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: dependency-upgrade A dependency upgrade
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants