Revert "Add proguard config collector"

This reverts commit 07abbf3.

Author: Berstanio

README.md

@@ -179,9 +179,6 @@ 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/MoePlugin.java

@@ -28,7 +28,6 @@
 import org.moe.gradle.anns.Nullable;
 import org.moe.gradle.remote.Server;
 import org.moe.gradle.tasks.AbstractBaseTask;
-import org.moe.gradle.tasks.ProguardCollect;
 import org.moe.gradle.tasks.Dex2Oat;
 import org.moe.gradle.tasks.ClassValidate;
 import org.moe.gradle.tasks.GenerateUIObjCInterfaces;
@@ -137,8 +136,6 @@ public void apply(Project project) {
         // Install rules
         addRule(R8.class, "Shrinks/obfuscates app and produces dex files.",
                 asList(SOURCE_SET, MODE), MoePlugin.this);
-        addRule(ProguardCollect.class, "Generate code specific proguard keep configs.",
-               asList(SOURCE_SET, MODE), MoePlugin.this);
         addRule(ClassValidate.class, "Validate classes.",
                 asList(SOURCE_SET, MODE), MoePlugin.this);
         addRule(Dex2Oat.class, "Creates art and oat files.",

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

@@ -8,6 +8,7 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -24,7 +25,6 @@ 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,15 +90,6 @@ 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/ProguardCollect.java

@@ -72,7 +72,6 @@ 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";
     private static final String CONVENTION_DESUGAR_CONFIG = "desugarConfig";
 
@@ -230,19 +229,6 @@ 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;
 
@@ -370,12 +356,6 @@ private void composeConfigurationFile() {
         startSection(conf, "Appending from " + baseCfgFile);
         conf.append(FileUtils.read(baseCfgFile));
 
-        if (isCollectorEnabled()) {
-            final File collectedConfig = getProguardCollectTaskDep().getOutCfgFile();
-            startSection(conf, "Appending from " + collectedConfig);
-            conf.append(FileUtils.read(collectedConfig));
-        }
-
         startSection(conf, "Shrinking & obfuscation flags");
         if (!isCustomisedBaseConfig()) {
             if (isMinifyEnabled()) {
@@ -459,15 +439,6 @@ public ClassValidate getClassValidateTaskDep() {
         return classValidateTaskDep;
     }
 
-    private ProguardCollect proguardCollectTaskDep;
-
-    @Nullable
-    @IgnoreUnused
-    @Internal
-    public ProguardCollect getProguardCollectTaskDep() {
-        return proguardCollectTaskDep;
-    }
-
     protected final void setupMoeTask(final @NotNull SourceSet sourceSet, final @NotNull Mode mode) {
         Require.nonNull(sourceSet);
 
@@ -487,10 +458,6 @@ protected final void setupMoeTask(final @NotNull SourceSet sourceSet, final @Not
         classValidateTaskDep = classValidateTask;
         dependsOn(classValidateTask);
 
-        final ProguardCollect proguardCollectTask = getMoePlugin().getTaskBy(ProguardCollect.class, sourceSet, mode);
-        proguardCollectTaskDep = proguardCollectTask;
-        dependsOn(proguardCollectTask);
-
         addConvention(CONVENTION_R8_JAR, sdk::getR8Jar);
         addConvention(CONVENTION_BASE_CFG_FILE, () -> {
             if (ext.proguard.getBaseCfgFile() != null) {
@@ -570,7 +537,6 @@ 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));
         addConvention(CONVENTION_DESUGAR_CONFIG, () -> {
             if (ext.proguard.getLevelRaw() == ProGuardOptions.LEVEL_ALL) {

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

@@ -428,10 +428,6 @@ protected void run() {
                 excludes.add(r8Task.getComposedCfgFile());
                 excludes.add(r8Task.getLogFile());
 
-                final ProguardCollect proguardCollectTask = r8Task.getProguardCollectTaskDep();
-                excludes.add(proguardCollectTask.getOutCfgFile());
-                excludes.add(proguardCollectTask.getLogFile());
-
                 final ClassValidate classValidateTask = r8Task.getClassValidateTaskDep();
                 excludes.add(classValidateTask.getOutputDir());
                 excludes.add(classValidateTask.getLogFile());