Improve classvalidator

- Only save modified classes (cherry-picked)
- Copy all dependencie jars to the validator
- Do in-jar replacement

Improve ResourcePackager
- Fix error with "Project already evaluated" when running with gradle 7 + xcode

Author: berstanio

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

@@ -471,7 +471,7 @@ protected final void setupMoeTask(final @NotNull SourceSet sourceSet, final @Not
         });
         addConvention(CONVENTION_IN_JARS, () -> {
             final HashSet<Object> jars = new LinkedHashSet<>();
-            jars.add(classValidateTask.getOutputJar());
+            jars.addAll(classValidateTask.getOutputJars().getFiles());
             jars.add(getMoeSDK().getCoreJar());
             jars.add(getMoeExtension().getPlatformJar());
 

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

@@ -19,6 +19,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.Rule;
 import org.gradle.api.file.CopySpec;
+import org.gradle.api.file.DuplicatesStrategy;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.bundling.Jar;
 import org.moe.gradle.MoeExtension;
@@ -92,26 +93,18 @@ private static Jar create(@NotNull MoePlugin plugin, @NotNull SourceSet sourceSe
         resourcePackagerTask.setGroup(MoePlugin.MOE);
         resourcePackagerTask.setDescription("Generates application file (sourceset: " + sourceSet.getName() + ", mode: " + mode.name + ").");
 
-        final ClassValidate validateTask = plugin.getTaskBy(ClassValidate.class, sourceSet, mode);
-        resourcePackagerTask.dependsOn(validateTask);
+        final R8 r8Task = plugin.getTaskBy(R8.class, sourceSet, mode);
+        resourcePackagerTask.dependsOn(r8Task);
         // Update settings
         resourcePackagerTask.setDestinationDir(project.file(project.getBuildDir().toPath().resolve(out).toFile()));
         resourcePackagerTask.setArchiveName("application.jar");
 
+        resourcePackagerTask.exclude("*.dex");
         resourcePackagerTask.exclude("**/*.class");
         resourcePackagerTask.setIncludeEmptyDirs(false);
 
-        // When using full trim, ProGuard will copy the the resources from the common jar
-        project.afterEvaluate(p -> {
-            // This will fetch all jars from the classpath, therefor we need to do it after dependencie analyzation
-            validateTask.getInputFiles().forEach(e -> {
-                if (e.isDirectory()) {
-                    resourcePackagerTask.from(e);
-                } else if (e.exists()){
-                    resourcePackagerTask.from(project.zipTree(e));
-                }
-            });
-        });
+        resourcePackagerTask.from(project.zipTree(r8Task.getOutJar()));
+        resourcePackagerTask.setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE);
 
         switch (ext.proguard.getLevelRaw()) {
             case ProGuardOptions.LEVEL_APP:
@@ -131,13 +124,6 @@ private static Jar create(@NotNull MoePlugin plugin, @NotNull SourceSet sourceSe
 
         ext.packaging.getExcludes().forEach(resourcePackagerTask::exclude);
 
-        // Add support for copying resources from the source directory
-        addResourceFromSources(ext, resourcePackagerTask, sourceSet);
-        if (SourceSet.TEST_SOURCE_SET_NAME.equals(sourceSet.getName())) {
-            SourceSet main = plugin.getJavaConvention().getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-            addResourceFromSources(ext, resourcePackagerTask, main);
-        }
-
         return resourcePackagerTask;
     }
 

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

@@ -164,7 +164,7 @@ protected final void setupMoeTask(@NotNull SourceSet sourceSet, final @NotNull M
         // Update convention mapping
         addConvention(CONVENTION_INPUT_FILES, () -> {
             final Set<File> files = new HashSet<>();
-            files.add(classValidateTask.getOutputJar());
+            files.addAll(classValidateTask.getOutputJars().getFiles());
             return files;
         });
         addConvention(CONVENTION_PREREGISTER_FILE, () -> resolvePathInBuildDir(out, "preregister.txt"));

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

@@ -401,7 +401,7 @@ protected final void setupMoeTask(@NotNull SourceSet sourceSet, final @NotNull M
         }
 
         // Update convention mapping
-        addConvention(CONVENTION_INPUT_FILES, () -> Collections.singletonList(classValidateTask.getOutputJar()));
+        addConvention(CONVENTION_INPUT_FILES, () -> classValidateTask.getOutputJars().getFiles());
         addConvention(CONVENTION_CLASS_LIST_FILE, () -> resolvePathInBuildDir(out, "classlist.txt"));
         addConvention(CONVENTION_LOG_FILE, () -> resolvePathInBuildDir(out, "TestClassesProvider.log"));
     }

src/main/kotlin/org/moe/gradle/tasks/ClassValidate.kt

@@ -1,7 +1,6 @@
 package org.moe.gradle.tasks
 
 import org.gradle.api.GradleException
-import org.gradle.api.Task
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.FileCollection
 import org.gradle.api.plugins.JavaPlugin
@@ -11,6 +10,7 @@ import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.SourceSet
+import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.compile.JavaCompile
 import org.moe.gradle.MoePlugin
 import org.moe.gradle.anns.IgnoreUnused
@@ -63,26 +63,29 @@ open class ClassValidate : AbstractBaseTask() {
         this.outputDir = outputDir
     }
 
-    val outputJar: File
+    val outputJars: ConfigurableFileCollection
         @Internal
-        get() = getOutputDir().resolve("output.jar")
+        get() = project.files(getOutputDir().listFiles())
 
     override fun run() {
         // Clean output dir
         FileUtils.deleteFileOrFolder(getOutputDir())
 
+        val inputFiles = getInputFiles().filter {it.isFile}.map {
+            it.copyTo(getOutputDir().resolve(it.name))
+        }
+
         // Run class validator
         ClassValidator.process(
-            inputFiles = getInputFiles().toSet(),
+            inputFiles = inputFiles.toSet(),
             classpath = getClasspathFiles().toSet()
                 // Add input to classpath
-                + getInputFiles().toSet(),
-            outputDir = getOutputDir().absoluteFile.toPath(),
+                + inputFiles.toSet()
         )
     }
 
     @get:Internal
-    lateinit var classesTaskDep: Task
+    lateinit var jarTaskDep: Jar
         private set
 
     @get:Internal
@@ -114,19 +117,19 @@ open class ClassValidate : AbstractBaseTask() {
         description = "Validate classes (sourceset: ${sourceSet.name}, mode: ${mode.name})."
 
         // Add dependencies
-        val classesTaskName: String
         val compileJavaTaskName: String
         if (SourceSet.MAIN_SOURCE_SET_NAME == sourceSet.name) {
-            classesTaskName = JavaPlugin.CLASSES_TASK_NAME
+            jarTaskDep = project.tasks.getByName(JavaPlugin.JAR_TASK_NAME) as Jar
             compileJavaTaskName = JavaPlugin.COMPILE_JAVA_TASK_NAME
         } else if (SourceSet.TEST_SOURCE_SET_NAME == sourceSet.name) {
-            classesTaskName = JavaPlugin.TEST_CLASSES_TASK_NAME
+            val testJarTask = project.tasks.register("testJar", Jar::class.java)
+            testJarTask.configure { it.from(sourceSet.output) }
+            jarTaskDep = testJarTask.get();
             compileJavaTaskName = JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME
         } else {
             throw GradleException("Unsupported SourceSet ${sourceSet.name}")
         }
-        classesTaskDep = project.tasks.getByName(classesTaskName)
-        dependsOn(classesTaskDep)
+        dependsOn(jarTaskDep)
 
         javaCompileTaskDep = moePlugin.getTaskByName(compileJavaTaskName)
         // TODO: allow higher than 1.8
@@ -140,6 +143,7 @@ open class ClassValidate : AbstractBaseTask() {
         // Update convention mapping
         addConvention(CONVENTION_INPUT_FILES) {
             sourceSet.runtimeClasspath.files.toMutableSet().also { jars ->
+                jars.add(jarTaskDep.archiveFile.get().asFile)
                 jars.remove(moeSDK.coreJar)
                 jars.remove(moeExtension.platformJar)
                 jars.remove(moeSDK.java8SupportJar)