diff --git a/jarjar-gradle-plugin/src/main/groovy/net/vrallev/gradle/jarjar/JarJarPluginExtension.groovy b/jarjar-gradle-plugin/src/main/groovy/net/vrallev/gradle/jarjar/JarJarPluginExtension.groovy index ad352c1..9d3f6c4 100644 --- a/jarjar-gradle-plugin/src/main/groovy/net/vrallev/gradle/jarjar/JarJarPluginExtension.groovy +++ b/jarjar-gradle-plugin/src/main/groovy/net/vrallev/gradle/jarjar/JarJarPluginExtension.groovy @@ -14,6 +14,7 @@ class JarJarPluginExtension { String outputDir = 'libs' boolean ignoreJarJarResult = false + boolean verbose = false boolean equals(o) { if (this.is(o)) return true @@ -22,6 +23,7 @@ class JarJarPluginExtension { JarJarPluginExtension that = (JarJarPluginExtension) o if (ignoreJarJarResult != that.ignoreJarJarResult) return false + if (verbose != that.verbose) return false if (jarJarFile != that.jarJarFile) return false if (outputDir != that.outputDir) return false if (outputName != that.outputName) return false @@ -39,6 +41,7 @@ class JarJarPluginExtension { result = 31 * result + (outputName != null ? outputName.hashCode() : 0) result = 31 * result + (outputDir != null ? outputDir.hashCode() : 0) result = 31 * result + (ignoreJarJarResult ? 1 : 0) + result = 31 * result + (verbose ? 1 : 0) return result } @@ -51,6 +54,7 @@ class JarJarPluginExtension { ", outputName='" + outputName + '\'' + ", outputDir='" + outputDir + '\'' + ", ignoreJarJarResult=" + ignoreJarJarResult + + ", verbose=" + verbose + '}'; } } diff --git a/jarjar-gradle-plugin/src/main/groovy/net/vrallev/gradle/jarjar/tasks/RepackageTask.groovy b/jarjar-gradle-plugin/src/main/groovy/net/vrallev/gradle/jarjar/tasks/RepackageTask.groovy index 107b8b2..b01dc13 100644 --- a/jarjar-gradle-plugin/src/main/groovy/net/vrallev/gradle/jarjar/tasks/RepackageTask.groovy +++ b/jarjar-gradle-plugin/src/main/groovy/net/vrallev/gradle/jarjar/tasks/RepackageTask.groovy @@ -36,13 +36,22 @@ class RepackageTask extends DefaultTask { project.exec { workingDir project.projectDir - ignoreExitValue = JarJarPlugin.getExtension(project).ignoreJarJarResult + def extension = JarJarPlugin.getExtension(project) + ignoreExitValue = extension.ignoreJarJarResult + + def args = [] if (Os.isFamily(Os.FAMILY_WINDOWS)) { - commandLine 'cmd', '/c', 'java', '-jar', jarJarExeFile.absolutePath, 'process', rulesFile.absolutePath, rawFatJar.absolutePath, outJar.absolutePath - } else { - commandLine 'java', '-jar', jarJarExeFile.absolutePath, 'process', rulesFile.absolutePath, rawFatJar.absolutePath, outJar.absolutePath + args.addAll 'cmd', '/c' } + + args.addAll 'java', + "-Dverbose=$extension.verbose", + '-jar', jarJarExeFile.absolutePath, + 'process', rulesFile.absolutePath, + rawFatJar.absolutePath, + outJar.absolutePath + commandLine args } String variantString = getVariant(project)