From 4fa5f0802359e8c4aebadd5a603d479e31573e4d Mon Sep 17 00:00:00 2001 From: Alex Lipov Date: Fri, 28 Jul 2017 14:32:35 +0300 Subject: [PATCH 1/2] Adding verbose and skipManifest **optional** properties (default is false for both). Passing them to jarjar as system properties. --- .../gradle/jarjar/JarJarPluginExtension.groovy | 8 ++++++++ .../gradle/jarjar/tasks/RepackageTask.groovy | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) 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..7257cef 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,8 @@ class JarJarPluginExtension { String outputDir = 'libs' boolean ignoreJarJarResult = false + boolean verbose = false + boolean skipManifest = false boolean equals(o) { if (this.is(o)) return true @@ -22,6 +24,8 @@ class JarJarPluginExtension { JarJarPluginExtension that = (JarJarPluginExtension) o if (ignoreJarJarResult != that.ignoreJarJarResult) return false + if (skipManifest != that.skipManifest) 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 +43,8 @@ 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) + result = 31 * result + (skipManifest ? 1 : 0) return result } @@ -51,6 +57,8 @@ class JarJarPluginExtension { ", outputName='" + outputName + '\'' + ", outputDir='" + outputDir + '\'' + ", ignoreJarJarResult=" + ignoreJarJarResult + + ", verbose=" + verbose + + ", skipManifest=" + skipManifest + '}'; } } 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..9adb844 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,23 @@ 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", + "-DskipManifest=$extension.skipManifest", + '-jar', jarJarExeFile.absolutePath, + 'process', rulesFile.absolutePath, + rawFatJar.absolutePath, + outJar.absolutePath + commandLine args } String variantString = getVariant(project) From 3661fd03a7f7201b40a9d187724ac227954c33e1 Mon Sep 17 00:00:00 2001 From: Alex Lipov Date: Fri, 28 Jul 2017 15:24:47 +0300 Subject: [PATCH 2/2] Removing recently added skipManifest, since it is just a special case of srcExcludes property (all it does is exclude the META-INF/MANIFEST.MF file, which can already be done by srcExcludes). --- .../net/vrallev/gradle/jarjar/JarJarPluginExtension.groovy | 4 ---- .../net/vrallev/gradle/jarjar/tasks/RepackageTask.groovy | 1 - 2 files changed, 5 deletions(-) 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 7257cef..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 @@ -15,7 +15,6 @@ class JarJarPluginExtension { boolean ignoreJarJarResult = false boolean verbose = false - boolean skipManifest = false boolean equals(o) { if (this.is(o)) return true @@ -24,7 +23,6 @@ class JarJarPluginExtension { JarJarPluginExtension that = (JarJarPluginExtension) o if (ignoreJarJarResult != that.ignoreJarJarResult) return false - if (skipManifest != that.skipManifest) return false if (verbose != that.verbose) return false if (jarJarFile != that.jarJarFile) return false if (outputDir != that.outputDir) return false @@ -44,7 +42,6 @@ class JarJarPluginExtension { result = 31 * result + (outputDir != null ? outputDir.hashCode() : 0) result = 31 * result + (ignoreJarJarResult ? 1 : 0) result = 31 * result + (verbose ? 1 : 0) - result = 31 * result + (skipManifest ? 1 : 0) return result } @@ -58,7 +55,6 @@ class JarJarPluginExtension { ", outputDir='" + outputDir + '\'' + ", ignoreJarJarResult=" + ignoreJarJarResult + ", verbose=" + verbose + - ", skipManifest=" + skipManifest + '}'; } } 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 9adb844..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 @@ -47,7 +47,6 @@ class RepackageTask extends DefaultTask { args.addAll 'java', "-Dverbose=$extension.verbose", - "-DskipManifest=$extension.skipManifest", '-jar', jarJarExeFile.absolutePath, 'process', rulesFile.absolutePath, rawFatJar.absolutePath,