Use r8 for dexing and backporting

Author: Noisyfox

README.md

@@ -131,7 +131,6 @@ The SDK's structure must be as follows, otherwise the validation will fail:
 |  \- iphonesimulator/MOE.framework
 \- tools
    +- dex2oat
-   +- dx.jar
    +- ios-device.jar
    +- java8support.jar
    +- macosx/lib(clang|imobiledevice|natj).dylib
@@ -376,26 +375,6 @@ Setting any of these properties to null will reset them to their default values.
 
 ---
 
-### Dex Task
-
-Task name: `moe<sourceset><mode>Dex`
-
-We need to create a dex file from the proguarded jar which we can later on convert to art and oat files. This task is
-responsible for that. The result of this task is a `classes.jar` file which can be found in the build directory and
-detailed information can be found in the `dx.log` file.
-
-#### Task Properties
-
-- `dxJar`: path to the `dx.jar` file.
-- `inputFiles`: collection of paths to files being passed to Dex.
-- `extraArgs`: extra arguments passed to Dex.
-- `destJar`: path to the jar file produced by dex.
-- `logFile`: path to the task's log file.
-
-Setting any of these properties to null will reset them to their default values.
-
----
-
 ### Dex2Oat Task
 
 Task name: `moe<sourceset><mode><arch-family>Dex2Oat`

src/main/java/org/moe/gradle/MoeExtension.java

@@ -150,4 +150,9 @@ public File getPlatformJar() {
         return plugin.getSDK().getPlatformJar(platform);
     }
 
+    @Nullable
+    public File getPlatformDex() {
+        return plugin.getSDK().getPlatformDex(platform);
+    }
+
 }

src/main/java/org/moe/gradle/MoePlugin.java

@@ -30,14 +30,12 @@
 import org.moe.gradle.remote.Server;
 import org.moe.gradle.tasks.AbstractBaseTask;
 import org.moe.gradle.tasks.ClassValidate;
-import org.moe.gradle.tasks.Desugar;
-import org.moe.gradle.tasks.Dex;
 import org.moe.gradle.tasks.Dex2Oat;
 import org.moe.gradle.tasks.GenerateUIObjCInterfaces;
 import org.moe.gradle.tasks.IpaBuild;
 import org.moe.gradle.tasks.Launchers;
 import org.moe.gradle.tasks.NatJGen;
-import org.moe.gradle.tasks.ProGuard;
+import org.moe.gradle.tasks.R8;
 import org.moe.gradle.tasks.ResourcePackager;
 import org.moe.gradle.tasks.StartupProvider;
 import org.moe.gradle.tasks.TestClassesProvider;
@@ -146,14 +144,10 @@ public void apply(Project project) {
             FileUtils.getNameAsArtifact(getSDK().getJava8SupportJar(), getSDK().sdkVersion));
 
         // Install rules
-        addRule(ProGuard.class, "Creates a ProGuarded jar.",
-                asList(SOURCE_SET, MODE), MoePlugin.this);
-        addRule(Desugar.class, "Creates a desugared jar.",
+        addRule(R8.class, "Shrinks/obfuscates app and produces dex files.",
                 asList(SOURCE_SET, MODE), MoePlugin.this);
         addRule(ClassValidate.class, "Validate classes.",
                 asList(SOURCE_SET, MODE), MoePlugin.this);
-        addRule(Dex.class, "Creates a Dexed jar.",
-                asList(SOURCE_SET, MODE), MoePlugin.this);
         addRule(Dex2Oat.class, "Creates art and oat files.",
                 asList(SOURCE_SET, MODE, ARCH_FAMILY), MoePlugin.this);
         ResourcePackager.addRule(this);

src/main/java/org/moe/gradle/MoeSDK.java

@@ -349,14 +349,19 @@ private void validateSDK(@NotNull Path path, boolean isLocalSDK) {
 
         try {
             validate(DIR, path, "");
+            validate(FIL, path, "sdk/moe-desugared-dex.jar");
+            validate(FIL, path, "sdk/moe-desugared-lib.json");
+            validate(FIL, path, "sdk/moe-core-dex.jar");
             validate(FIL, path, "sdk/moe-core.jar");
             validate(FIL, path, "sdk/moe-core-javadoc.jar");
             validate(FIL, path, "sdk/moe-core-sources.jar");
 
+            validate(FIL, path, "sdk/moe-ios-junit-dex.jar");
             validate(FIL, path, "sdk/moe-ios-junit.jar");
             validate(FIL, path, "sdk/moe-ios-junit-javadoc.jar");
             validate(FIL, path, "sdk/moe-ios-junit-sources.jar");
 
+            validate(FIL, path, "sdk/moe-ios-dex.jar");
             validate(FIL, path, "sdk/moe-ios.jar");
             validate(FIL, path, "sdk/moe-ios-javadoc.jar");
             validate(FIL, path, "sdk/moe-ios-sources.jar");
@@ -367,14 +372,13 @@ private void validateSDK(@NotNull Path path, boolean isLocalSDK) {
             }
 
             validate(FIL | EXE, path, "tools/dex2oat");
-            validate(FIL, path, "tools/dx.jar");
             validate(FIL, path, "tools/ios-device.jar");
             validate(FIL, path, "tools/java8support.jar");
             validate(DIR, path, "tools/macosx");
             validate(FIL, path, "tools/preloaded-classes");
             validate(FIL, path, "tools/proguard-full.cfg");
             validate(FIL, path, "tools/proguard.cfg");
-            validate(FIL, path, "tools/proguard.jar");
+            validate(FIL, path, "tools/r8.jar");
             validate(DIR, path, "tools/windows/x86_64");
             validate(FIL, path, "tools/wrapnatjgen.jar");
             validate(FIL, path, "tools/gradlew.zip");
@@ -407,24 +411,29 @@ private void validate(int type, @NotNull Path path, @NotNull String sub) throws
     private @Nullable File MOE_SDK_ROOT;
     private @Nullable File MOE_SDK_SDK_DIR;
     private @Nullable File MOE_SDK_TOOLS_DIR;
+
+    private @Nullable File MOE_SDK_DESUGARED_LIB_JSON;
+    private @Nullable File MOE_SDK_DESUGARED_DEX;
     private @Nullable File MOE_SDK_CORE_JAR;
+    private @Nullable File MOE_SDK_CORE_DEX;
     private @Nullable File MOE_SDK_CORE_SOURCES_JAR;
     private @Nullable File MOE_SDK_CORE_JAVADOC_JAR;
     private @Nullable File MOE_SDK_IOS_JAVADOC_JAR;
     private @Nullable File MOE_SDK_IOS_JUNIT_JAR;
+    private @Nullable File MOE_SDK_IOS_JUNIT_DEX;
     private @Nullable File MOE_SDK_IOS_JUNIT_SOURCES_JAR;
     private @Nullable File MOE_SDK_IOS_JUNIT_JAVADOC_JAR;
     private @Nullable File MOE_SDK_IOS_JAR;
+    private @Nullable File MOE_SDK_IOS_DEX;
     private @Nullable File MOE_SDK_IOS_SOURCES_JAR;
     private @Nullable File MOE_SDK_DEX2OAT_EXEC;
-    private @Nullable File MOE_SDK_DX_JAR;
     private @Nullable File MOE_SDK_IOS_DEVICE_JAR;
     private @Nullable File MOE_SDK_JAVA8SUPPORT_JAR;
     private @Nullable File MOE_SDK_MACOS_SUPPORT;
     private @Nullable File MOE_SDK_PRELOADEDCLASSES_FILE;
     private @Nullable File MOE_SDK_PROGUARDFULL_CFG;
     private @Nullable File MOE_SDK_PROGUARD_CFG;
-    private @Nullable File MOE_SDK_PROGUARD_JAR;
+    private @Nullable File MOE_SDK_R8_JAR;
     private @Nullable File MOE_SDK_WINDOWS_X86_64_SUPPORT;
     private @Nullable File MOE_SDK_NATJGEN_JAR;
     private @Nullable File MOE_SDK_GRADLEW_ZIP;
@@ -433,24 +442,28 @@ private void bakeSDKPaths(@NotNull Path path) {
         MOE_SDK_ROOT = path.toFile();
         MOE_SDK_SDK_DIR = path.resolve("sdk").toFile();
         MOE_SDK_TOOLS_DIR = path.resolve("tools").toFile();
+        MOE_SDK_DESUGARED_LIB_JSON = path.resolve("sdk/moe-desugared-lib.json").toFile();
+        MOE_SDK_DESUGARED_DEX = path.resolve("sdk/moe-desugared-dex.jar").toFile();
         MOE_SDK_CORE_JAR = path.resolve("sdk/moe-core.jar").toFile();
+        MOE_SDK_CORE_DEX = path.resolve("sdk/moe-core-dex.jar").toFile();
         MOE_SDK_CORE_SOURCES_JAR = path.resolve("sdk/moe-core-sources.jar").toFile();
         MOE_SDK_CORE_JAVADOC_JAR = path.resolve("sdk/moe-core-javadoc.jar").toFile();
         MOE_SDK_IOS_JAR = path.resolve("sdk/moe-ios.jar").toFile();
+        MOE_SDK_IOS_DEX = path.resolve("sdk/moe-ios-dex.jar").toFile();
         MOE_SDK_IOS_SOURCES_JAR = path.resolve("sdk/moe-ios-sources.jar").toFile();
         MOE_SDK_IOS_JAVADOC_JAR = path.resolve("sdk/moe-ios-javadoc.jar").toFile();
         MOE_SDK_IOS_JUNIT_JAR = path.resolve("sdk/moe-ios-junit.jar").toFile();
+        MOE_SDK_IOS_JUNIT_DEX = path.resolve("sdk/moe-ios-junit-dex.jar").toFile();
         MOE_SDK_IOS_JUNIT_SOURCES_JAR = path.resolve("sdk/moe-ios-junit-sources.jar").toFile();
         MOE_SDK_IOS_JUNIT_JAVADOC_JAR = path.resolve("sdk/moe-ios-junit-javadoc.jar").toFile();
         MOE_SDK_DEX2OAT_EXEC = path.resolve("tools/dex2oat").toFile();
-        MOE_SDK_DX_JAR = path.resolve("tools/dx.jar").toFile();
         MOE_SDK_IOS_DEVICE_JAR = path.resolve("tools/ios-device.jar").toFile();
         MOE_SDK_JAVA8SUPPORT_JAR = path.resolve("tools/java8support.jar").toFile();
         MOE_SDK_MACOS_SUPPORT = path.resolve("tools/macosx").toFile();
         MOE_SDK_PRELOADEDCLASSES_FILE = path.resolve("tools/preloaded-classes").toFile();
         MOE_SDK_PROGUARDFULL_CFG = path.resolve("tools/proguard-full.cfg").toFile();
         MOE_SDK_PROGUARD_CFG = path.resolve("tools/proguard.cfg").toFile();
-        MOE_SDK_PROGUARD_JAR = path.resolve("tools/proguard.jar").toFile();
+        MOE_SDK_R8_JAR = path.resolve("tools/r8.jar").toFile();
         MOE_SDK_WINDOWS_X86_64_SUPPORT = path.resolve("tools/windows/x86_64").toFile();
         MOE_SDK_NATJGEN_JAR = path.resolve("tools/wrapnatjgen.jar").toFile();
         MOE_SDK_GRADLEW_ZIP = path.resolve("tools/gradlew.zip").toFile();
@@ -472,6 +485,15 @@ public File getToolsDir() {
         return safeVariable(MOE_SDK_TOOLS_DIR, "MOE_SDK_TOOLS_DIR");
     }
 
+    @NotNull
+    public File getDesugaredLibJson() {
+        return safeVariable(MOE_SDK_DESUGARED_LIB_JSON, "MOE_SDK_DESUGARED_LIB_JSON");
+    }
+    @NotNull
+    public File getDesugaredLibDex() {
+        return safeVariable(MOE_SDK_DESUGARED_DEX, "MOE_SDK_DESUGARED_DEX");
+    }
+
     @NotNull
     public File getCoreJar() {
         return safeVariable(MOE_SDK_CORE_JAR, "MOE_SDK_CORE_JAR");
@@ -489,6 +511,11 @@ public File getCoreSourcesJar() {
         return safeVariable(MOE_SDK_CORE_SOURCES_JAR, "MOE_SDK_CORE_SOURCES_JAR");
     }
 
+    @NotNull
+    public File getCoreDex() {
+        return safeVariable(MOE_SDK_CORE_DEX, "MOE_SDK_CORE_DEX");
+    }
+
     @NotNull
     @IgnoreUnused
     public File getiOSJavadocJar() {
@@ -518,19 +545,25 @@ public File getiOSJUnitSourcesJar() {
         return safeVariable(MOE_SDK_IOS_JUNIT_SOURCES_JAR, "MOE_SDK_IOS_JUNIT_SOURCES_JAR");
     }
 
+    @NotNull
+    @IgnoreUnused
+    public File getiOSJUnitDex() {
+        return safeVariable(MOE_SDK_IOS_JUNIT_DEX, "MOE_SDK_IOS_JUNIT_DEX");
+    }
+
     @NotNull
     private File getiOSJar() {
         return safeVariable(MOE_SDK_IOS_JAR, "MOE_SDK_IOS_JAR");
     }
 
     @NotNull
-    public File getDex2OatExec() {
-        return safeVariable(MOE_SDK_DEX2OAT_EXEC, "MOE_SDK_DEX2OAT_EXEC");
+    private File getiOSDex() {
+        return safeVariable(MOE_SDK_IOS_DEX, "MOE_SDK_IOS_DEX");
     }
 
     @NotNull
-    public File getDxJar() {
-        return safeVariable(MOE_SDK_DX_JAR, "MOE_SDK_DX_JAR");
+    public File getDex2OatExec() {
+        return safeVariable(MOE_SDK_DEX2OAT_EXEC, "MOE_SDK_DEX2OAT_EXEC");
     }
 
     @NotNull
@@ -565,8 +598,8 @@ public File getProguardCfg() {
     }
 
     @NotNull
-    public File getProGuardJar() {
-        return safeVariable(MOE_SDK_PROGUARD_JAR, "MOE_SDK_PROGUARD_JAR");
+    public File getR8Jar() {
+        return safeVariable(MOE_SDK_R8_JAR, "MOE_SDK_R8_JAR");
     }
 
     @NotNull
@@ -594,6 +627,13 @@ public File getPlatformJar(final @NotNull MoePlatform platform) {
         throw new GradleException("platform jar is unsupported for " + platform.displayName);
     }
 
+    @NotNull
+    public File getPlatformDex(final @NotNull MoePlatform platform) {
+        if (platform == MoePlatform.IOS) {
+            return getiOSDex();
+        }
+        throw new GradleException("platform dex is unsupported for " + platform.displayName);
+    }
     @NotNull
     private static <T> T safeVariable(@Nullable T variable, @NotNull String name) {
         return Require.nonNull(variable, "Unable to access MOE SDK variable '" + name + "'");

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,8 +25,9 @@ public class ProGuardOptions {
     private int level = LEVEL_APP;
     private boolean minifyEnabled = true;
     private boolean obfuscationEnabled = false;
-    @Nullable
-    private Set<String> excludeFiles;
+    @NotNull
+    @org.jetbrains.annotations.NotNull
+    private Set<String> excludeFiles = new LinkedHashSet<>();
 
     @NotNull
     @IgnoreUnused
@@ -88,20 +90,21 @@ public void setObfuscationEnabled(boolean obfuscationEnabled) {
         this.obfuscationEnabled = obfuscationEnabled;
     }
 
-    @Nullable
+    @NotNull
+    @org.jetbrains.annotations.NotNull
     public Collection<String> getExcludeFiles() {
-        return excludeFiles;
+        return Require.nonNull(excludeFiles);
     }
 
     @IgnoreUnused
-    public void setExcludeFiles(@Nullable Collection<String> excludedFiles) {
-        this.excludeFiles = excludedFiles == null ? null : new LinkedHashSet<>(excludedFiles);
+    public void setExcludeFiles(@NotNull @org.jetbrains.annotations.NotNull Collection<String> excludedFiles) {
+        this.excludeFiles = new LinkedHashSet<>(Require.nonNull(excludedFiles));
     }
 
+    @NotNull
+    @org.jetbrains.annotations.NotNull
+    @IgnoreUnused
     public ProGuardOptions excludeFile(String... names) {
-        if (excludeFiles == null) {
-            excludeFiles = new LinkedHashSet<>();
-        }
         excludeFiles.addAll(Arrays.asList(Require.nonNull(names)));
         return this;
     }

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

@@ -147,9 +147,15 @@ public Object doCall() {
     }
 
     @SuppressWarnings("unchecked")
-    @NotNull
     @org.jetbrains.annotations.NotNull
-    public <T> T getOrConvention(@Nullable T value, @NotNull String name) {
+    @NotNull
+    public <T> T getOrConvention(
+        @org.jetbrains.annotations.Nullable
+        @Nullable
+            T value,
+        @org.jetbrains.annotations.NotNull
+        @NotNull
+            String name) {
         Require.nonNull(name);
 
         if (value == null) {
@@ -167,7 +173,13 @@ public <T> T getOrConvention(@Nullable T value, @NotNull String name) {
     @SuppressWarnings("unchecked")
     @Nullable
     @org.jetbrains.annotations.Nullable
-    public <T> T nullableGetOrConvention(@Nullable T value, @NotNull String name) {
+    public <T> T nullableGetOrConvention(
+        @org.jetbrains.annotations.Nullable
+        @Nullable
+            T value,
+        @org.jetbrains.annotations.NotNull
+        @NotNull
+            String name) {
         Require.nonNull(name);
 
         if (value == null) {