1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
From: Markus Koschany <apo@debian.org>
Date: Tue, 18 Sep 2018 23:03:21 +0200
Subject: build
---
brut.apktool/apktool-cli/build.gradle | 7 +++----
build.gradle | 31 ++-----------------------------
2 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/brut.apktool/apktool-cli/build.gradle b/brut.apktool/apktool-cli/build.gradle
index 6010661..f5b44cc 100644
--- a/brut.apktool/apktool-cli/build.gradle
+++ b/brut.apktool/apktool-cli/build.gradle
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-apply plugin: 'com.github.johnrengelman.shadow'
dependencies {
compile depends.commons_cli
@@ -40,10 +39,10 @@ task cleanOutputDirectory(type: Delete) {
delete fileTree(dir: jar.destinationDir.getPath(), exclude: "apktool-cli-all.jar")
}
-task proguard(type: proguard.gradle.ProGuardTask, dependsOn: shadowJar) {
+task proguard(type: proguard.gradle.ProGuardTask) {
def outFile = jar.destinationDir.getPath() + '/' + "apktool" + '-' + project.apktool_version + '-small' + '.' + jar.extension
- injars shadowJar.archivePath
+ injars jar.archivePath
outjars outFile
libraryjars "${System.properties['java.home']}/lib/rt.jar"
@@ -61,4 +60,4 @@ task proguard(type: proguard.gradle.ProGuardTask, dependsOn: shadowJar) {
}
proguard.dependsOn cleanOutputDirectory
-tasks.getByPath(':release').dependsOn(proguard)
\ No newline at end of file
+tasks.getByPath(':release').dependsOn(proguard)
diff --git a/build.gradle b/build.gradle
index 4503a25..cd70f38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,47 +20,20 @@ buildscript {
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}
- dependencies {
- classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
- }
}
-plugins {
- id "com.github.hierynomus.license" version "0.14.0"
-}
apply from: 'gradle/functions.gradle'
def apktoolversion_major = '2.3.4'
def apktoolversion_minor = '';
-defaultTasks 'build', 'shadowJar', 'proguard'
+defaultTasks 'build', 'proguard'
allprojects {
apply plugin: 'java'
- apply plugin: 'license'
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7
-
- license {
- header rootProject.file("brut.j.common/src/templates/apache2.0-header.txt")
- include "**/*.java"
- strictCheck true
-
- ext.year = Calendar.getInstance().get(Calendar.YEAR)
- ext.brut = 'Ryszard Wiśniewski'
- ext.brutEmail = 'brut.alll@gmail.com'
- ext.ibot = 'Connor Tumbleson'
- ext.ibotEmail = 'connor.tumbleson@gmail.com'
- }
-
- tasks.withType(JavaCompile) {
- options.compilerArgs += ["-Xlint:-options"]
- }
-
- // license plugin automatically fires these tasks, disable them and run them during releases
- gradle.startParameter.excludedTaskNames += "licenseMain"
- gradle.startParameter.excludedTaskNames += "licenseTest"
}
if (!('release' in gradle.startParameter.taskNames)) {
@@ -114,7 +87,7 @@ subprojects {
guava: 'com.google.guava:guava:14.0',
junit: 'junit:junit:4.12',
proguard_gradle: 'net.sf.proguard:proguard-gradle:5.2.1',
- snakeyaml: 'org.yaml:snakeyaml:1.18:android',
+ snakeyaml: 'org.yaml:snakeyaml:1.18',
smali: 'org.smali:smali:2.2.2',
xmlpull: 'xpp3:xpp3:1.1.4c',
xmlunit: 'xmlunit:xmlunit:1.6',
|
