woggioni/my-gradle-plugins
1
0
Fork 0
Code Actions Packages Releases Activity

fixed bug with outputFile property handling

Browse Source
This commit is contained in:
Walter Oggioni
2020-10-27 13:01:27 +01:00
parent 4941481ad9
commit b38dd1f12c
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
jpms-check/src/main/groovy/net/woggioni/plugins/jpms/check/JPMSCheckPlugin.groovy
View File

@@ -156,16 +156,19 @@ class JPMSCheckPlugin implements Plugin<Project> {
boolean recursive = project.properties["jpms-check.recursive"]?.with(Boolean.&parseBoolean) ?: false boolean recursive = project.properties["jpms-check.recursive"]?.with(Boolean.&parseBoolean) ?: false
String cfgName = project.properties["jpms-check.configurationName"] ?: "default" String cfgName = project.properties["jpms-check.configurationName"] ?: "default"
String outputFormat = project.properties["jpms-check.outputFormat"] ?: "html" String outputFormat = project.properties["jpms-check.outputFormat"] ?: "html"
Path outputFile Path outputFile = project.properties["jpms-check.outputFile"]?.with {
switch(outputFormat) { Paths.get(it as String)
case "html": } ?: with {
outputFile = Paths.get(project.properties["jpms-check.outputFile"]) ?: Paths.get(project.buildDir.path, "jpms-report.html") switch(outputFormat) {
break case "html":
case "json": Paths.get(project.buildDir.path, "jpms-report.html")
outputFile = Paths.get(project.properties["jpms-check.outputFile"]) ?: Paths.get(project.buildDir.path, "jpms-report.json") break
break case "json":
default: Paths.get(project.buildDir.path, "jpms-report.json")
throw new IllegalArgumentException("Unsupported output format: $outputFormat") break
default:
throw new IllegalArgumentException("Unsupported output format: $outputFormat")
}
} }
doLast { doLast {
Set<CheckResult> results = (recursive ? project.subprojects.stream() : Stream.of(project)).flatMap { Set<CheckResult> results = (recursive ? project.subprojects.stream() : Stream.of(project)).flatMap {