Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Detect all Java source by default#60

Merged
nedtwigg merged 1 commit into
diffplug:masterdiffplug/spotless:masterfrom
ajoberstar:alljavaCopy head branch name to clipboard
Jan 2, 2017
Merged

Detect all Java source by default#60
nedtwigg merged 1 commit into
diffplug:masterdiffplug/spotless:masterfrom
ajoberstar:alljavaCopy head branch name to clipboard

Conversation

@ajoberstar

Copy link
Copy Markdown
Contributor

Fixes #59, by using the getAllJava() method on SourceSet instead
of getJava(). The main application where this is useful is projects
that do joint Java/Groovy compilation, which sometimes requires putting
Java source into the Groovy directory. getAllJava() correctly picks up
all of these source files.

The test is a modified copy of the GoogleJavaFormatTest. The main oddity
in this test is that a side-effect of the GradleIntegrationTest.write()
methods is that a newline is always present at the end of the file. This
means that you can't round trip a file through write()/read() and
expect it to be the same. To avoid modifying that behavior, since I'm
not sure how much other tests depend on it, I just re-read the groovy
source after writing to ensure I could verify it wasn't changed by
spotlessApply.

Fixes #59, by using the getAllJava() method on SourceSet instead
of getJava(). The main application where this is useful is projects
that do joint Java/Groovy compilation, which sometimes requires putting
Java source into the Groovy directory. getAllJava() correctly picks up
all of these source files.

The test is a modified copy of the GoogleJavaFormatTest. The main oddity
in this test is that a side-effect of the GradleIntegrationTest.write()
methods is that a newline is always present at the end of the file. This
means that you can't round trip a file through write()/read() and
expect it to be the same. To avoid modifying that behavior, since I'm
not sure how much other tests depend on it, I just re-read the groovy
source after writing to ensure I could verify it wasn't changed by
spotlessApply.
@nedtwigg

nedtwigg commented Jan 2, 2017

Copy link
Copy Markdown
Member

Looks great, thanks @ajoberstar! Does .getAllJava() automatically limit itself to .java files? e.g. no groovy files?

@ajoberstar

Copy link
Copy Markdown
Contributor Author

Yep, the test validates this as an extra safety net.

@nedtwigg
nedtwigg merged commit d540ada into diffplug:master Jan 2, 2017
@nedtwigg

nedtwigg commented Jan 2, 2017

Copy link
Copy Markdown
Member

Great! Just validated on my local machine. I'll merge and release as 2.4.1 today.

@ajoberstar

Copy link
Copy Markdown
Contributor Author

Thanks!

@ajoberstar
ajoberstar deleted the alljava branch January 2, 2017 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.