Merge pull request #17 from Noisyfox/moe-sdk-j8support

(multi-os-engine/multi-os-engine#179) Don't add java8support jar to m…

Author: Noisyfox

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

@@ -380,15 +380,6 @@ protected void installCommonDependencies() {
         }
         project.getDependencies().add(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME,
             FileUtils.getNameAsArtifact(getSDK().getiOSJUnitJar(), getSDK().sdkVersion));
-
-        // Install java 8 support jars to fix lambda compilation
-        project.getDependencies().add(
-            isLibrary ? JavaPlugin.API_CONFIGURATION_NAME : JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME,
-            FileUtils.getNameAsArtifact(getSDK().getJava8SupportJar(), getSDK().sdkVersion)
-        );
-
-        project.getDependencies().add(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME,
-            FileUtils.getNameAsArtifact(getSDK().getJava8SupportJar(), getSDK().sdkVersion));
     }
 
     abstract protected void checkRemoteServer(AbstractBaseTask task);

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

@@ -22,16 +22,17 @@
 import org.gradle.api.Task;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
+import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.internal.reflect.Instantiator;
 import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry;
 import org.moe.gradle.anns.NotNull;
 import org.moe.gradle.anns.Nullable;
 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.ClassValidate;
 import org.moe.gradle.tasks.GenerateUIObjCInterfaces;
 import org.moe.gradle.tasks.IpaBuild;
 import org.moe.gradle.tasks.Launchers;
@@ -45,6 +46,7 @@
 import org.moe.gradle.tasks.XcodeInternal;
 import org.moe.gradle.tasks.XcodeProvider;
 import org.moe.gradle.utils.Arch;
+import org.moe.gradle.utils.FileUtils;
 import org.moe.gradle.utils.PropertiesUtil;
 import org.moe.gradle.utils.Require;
 
@@ -135,6 +137,14 @@ public void apply(Project project) {
         // Add common MOE dependencies
         installCommonDependencies();
 
+        // Install java 8 support jars to fix lambda compilation
+        project.getDependencies().add(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME,
+            FileUtils.getNameAsArtifact(getSDK().getJava8SupportJar(), getSDK().sdkVersion)
+        );
+
+        project.getDependencies().add(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME,
+            FileUtils.getNameAsArtifact(getSDK().getJava8SupportJar(), getSDK().sdkVersion));
+
         // Install rules
         addRule(ProGuard.class, "Creates a ProGuarded jar.",
                 asList(SOURCE_SET, MODE), MoePlugin.this);