Make ProguardCollector able to be disabled

Author: berstanio

README.md

@@ -180,6 +180,9 @@ moe {
         // whether code obfuscation is enabled. Ignored when `baseCfgFile` is specified. Default to `false`
         obfuscationEnabled = false
 
+        // whether proguard config collector is enabled. Default to `true`
+        proguardCollectorEnabled = true
+
         // exclude files from `-injars` config that will be processed by proguard
         excludeFiles = [
                 'META-INF/*.SF',

src/main/java/org/moe/gradle/options/ProGuardOptions.java

@@ -8,7 +8,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -25,6 +24,7 @@ public class ProGuardOptions {
     private int level = LEVEL_APP;
     private boolean minifyEnabled = true;
     private boolean obfuscationEnabled = false;
+    private boolean proguardCollectorEnabled = true;
     @NotNull
     @org.jetbrains.annotations.NotNull
     private Set<String> excludeFiles = new LinkedHashSet<>();
@@ -90,6 +90,15 @@ public void setObfuscationEnabled(boolean obfuscationEnabled) {
         this.obfuscationEnabled = obfuscationEnabled;
     }
 
+    public boolean isProguardCollectorEnabled () {
+        return proguardCollectorEnabled;
+    }
+
+    @IgnoreUnused
+    public void setProguardCollectorEnabled (boolean proguardCollectorEnabled) {
+        this.proguardCollectorEnabled = proguardCollectorEnabled;
+    }
+
     @NotNull
     @org.jetbrains.annotations.NotNull
     public Collection<String> getExcludeFiles() {

src/main/java/org/moe/gradle/tasks/R8.java

@@ -72,6 +72,7 @@ public class R8 extends AbstractBaseTask {
     private static final String CONVENTION_MAPPING_FILE = "mappingFile";
     private static final String CONVENTION_MINIFY_ENABLED = "minifyEnabled";
     private static final String CONVENTION_OBFUSCATION_ENABLED = "obfuscationEnabled";
+    private static final String CONVENTION_COLLECTOR_ENABLED = "collectorEnabled";
     private static final String CONVENTION_DEBUG_ENABLED = "debugEnabled";
 
     @Nullable
@@ -228,6 +229,19 @@ public boolean isObfuscationEnabled() {
         return getOrConvention(obfuscationEnabled, CONVENTION_OBFUSCATION_ENABLED);
     }
 
+    @Nullable
+    private Boolean collectorEnabled;
+
+    @IgnoreUnused
+    public void setCollectorEnabled(Boolean collectorEnabled) {
+        this.collectorEnabled = collectorEnabled;
+    }
+
+    @Input
+    public boolean isCollectorEnabled() {
+        return getOrConvention(collectorEnabled, CONVENTION_COLLECTOR_ENABLED);
+    }
+
     @Nullable
     private Boolean debugEnabled;
 
@@ -336,9 +350,11 @@ private void composeConfigurationFile() {
         startSection(conf, "Appending from " + baseCfgFile);
         conf.append(FileUtils.read(baseCfgFile));
 
-        final File collectedConfig = getProguardCollectTaskDep().getOutCfgFile();
-        startSection(conf, "Appending from " + collectedConfig);
-        conf.append(FileUtils.read(collectedConfig));
+        if (isCollectorEnabled()) {
+            final File collectedConfig = getProguardCollectTaskDep().getOutCfgFile();
+            startSection(conf, "Appending from " + collectedConfig);
+            conf.append(FileUtils.read(collectedConfig));
+        }
 
         startSection(conf, "Shrinking & obfuscation flags");
         if (!isCustomisedBaseConfig()) {
@@ -513,6 +529,7 @@ protected final void setupMoeTask(final @NotNull SourceSet sourceSet, final @Not
         addConvention(CONVENTION_LOG_FILE, () -> resolvePathInBuildDir(out, "R8.log"));
         addConvention(CONVENTION_MINIFY_ENABLED, ext.proguard::isMinifyEnabled);
         addConvention(CONVENTION_OBFUSCATION_ENABLED, ext.proguard::isObfuscationEnabled);
+        addConvention(CONVENTION_COLLECTOR_ENABLED, ext.proguard::isProguardCollectorEnabled);
         addConvention(CONVENTION_DEBUG_ENABLED, () -> mode.equals(Mode.DEBUG));
     }
 }