Fix resource inference not working on custom binaries

Before this commit, resource inference was only wired for the main
and test binaries. Now each custom binary will have a proper native
inference task associated with it.

This bug was discovered during the Micronaut AOT work, where resources
were missing from the optimized AOT binary.

Author: melix

docs/src/docs/asciidoc/index.adoc

@@ -15,6 +15,12 @@ If you are interested in contributing, please refer to our https://github.com/gr
 [[changelog]]
 == Changelog
 
+=== Release 0.9.9
+
+==== Gradle plugin
+
+* Fixed resource inference not working on custom binaries
+
 === Release 0.9.8
 
 ==== Gradle plugin

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java

@@ -78,11 +78,13 @@
 import org.gradle.api.plugins.ApplicationPlugin;
 import org.gradle.api.plugins.JavaApplication;
 import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.JavaExec;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.api.tasks.TaskContainer;
 import org.gradle.api.tasks.TaskProvider;
 import org.gradle.api.tasks.bundling.AbstractArchiveTask;
@@ -191,7 +193,8 @@ private void configureJavaProject(Project project, Provider<NativeImageService>
 
         // Register Native Image tasks
         TaskContainer tasks = project.getTasks();
-        configureAutomaticTaskCreation(project, graalExtension, agents, tasks);
+        JavaPluginConvention javaConvention = project.getConvention().getPlugin(JavaPluginConvention.class);
+        configureAutomaticTaskCreation(project, graalExtension, agents, tasks, javaConvention.getSourceSets());
 
         TaskProvider<BuildNativeImageTask> imageBuilder = tasks.named(NATIVE_COMPILE_TASK_NAME, BuildNativeImageTask.class);
         TaskProvider<Task> deprecatedTask = tasks.register(DEPRECATED_NATIVE_BUILD_TASK, t -> {
@@ -206,16 +209,6 @@ private void configureJavaProject(Project project, Provider<NativeImageService>
             mainOptions.getAgent().getInstrumentedTask().convention(runTask);
         });
 
-        TaskProvider<GenerateResourcesConfigFile> generateResourcesConfig = registerResourcesConfigTask(
-                graalExtension.getGeneratedResourcesDirectory(),
-                mainOptions,
-                tasks,
-                transitiveProjectArtifacts(project, JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME),
-                GENERATE_RESOURCES_CONFIG_FILE_TASK_NAME);
-        mainOptions.getConfigurationFileDirectories().from(generateResourcesConfig.map(t ->
-                t.getOutputFile().map(f -> f.getAsFile().getParentFile())
-        ));
-
         graalExtension.registerTestBinary("test", config -> {
             config.forTestTask(tasks.named("test", Test.class));
             config.usingSourceSet(GradleUtils.findSourceSet(project, SourceSet.TEST_SOURCE_SET_NAME));
@@ -225,7 +218,8 @@ private void configureJavaProject(Project project, Provider<NativeImageService>
     private void configureAutomaticTaskCreation(Project project,
                                                 GraalVMExtension graalExtension,
                                                 Map<String, Provider<Boolean>> agents,
-                                                TaskContainer tasks) {
+                                                TaskContainer tasks,
+                                                SourceSetContainer sourceSets) {
         graalExtension.getBinaries().configureEach(options -> {
             String binaryName = options.getName();
             String compileTaskName = deriveTaskName(binaryName, "native", "Compile");
@@ -254,6 +248,16 @@ private void configureAutomaticTaskCreation(Project project,
                 task.getRuntimeArgs().convention(options.getRuntimeArgs());
             });
             configureClasspathJarFor(tasks, options, imageBuilder);
+            SourceSet sourceSet = "test".equals(binaryName) ? sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME) : sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+            TaskProvider<GenerateResourcesConfigFile> generateResourcesConfig = registerResourcesConfigTask(
+                    graalExtension.getGeneratedResourcesDirectory(),
+                    options,
+                    tasks,
+                    transitiveProjectArtifacts(project, sourceSet.getRuntimeClasspathConfigurationName()),
+                    deriveTaskName(binaryName, "generate", "ResourcesConfigFile"));
+            options.getConfigurationFileDirectories().from(generateResourcesConfig.map(t ->
+                    t.getOutputFile().map(f -> f.getAsFile().getParentFile())
+            ));
         });
     }
 
@@ -352,16 +356,6 @@ public void registerTestBinary(Project project,
             deprecateExtension(project, testOptions, DEPRECATED_NATIVE_TEST_EXTENSION, "test");
         }
 
-        TaskProvider<GenerateResourcesConfigFile> generateTestResourcesConfig = registerResourcesConfigTask(
-                graalExtension.getGeneratedResourcesDirectory(),
-                testOptions,
-                tasks,
-                transitiveProjectArtifacts(project, config.getSourceSet().getRuntimeClasspathConfigurationName()),
-                deriveTaskName(name, "generate", "ResourcesConfigFile"));
-        testOptions.getConfigurationFileDirectories().from(generateTestResourcesConfig.map(t ->
-                t.getOutputFile().map(f -> f.getAsFile().getParentFile())
-        ));
-
         TaskProvider<Test> testTask = config.validate().getTestTask();
         testOptions.getAgent().getInstrumentedTask().set(testTask);
         testTask.configure(test -> {