Skip to content

Commit ec6db5c

Browse files
KonlochKonloch
authored
Merge pull request #349 from ThexXTURBOXx/master
Just some small stuff
2 parents 2d4c339 + b18459e commit ec6db5c

180 files changed

Lines changed: 1046 additions & 760 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 94 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,50 @@
66
<version>2.10.16</version>
77

88
<properties>
9+
<!-- Project settings -->
910
<java.version>1.8</java.version>
1011
<maven.compiler.target>${java.version}</maven.compiler.target>
1112
<maven.compiler.source>${java.version}</maven.compiler.source>
1213
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14+
15+
<!-- Dependency versions -->
16+
<annotations.version>22.0.0</annotations.version>
17+
<apktool.version>2.5.0bcv2</apktool.version>
18+
<asm.version>9.2</asm.version>
19+
<cfr.version>0.151</cfr.version>
20+
<cloning.version>1.9.12</cloning.version>
21+
<commons-cli.version>1.4</commons-cli.version>
22+
<commons-codec.version>1.15</commons-codec.version>
23+
<commons-compiler.version>3.1.6</commons-compiler.version>
24+
<commons-compress.version>1.21</commons-compress.version>
25+
<commons-io.version>2.11.0</commons-io.version>
26+
<commons-lang3.version>3.12.0</commons-lang3.version>
27+
<commons-text.version>1.9</commons-text.version>
28+
<decompiler-fernflower.version>5.2.0.Final</decompiler-fernflower.version>
29+
<fernflower.version>47afd82034</fernflower.version>
30+
<guava.version>30.1.1-jre</guava.version>
31+
<gson.version>2.8.8</gson.version>
32+
<imgscalr-lib.version>4.2</imgscalr-lib.version>
33+
<janino.version>3.1.6</janino.version>
34+
<jd-gui.version>1.6.6bcv</jd-gui.version>
35+
<byteanalysis.version>1.0bcv</byteanalysis.version>
36+
<jgraphx.version>3.4.1.3</jgraphx.version>
37+
<objenesis.version>3.2</objenesis.version>
38+
<procyon.version>0.5.36</procyon.version>
39+
<rsyntaxtextarea.version>3.1.3</rsyntaxtextarea.version>
40+
<slf4j.version>1.7.32</slf4j.version>
41+
<smali.version>2.5.2</smali.version>
42+
<snakeyaml.version>1.29</snakeyaml.version>
43+
<xpp3.version>1.1.4c</xpp3.version>
44+
<jadx.version>f681c89</jadx.version>
45+
<dex2jar.version>v24</dex2jar.version>
46+
<darklaf.version>2.7.2</darklaf.version>
47+
<darklaf-extensions-rsta.version>0.3.4</darklaf-extensions-rsta.version>
48+
<webp-imageio.version>0.2.2</webp-imageio.version>
49+
<semantic-version.version>2.1.0</semantic-version.version>
50+
<treelayout.version>1.0.3</treelayout.version>
51+
<antlr4.version>4.9.2</antlr4.version>
52+
<js.version>21.2.0</js.version>
1353
</properties>
1454

1555
<repositories>
@@ -31,87 +71,87 @@
3171
<dependency>
3272
<groupId>org.jetbrains</groupId>
3373
<artifactId>annotations</artifactId>
34-
<version>21.0.1</version>
74+
<version>${annotations.version}</version>
3575
</dependency>
3676
<dependency>
3777
<groupId>org.apktool</groupId>
3878
<artifactId>apktool</artifactId>
39-
<version>2.5.0bcv2</version>
79+
<version>${apktool.version}</version>
4080
</dependency>
4181
<dependency>
4282
<groupId>org.ow2.asm</groupId>
4383
<artifactId>asm</artifactId>
44-
<version>9.2</version>
84+
<version>${asm.version}</version>
4585
</dependency>
4686
<dependency>
4787
<groupId>org.ow2.asm</groupId>
4888
<artifactId>asm-analysis</artifactId>
49-
<version>9.2</version>
89+
<version>${asm.version}</version>
5090
</dependency>
5191
<dependency>
5292
<groupId>org.ow2.asm</groupId>
5393
<artifactId>asm-commons</artifactId>
54-
<version>9.2</version>
94+
<version>${asm.version}</version>
5595
</dependency>
5696
<dependency>
5797
<groupId>org.ow2.asm</groupId>
5898
<artifactId>asm-tree</artifactId>
59-
<version>9.2</version>
99+
<version>${asm.version}</version>
60100
</dependency>
61101
<dependency>
62102
<groupId>org.ow2.asm</groupId>
63103
<artifactId>asm-util</artifactId>
64-
<version>9.2</version>
104+
<version>${asm.version}</version>
65105
</dependency>
66106
<dependency>
67107
<groupId>org.benf</groupId>
68108
<artifactId>cfr</artifactId>
69-
<version>0.151</version>
109+
<version>${cfr.version}</version>
70110
</dependency>
71111
<dependency>
72112
<groupId>uk.com.robust-it</groupId>
73113
<artifactId>cloning</artifactId>
74-
<version>1.9.12</version>
114+
<version>${cloning.version}</version>
75115
</dependency>
76116
<dependency>
77117
<groupId>commons-cli</groupId>
78118
<artifactId>commons-cli</artifactId>
79-
<version>1.4</version>
119+
<version>${commons-cli.version}</version>
80120
</dependency>
81121
<dependency>
82122
<groupId>commons-codec</groupId>
83123
<artifactId>commons-codec</artifactId>
84-
<version>1.15</version>
124+
<version>${commons-codec.version}</version>
85125
</dependency>
86126
<dependency>
87127
<groupId>org.codehaus.janino</groupId>
88128
<artifactId>commons-compiler</artifactId>
89-
<version>3.1.6</version>
129+
<version>${commons-compiler.version}</version>
90130
</dependency>
91131
<dependency>
92132
<groupId>org.apache.commons</groupId>
93133
<artifactId>commons-compress</artifactId>
94-
<version>1.21</version>
134+
<version>${commons-compress.version}</version>
95135
</dependency>
96136
<dependency>
97137
<groupId>commons-io</groupId>
98138
<artifactId>commons-io</artifactId>
99-
<version>2.11.0</version>
139+
<version>${commons-io.version}</version>
100140
</dependency>
101141
<dependency>
102142
<groupId>org.apache.commons</groupId>
103143
<artifactId>commons-lang3</artifactId>
104-
<version>3.12.0</version>
144+
<version>${commons-lang3.version}</version>
105145
</dependency>
106146
<dependency>
107147
<groupId>org.apache.commons</groupId>
108148
<artifactId>commons-text</artifactId>
109-
<version>1.9</version>
149+
<version>${commons-text.version}</version>
110150
</dependency>
111151
<dependency>
112152
<groupId>org.jboss.windup.decompiler</groupId>
113153
<artifactId>decompiler-fernflower</artifactId>
114-
<version>5.2.0.Final</version>
154+
<version>${decompiler-fernflower.version}</version>
115155
<exclusions>
116156
<exclusion>
117157
<groupId>org.jboss.windup.decompiler.fernflower</groupId>
@@ -122,152 +162,152 @@
122162
<dependency>
123163
<groupId>com.github.ThexXTURBOXx</groupId>
124164
<artifactId>fernflower</artifactId>
125-
<version>47afd82034</version>
165+
<version>${fernflower.version}</version>
126166
</dependency>
127167
<dependency>
128168
<groupId>com.google.guava</groupId>
129169
<artifactId>guava</artifactId>
130-
<version>30.1.1-jre</version>
170+
<version>${guava.version}</version>
131171
</dependency>
132172
<dependency>
133173
<groupId>com.google.code.gson</groupId>
134174
<artifactId>gson</artifactId>
135-
<version>2.8.7</version>
175+
<version>${gson.version}</version>
136176
</dependency>
137177
<dependency>
138178
<groupId>org.imgscalr</groupId>
139179
<artifactId>imgscalr-lib</artifactId>
140-
<version>4.2</version>
180+
<version>${imgscalr-lib.version}</version>
141181
</dependency>
142182
<dependency>
143183
<groupId>org.codehaus.janino</groupId>
144184
<artifactId>janino</artifactId>
145-
<version>3.1.6</version>
185+
<version>${janino.version}</version>
146186
</dependency>
147187
<dependency>
148188
<groupId>org.jd</groupId>
149189
<artifactId>jd-gui</artifactId>
150-
<version>1.6.6bcv</version>
190+
<version>${jd-gui.version}</version>
151191
</dependency>
152192
<dependency>
153193
<groupId>eu.bibl.banalysis</groupId>
154194
<artifactId>byteanalysis</artifactId>
155-
<version>1.0bcv</version>
195+
<version>${byteanalysis.version}</version>
156196
</dependency>
157197
<dependency>
158198
<groupId>org.tinyjee.jgraphx</groupId>
159199
<artifactId>jgraphx</artifactId>
160-
<version>3.4.1.3</version>
200+
<version>${jgraphx.version}</version>
161201
</dependency>
162202
<dependency>
163203
<groupId>org.objenesis</groupId>
164204
<artifactId>objenesis</artifactId>
165-
<version>3.2</version>
205+
<version>${objenesis.version}</version>
166206
</dependency>
167207
<dependency>
168208
<groupId>org.bitbucket.mstrobel</groupId>
169209
<artifactId>procyon-core</artifactId>
170-
<version>0.5.36</version>
210+
<version>${procyon.version}</version>
171211
</dependency>
172212
<dependency>
173213
<groupId>org.bitbucket.mstrobel</groupId>
174214
<artifactId>procyon-expressions</artifactId>
175-
<version>0.5.36</version>
215+
<version>${procyon.version}</version>
176216
</dependency>
177217
<dependency>
178218
<groupId>org.bitbucket.mstrobel</groupId>
179219
<artifactId>procyon-reflection</artifactId>
180-
<version>0.5.36</version>
220+
<version>${procyon.version}</version>
181221
</dependency>
182222
<dependency>
183223
<groupId>org.bitbucket.mstrobel</groupId>
184224
<artifactId>procyon-compilertools</artifactId>
185-
<version>0.5.36</version>
225+
<version>${procyon.version}</version>
186226
</dependency>
187227
<dependency>
188228
<groupId>com.fifesoft</groupId>
189229
<artifactId>rsyntaxtextarea</artifactId>
190-
<version>3.1.3</version>
230+
<version>${rsyntaxtextarea.version}</version>
191231
</dependency>
192232
<dependency>
193233
<groupId>org.slf4j</groupId>
194234
<artifactId>slf4j-api</artifactId>
195-
<version>1.7.32</version>
235+
<version>${slf4j.version}</version>
196236
</dependency>
197237
<dependency>
198238
<groupId>org.smali</groupId>
199239
<artifactId>smali</artifactId>
200-
<version>2.5.2</version>
240+
<version>${smali.version}</version>
201241
</dependency>
202242
<dependency>
203243
<groupId>org.smali</groupId>
204244
<artifactId>baksmali</artifactId>
205-
<version>2.5.2</version>
245+
<version>${smali.version}</version>
206246
</dependency>
207247
<dependency>
208248
<groupId>org.yaml</groupId>
209249
<artifactId>snakeyaml</artifactId>
210-
<version>1.29</version>
250+
<version>${snakeyaml.version}</version>
211251
</dependency>
212252
<dependency>
213253
<groupId>xpp3</groupId>
214254
<artifactId>xpp3</artifactId>
215-
<version>1.1.4c</version>
255+
<version>${xpp3.version}</version>
216256
</dependency>
217257
<dependency>
218258
<groupId>com.github.skylot.jadx</groupId>
219259
<artifactId>jadx-core</artifactId>
220-
<version>c28e8142f4</version>
260+
<version>${jadx.version}</version>
221261
</dependency>
222262
<dependency>
223263
<groupId>com.github.skylot.jadx</groupId>
224264
<artifactId>jadx-java-convert</artifactId>
225-
<version>c28e8142f4</version>
265+
<version>${jadx.version}</version>
226266
</dependency>
227267
<dependency>
228268
<groupId>com.github.skylot.jadx</groupId>
229269
<artifactId>jadx-dex-input</artifactId>
230-
<version>c28e8142f4</version>
270+
<version>${jadx.version}</version>
231271
</dependency>
232272
<dependency>
233273
<groupId>com.github.skylot.jadx</groupId>
234274
<artifactId>jadx-smali-input</artifactId>
235-
<version>c28e8142f4</version>
275+
<version>${jadx.version}</version>
236276
</dependency>
237277
<dependency>
238278
<groupId>com.github.ThexXTURBOXx</groupId>
239279
<artifactId>dex2jar</artifactId>
240-
<version>v23</version>
280+
<version>${dex2jar.version}</version>
241281
</dependency>
242282
<dependency>
243283
<groupId>com.github.weisj</groupId>
244284
<artifactId>darklaf-core</artifactId>
245-
<version>2.7.2</version>
285+
<version>${darklaf.version}</version>
246286
</dependency>
247287
<dependency>
248288
<groupId>com.github.weisj</groupId>
249289
<artifactId>darklaf-extensions-rsyntaxarea</artifactId>
250-
<version>0.3.4</version>
290+
<version>${darklaf-extensions-rsta.version}</version>
251291
</dependency>
252292
<dependency>
253293
<groupId>com.github.gotson</groupId>
254294
<artifactId>webp-imageio</artifactId>
255-
<version>0.2.2</version>
295+
<version>${webp-imageio.version}</version>
256296
</dependency>
257297
<dependency>
258298
<groupId>de.skuzzle</groupId>
259299
<artifactId>semantic-version</artifactId>
260-
<version>2.1.0</version>
300+
<version>${semantic-version.version}</version>
261301
</dependency>
262302
<dependency>
263303
<groupId>org.abego.treelayout</groupId>
264304
<artifactId>org.abego.treelayout.core</artifactId>
265-
<version>1.0.3</version>
305+
<version>${treelayout.version}</version>
266306
</dependency>
267307
<dependency>
268308
<groupId>org.antlr</groupId>
269309
<artifactId>antlr4</artifactId>
270-
<version>4.9.2</version>
310+
<version>${antlr4.version}</version>
271311
<exclusions>
272312
<exclusion>
273313
<groupId>com.ibm.icu</groupId>
@@ -280,12 +320,12 @@
280320
<!--<dependency>
281321
<groupId>org.graalvm.js</groupId>
282322
<artifactId>js</artifactId>
283-
<version>21.2.0</version>
323+
<version>${js.version}</version>
284324
</dependency>
285325
<dependency>
286326
<groupId>org.graalvm.js</groupId>
287327
<artifactId>js-scriptengine</artifactId>
288-
<version>21.2.0</version>
328+
<version>${js.version}</version>
289329
</dependency>-->
290330
</dependencies>
291331

@@ -325,6 +365,7 @@
325365
<filter>
326366
<artifact>*:*</artifact>
327367
<excludes>
368+
<exclude>module-info.class</exclude>
328369
<exclude>META-INF/*.SF</exclude>
329370
<exclude>META-INF/*.DSA</exclude>
330371
<exclude>META-INF/*.RSA</exclude>
@@ -340,8 +381,12 @@
340381
<mainClass>the.bytecode.club.bytecodeviewer.BytecodeViewer</mainClass>
341382
<manifestEntries>
342383
<Implementation-Version>${project.version}</Implementation-Version>
384+
<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
385+
<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
343386
</manifestEntries>
344387
</transformer>
388+
<transformer
389+
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
345390
</transformers>
346391
</configuration>
347392
</plugin>

0 commit comments

Comments
 (0)