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
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
|
From: Markus Koschany <apo@debian.org>
Date: Sun, 29 Mar 2020 22:37:56 +0200
Subject: build
---
--- a/brut.apktool/apktool-cli/build.gradle
+++ b/brut.apktool/apktool-cli/build.gradle
@@ -15,7 +15,6 @@
*/
import proguard.gradle.ProGuardTask
-apply plugin: 'com.github.johnrengelman.shadow'
dependencies {
implementation depends.commons_cli
@@ -42,11 +41,10 @@
}
task cleanOutputDirectory(type: Delete) {
- delete fileTree(dir: jar.getDestinationDirectory().getAsFile(), exclude: "apktool-cli-all.jar")
}
-task proguard(type: ProGuardTask, dependsOn: shadowJar) {
- injars shadowJar.getArchiveFile()
+task proguard(type: ProGuardTask) {
+ injars jar.archivePath
// Java 9 and prior uses merged package for runtime, later uses split jmod files.
if (JavaVersion.current() <= JavaVersion.VERSION_1_8) {
@@ -77,9 +75,7 @@
// between Java 1.8 and 1.9, the signature of `flip()` changed, which trips up proguard.
dontwarn 'org.yaml.snakeyaml.scanner.ScannerImpl'
- def outPath = jar.getDestinationDirectory().getAsFile().get().toString()
- def extension = jar.archiveExtension.get().toString()
- def outFile = outPath + '/' + "apktool" + '-' + project.apktool_version + '-small' + '.' + extension
+ def outFile = jar.destinationDir.getPath() + '/' + "apktool" + '-' + project.apktool_version + '-small' + '.' + jar.extension
outjars outFile
}
--- a/build.gradle
+++ b/build.gradle
@@ -18,16 +18,16 @@
buildscript {
ext {
depends = [
- baksmali : 'com.github.iBotPeaches.smali:baksmali:403e90375e',
+ baksmali : 'org.smali:baksmali:debian',
commons_cli : 'commons-cli:commons-cli:1.5.0',
commons_io : 'commons-io:commons-io:2.11.0',
commons_lang : 'org.apache.commons:commons-lang3:3.12.0',
commons_text : 'org.apache.commons:commons-text:1.10.0',
guava : 'com.google.guava:guava:31.0.1-jre',
junit : 'junit:junit:4.13.2',
- proguard_gradle: 'com.guardsquare:proguard-gradle:7.3.0',
- snakeyaml : 'org.yaml:snakeyaml:1.32:android',
- smali : 'com.github.iBotPeaches.smali:smali:403e90375e',
+ smali : 'org.smali:smali:debian',
+ proguard_gradle: 'net.sf.proguard:proguard-gradle:debian',
+ snakeyaml : 'org.yaml:snakeyaml:2.x',
xmlpull : 'xpp3:xpp3:1.1.4c',
xmlunit : 'xmlunit:xmlunit:1.6',
]
@@ -36,10 +36,6 @@
repositories {
gradlePluginPortal()
}
- dependencies {
- classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.0"
- classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1"
- }
}
apply from: 'gradle/functions.gradle'
@@ -47,58 +43,19 @@
version = '2.7.0'
def suffix = ''
-defaultTasks 'build', 'shadowJar', 'proguard'
+defaultTasks 'build', 'proguard'
allprojects {
apply plugin: 'java'
- apply plugin: 'com.github.hierynomus.license'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
- license {
- header rootProject.file("brut.j.common/src/templates/apache2.0-header.txt")
- exclude "**/android/content/res/*.java"
- exclude "**/android/util/*.java"
- include "**/*.java"
- mapping {
- java = 'SLASHSTAR_STYLE'
- }
- ext {
- year = '2010'
- brut = 'Ryszard Wiśniewski'
- brutEmail = 'brut.alll@gmail.com'
- ibot = 'Connor Tumbleson'
- ibotEmail = 'connor.tumbleson@gmail.com'
- }
- strictCheck true
- }
-
- // license plugin automatically fires these tasks, disable them and run them during releases
- gradle.startParameter.excludedTaskNames += [
- "licenseMain",
- "licenseTest"
- ]
-
repositories {
mavenCentral()
-
- // Obtain baksmali/smali from source builds - https://github.com/iBotPeaches/smali
- // Remove when official smali releases come out again.
- maven {
- url 'https://jitpack.io'
- content {
- includeGroup('com.github.iBotPeaches.smali')
- }
- }
}
}
-tasks.withType(JavaCompile).configureEach {
- options.encoding = StandardCharsets.UTF_8.toString()
- options.compilerArgs += ["-Xlint:-options"]
-}
-
def mavenVersion = 'unspecified'
if (!('release' in gradle.startParameter.taskNames)) {
def hash = getCheckedOutGitCommitHash()
@@ -169,64 +126,10 @@
artifactId = project.name
version = mavenVersion
- pom {
- name = 'Apktool'
- description = 'A tool for reverse engineering Android apk files.'
- url = 'https://apktool.org'
-
- licenses {
- license {
- name = 'The Apache License 2.0'
- url = 'https://opensource.org/licenses/Apache-2.0'
- }
- }
- developers {
- developer {
- id = 'iBotPeaches'
- name = 'Connor Tumbleson'
- email = 'connor.tumbleson@gmail.com'
- }
- developer {
- id = 'brutall'
- name = 'Ryszard Wiśniewski'
- email = 'brut.alll@gmail.com'
- }
- }
- scm {
- connection = 'scm:git:git://github.com/iBotPeaches/Apktool.git'
- developerConnection = 'scm:git:git@github.com:iBotPeaches/Apktool.git'
- url = 'https://github.com/iBotPeaches/Apktool'
- }
- }
- }
- }
- if (rootProject.hasProperty('ossrhUsername') && rootProject.hasProperty('ossrhPassword')) {
- repositories {
- maven {
- if (mavenVersion.endsWith('-SNAPSHOT')) {
- url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
- } else {
- url = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
- }
- credentials {
- username ossrhUsername
- password ossrhPassword
- }
- }
}
}
}
- signing {
- required { gradle.taskGraph.hasTask('publish') }
- sign(publishing.publications["maven"])
- }
-
- java {
- withJavadocJar()
- withSourcesJar()
- }
-
tasks.getByPath(':release').dependsOn(publish)
tasks.getByPath(':snapshot').dependsOn(publish)
}
|
