Fix MalformedInputException in checkJUnitDependencies #1932
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Generate changelog in
|
CRogers
commented
Oct 4, 2021
| } catch (IOException e) { | ||
| throw new RuntimeException("Unable to check file " + file, e); | ||
| return lines.anyMatch(substring); | ||
| } catch (Exception e) { |
There was a problem hiding this comment.
MalformedInputException is thrown as an UncheckedIOException.
…-baseline into callumr/fix-invalid-utf8
fawind
reviewed
Oct 4, 2021
| @@ -164,7 +163,7 @@ private boolean hasDep(Set<ResolvedComponentResult> deps, Predicate<ModuleVersio | |||
| } | |||
|
|
|||
| private boolean sourceSetMentionsJUnit4(SourceSet ss) { | |||
| return !ss.getAllSource() | |||
| return !ss.getAllJava() | |||
There was a problem hiding this comment.
Might be worth adding a small comment here that getAllJava is also including groovy files.
|
Released 4.28.0 |
This was referenced Oct 4, 2021
Merged
This was referenced Oct 4, 2021
bulldozer-bot bot
pushed a commit
to palantir/witchcraft-api
that referenced
this pull request
Oct 4, 2021
###### _excavator_ is a bot for automating changes across repositories. Changes produced by the roomba/latest-baseline-oss check. # Release Notes ## 4.28.0 | Type | Description | Link | | ---- | ----------- | ---- | | Fix | Fix `MalformedInputException` when checking non-utf8 files for correct junit dependencies. | palantir/gradle-baseline#1932 | To enable or disable this check, please contact the maintainers of Excavator.
This was referenced Oct 4, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this PR
In #1929, I had originally changed searching in
sourceSet.getAllJava()tosourceSet.getAllSource()to make sure we were looking in.groovyfiles as well as java. I left it in there by accident. However, this has had the downside of searching through the resources too, which may contain non-utf8 encoded files. This leads to this kind of error:as it tries to decode non-utf8 files into utf8.
Additionally, I never proved out whether groovy files are included in
getAllSourceand notgetAllJava. Looking at theGroovyBasePluginit actually puts the groovy source into the java source sets:After this PR
==COMMIT_MSG==
Fix
MalformedInputExceptionwhen checking non-utf8 files for correct junit dependencies.==COMMIT_MSG==
Possible downsides?