Fixed incorrect logic on exemption, and some small problems

Author: LeeGodSRC

dev.skidfuscator.gradle-plugin/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'com.gradle.plugin-publish' version '0.14.0'
 }
 
+group = 'dev.skidfuscator'
 version = '0.1'
 
 gradlePlugin {
@@ -27,6 +28,11 @@ pluginBundle {
     }
 }
 
+repositories {
+    mavenCentral()
+    maven { url 'https://jitpack.io' }
+}
+
 dependencies {
     compileOnly gradleApi()
     compileOnly 'org.codehaus.groovy:groovy-all:3.0.9'

dev.skidfuscator.gradle-plugin/src/main/java/dev/skidfuscator/gradle/SkidfuscatorCompileAction.java

@@ -2,26 +2,27 @@
 
 import dev.skidfuscator.obfuscator.Skidfuscator;
 import dev.skidfuscator.obfuscator.SkidfuscatorSession;
-import lombok.RequiredArgsConstructor;
 import org.gradle.api.Action;
 import org.gradle.api.Task;
-import org.gradle.api.tasks.compile.AbstractCompile;
 
-@RequiredArgsConstructor
+import javax.inject.Inject;
+import java.util.List;
+
 public class SkidfuscatorCompileAction implements Action<Task> {
 
     private final SkidfuscatorSession session;
-    private final String exemptionString;
+    private final List<String> excludes;
 
-    @Override
-    public void execute(Task task) {
-        this.handleCompileTask((AbstractCompile) task);
+    @Inject
+    public SkidfuscatorCompileAction(SkidfuscatorSession session, List<String> exemptionString) {
+        this.session = session;
+        this.excludes = exemptionString;
     }
 
-    public void handleCompileTask(AbstractCompile compile) {
+    @Override
+    public void execute(Task task) {
         Skidfuscator skidfuscator = new Skidfuscator(this.session);
-        if (this.exemptionString != null)
-            skidfuscator.getExemptAnalysis().add(this.exemptionString);
+        this.excludes.forEach(exclude -> skidfuscator.getExemptAnalysis().add(exclude));
         skidfuscator.run();
     }
 }

dev.skidfuscator.gradle-plugin/src/main/java/dev/skidfuscator/gradle/SkidfuscatorExtension.java

@@ -1,8 +1,9 @@
 package dev.skidfuscator.gradle;
 
 import lombok.Getter;
-import org.gradle.api.file.RegularFile;
+import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.model.ObjectFactory;
+import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 
 import javax.inject.Inject;
@@ -14,19 +15,35 @@ public class SkidfuscatorExtension {
     private final Property<Boolean> notrack;
     private final Property<Boolean> fuckit;
     private final Property<String> classifier;
-    private final Property<String> exemptionString;
-    private final Property<RegularFile> runtime;
-    private final Property<RegularFile> exemption;
+    private final ListProperty<String> excludes;
+    private final RegularFileProperty runtime;
+    private final RegularFileProperty exemptionFile;
 
     @Inject
     public SkidfuscatorExtension(ObjectFactory objectFactory) {
         this.phantom = objectFactory.property(Boolean.class).convention(false);
         this.notrack = objectFactory.property(Boolean.class).convention(false);
         this.fuckit = objectFactory.property(Boolean.class).convention(false);
-        this.runtime = objectFactory.property(RegularFile.class);
+        this.runtime = objectFactory.fileProperty();
         this.classifier = objectFactory.property(String.class).convention("-obfuscated");
-        this.exemptionString = objectFactory.property(String.class);
-        this.exemption = objectFactory.property(RegularFile.class);
+        this.excludes = objectFactory.listProperty(String.class).empty();
+        this.exemptionFile = objectFactory.fileProperty();
+    }
+
+    public void exclude(String... exludes) {
+        this.excludes.addAll(exludes);
+    }
+
+    public void phantom() {
+        this.phantom.set(true);
+    }
+
+    public void notrack() {
+        this.notrack.set(true);
+    }
+
+    public void fuckit() {
+        this.fuckit.set(true);
     }
 
 }

dev.skidfuscator.gradle-plugin/src/main/java/dev/skidfuscator/gradle/SkidfuscatorGradlePlugin.java

@@ -15,6 +15,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class SkidfuscatorGradlePlugin implements Plugin<Project> {
@@ -39,7 +40,7 @@ private void handle(Project project, SkidfuscatorExtension extension) {
         project.getPlugins().withType(GroovyPlugin.class, plugin -> this.handlePlugin(project, "groovy"));
         project.getPlugins().withType(ScalaPlugin.class, plugin -> this.handlePlugin(project, "scala"));
         project.getPlugins().withId("org.jetbrains.kotlin.jvm", plugin -> this.handlePlugin(project, "kotlin"));
-        // compute session and obfuscator right after jar task
+        // compute session and obfuscate right after jar task
         project.getTasks().withType(Jar.class, jar -> {
             final String home = System.getProperty("java.home");
             final File runtime;
@@ -56,8 +57,8 @@ private void handle(Project project, SkidfuscatorExtension extension) {
                 );
             }
 
-            if (extension.getExemption().isPresent()) {
-                exemption = extension.getExemption().get().getAsFile();;
+            if (extension.getExemptionFile().isPresent()) {
+                exemption = extension.getExemptionFile().get().getAsFile();
             } else {
                 exemption = null;
             }
@@ -78,7 +79,11 @@ private void handle(Project project, SkidfuscatorExtension extension) {
                     .libs(this.classpath.toArray(new File[0]))
                     .build();
 
-            SkidfuscatorCompileAction action = project.getObjects().newInstance(SkidfuscatorCompileAction.class, session, extension.getExemptionString().getOrNull());
+            SkidfuscatorCompileAction action = project.getObjects().newInstance(
+                    SkidfuscatorCompileAction.class,
+                    session,
+                    extension.getExcludes().getOrElse(Collections.emptyList())
+            );
             jar.doLast("skidfuscator", action);
         });
     }