Skip to content

Commit 711d080

Browse files
committed
fix(all): pre-emptive support for gradle plugin
1 parent 014c771 commit 711d080

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

dev.skidfuscator.client.standalone/src/main/java/dev/skidfuscator/obfuscator/command/ObfuscateCommand.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class ObfuscateCommand implements Callable<Integer> {
4141
names = {"-li", "--libs"},
4242
description = "Path to the libs folder"
4343
)
44-
private File libs;
44+
private File libFolder;
4545

4646
@CommandLine.Option(
4747
names = {"-ex", "--exempt"},
@@ -154,6 +154,13 @@ public Integer call() {
154154
);
155155
}
156156

157+
final File[] libs;
158+
if (libFolder != null) {
159+
libs = libFolder.listFiles();
160+
} else {
161+
libs = new File[0];
162+
}
163+
157164
final SkidfuscatorSession skidInstance = SkidfuscatorSession.builder()
158165
.input(input)
159166
.output(output)

dev.skidfuscator.commons/src/main/java/dev/skidfuscator/obfuscator/SkidfuscatorSession.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public class SkidfuscatorSession {
1313
private File input;
1414
private File output;
15-
private File libs;
15+
private File[] libs;
1616
private File mappings;
1717
private File exempt;
1818
private File runtime;
@@ -40,7 +40,7 @@ public File getOutput() {
4040
/**
4141
* @return the libs
4242
*/
43-
public File getLibs() {
43+
public File[] getLibs() {
4444
return libs;
4545
}
4646

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,8 @@ protected void _importClasspath() {
472472
));
473473
}
474474
LOGGER.log("✓ Finished importing mappings!");
475-
} else if (session.getLibs() != null && session.getLibs().listFiles() != null) {
476-
final File[] libs = Arrays.stream(session.getLibs().listFiles())
475+
} else if (session.getLibs() != null && session.getLibs().length > 0) {
476+
final File[] libs = Arrays.stream(session.getLibs())
477477
.filter(e -> e.getAbsolutePath().endsWith(".jar"))
478478
.toArray(File[]::new);
479479

0 commit comments

Comments
 (0)