(multi-os-engine/multi-os-engine#147) Replace retrolambda with classvalidator

Author: Noisyfox

build.gradle

@@ -75,6 +75,7 @@ dependencies {
     included project(':moe.tools.common')
     included project(':moe.document.pbxproj')
     included project(':moe.generator.project')
+    included project(':moe.tools.classvalidator')
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile gradleTestKit()

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

@@ -30,13 +30,13 @@
 import org.moe.gradle.tasks.AbstractBaseTask;
 import org.moe.gradle.tasks.Dex;
 import org.moe.gradle.tasks.Dex2Oat;
+import org.moe.gradle.tasks.ClassValidate;
 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.ResourcePackager;
-import org.moe.gradle.tasks.Retrolambda;
 import org.moe.gradle.tasks.StartupProvider;
 import org.moe.gradle.tasks.TestClassesProvider;
 import org.moe.gradle.tasks.UpdateXcodeSettings;
@@ -137,7 +137,7 @@ public void apply(Project project) {
         // Install rules
         addRule(ProGuard.class, "Creates a ProGuarded jar.",
                 asList(SOURCE_SET, MODE), MoePlugin.this);
-        addRule(Retrolambda.class, "Creates a Retrolambda-d jar.",
+        addRule(ClassValidate.class, "Validate classes.",
                 asList(SOURCE_SET, MODE), MoePlugin.this);
         addRule(Dex.class, "Creates a Dexed jar.",
                 asList(SOURCE_SET, MODE), MoePlugin.this);

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

@@ -378,7 +378,6 @@ private void validateSDK(@NotNull Path path, boolean isLocalSDK) {
             validate(FIL, path, "tools/proguard-full.cfg");
             validate(FIL, path, "tools/proguard.cfg");
             validate(FIL, path, "tools/proguard.jar");
-            validate(FIL, path, "tools/retrolambda.jar");
             validate(DIR, path, "tools/windows/x86_64");
             validate(FIL, path, "tools/wrapnatjgen.jar");
             validate(FIL, path, "tools/gradlew.zip");
@@ -432,7 +431,6 @@ private void validate(int type, @NotNull Path path, @NotNull String sub) throws
     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_RETROLAMBDA_JAR;
     private @Nullable File MOE_SDK_WINDOWS_X86_64_SUPPORT;
     private @Nullable File MOE_SDK_NATJGEN_JAR;
     private @Nullable File MOE_SDK_GRADLEW_ZIP;
@@ -462,7 +460,6 @@ private void bakeSDKPaths(@NotNull Path path) {
         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_RETROLAMBDA_JAR = path.resolve("tools/retrolambda.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();
@@ -597,11 +594,6 @@ public File getProGuardJar() {
         return safeVariable(MOE_SDK_PROGUARD_JAR, "MOE_SDK_PROGUARD_JAR");
     }
 
-    @NotNull
-    public File getRetrolambdaJar() {
-        return safeVariable(MOE_SDK_RETROLAMBDA_JAR, "MOE_SDK_RETROLAMBDA_JAR");
-    }
-
     @NotNull
     @IgnoreUnused
     public File getWindows_X86_64Support() {

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

@@ -26,6 +26,7 @@
 import org.gradle.process.ExecResult;
 import org.gradle.process.ExecSpec;
 import org.gradle.process.JavaExecSpec;
+import org.moe.common.utils.FileUtilsKt;
 import org.moe.gradle.*;
 import org.moe.gradle.anns.IgnoreUnused;
 import org.moe.gradle.anns.NotNull;
@@ -188,7 +189,7 @@ private boolean shouldLogOnExecFail() {
     protected void exec(@NotNull Action<ExecSpec> spec) {
         Require.nonNull(spec);
 
-        FileUtils.createEmpty(getLogFile());
+        FileUtilsKt.touch(getLogFile());
 
         final ExecResult result = getProject().exec(execSpec -> {
             // Pre-configure
@@ -222,7 +223,7 @@ protected void exec(@NotNull Action<ExecSpec> spec) {
     protected void javaexec(@NotNull Action<JavaExecSpec> spec) {
         Require.nonNull(spec);
 
-        FileUtils.createEmpty(getLogFile());
+        FileUtilsKt.touch(getLogFile());
 
         final ExecResult result = getProject().javaexec(execSpec -> {
             execSpec.jvmArgs(getExtension().javaProcess.getJvmArgs());

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

@@ -144,12 +144,12 @@ private List<String> prepareArgumentsList() {
         return args;
     }
 
-    private Retrolambda retrolambdaTaskDep;
+    private ClassValidate classValidateTaskDep;
 
     @NotNull
     @Internal
-    public Retrolambda getRetrolambdaTaskDep() {
-        return Require.nonNull(retrolambdaTaskDep);
+    public ClassValidate getClassValidateTaskDep() {
+        return Require.nonNull(classValidateTaskDep);
     }
 
     protected final void setupMoeTask(@NotNull SourceSet sourceSet, final @NotNull Mode mode) {
@@ -165,15 +165,15 @@ protected final void setupMoeTask(@NotNull SourceSet sourceSet, final @NotNull M
         setDescription("Generates dex files (sourceset: " + sourceSet.getName() + ", mode: " + mode.name + ").");
 
         // Add dependencies
-        final Retrolambda retroTask = getMoePlugin().getTaskBy(Retrolambda.class, sourceSet, mode);
-        retrolambdaTaskDep = retroTask;
-        dependsOn(retroTask);
+        final ClassValidate classValidate = getMoePlugin().getTaskBy(ClassValidate.class, sourceSet, mode);
+        classValidateTaskDep = classValidate;
+        dependsOn(classValidate);
 
         // Update convention mapping
         addConvention(CONVENTION_DX_JAR, sdk::getDxJar);
         addConvention(CONVENTION_INPUT_FILES, () -> {
             final ArrayList<Object> files = new ArrayList<>();
-            files.add(retroTask.getOutputDir());
+            files.add(classValidate.getClassesOutputDir());
             return files;
 
         });

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

@@ -233,14 +233,6 @@ protected void run() {
         }
     }
 
-    private Retrolambda retrolambdaTaskDep;
-
-    @NotNull
-    @Internal
-    public Retrolambda getRetrolambdaTaskDep() {
-        return Require.nonNull(retrolambdaTaskDep);
-    }
-
     protected final void setupMoeTask(final @NotNull Mode mode) {
         SourceSet sourceSet = TaskUtils.getSourceSet(getMoePlugin(), SourceSet.MAIN_SOURCE_SET_NAME);
         Require.nonNull(sourceSet);
@@ -253,14 +245,13 @@ protected final void setupMoeTask(final @NotNull Mode mode) {
         setDescription("Generates header files for Interface Builder");
 
         // Add dependencies
-        final Retrolambda retroTask = getMoePlugin().getTaskBy(Retrolambda.class, sourceSet, mode);
-        retrolambdaTaskDep = retroTask;
-        dependsOn(retroTask);
+        final ProGuard proguardTask = getMoePlugin().getTaskBy(ProGuard.class, sourceSet, mode);
+        dependsOn(proguardTask);
 
         // Update convention mapping
         addConvention(CONVENTION_INPUT_FILES, () -> {
             final ArrayList<Object> files = new ArrayList<>();
-            files.add(retroTask.getOutputDir());
+            files.add(proguardTask.getOutJar());
             if (getMoeExtension().proguard.getLevelRaw() == ProGuardOptions.LEVEL_APP) {
                 files.add(getMoeExtension().getPlatformJar());
             }