[GR-59670] Backport to 24.1: Graalpy gradle plugin does not build if project does not contain any resource files.

PullRequest: graalpython/3580

Author: selhagani

graalpython/com.oracle.graal.python.test/src/tests/standalone/test_standalone.py

@@ -288,7 +288,8 @@ def test_gradle_generated_app_external_resources(self):
             os.makedirs(src_dir, exist_ok=True)
             # copy hello.py
             shutil.copyfile(os.path.join(target_dir, "src", "main", "resources", "org.graalvm.python.vfs", "src", "hello.py"), os.path.join(src_dir, "hello.py"))
-            shutil.rmtree(os.path.join(target_dir, "src", "main", "resources", "org.graalvm.python.vfs"))
+            # remove all resources, we also want to check if the gradle plugin can deal with no user resources
+            shutil.rmtree(os.path.join(target_dir, "src", "main", "resources"))
             # patch GraalPy.java
             replace_in_file(os.path.join(target_dir, "src", "main", "java", "org", "example", "GraalPy.java"),
                 "package org.example;",
@@ -307,6 +308,16 @@ def test_gradle_generated_app_external_resources(self):
             out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir, gradle = True)
             util.check_ouput("BUILD SUCCESS", out)
 
+            # check java exec
+            cmd = gradle_cmd + ["run"]
+            out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir, gradle = True)
+            util.check_ouput("hello java", out)
+
+            # prepare for native build
+            meta_inf = os.path.join(target_dir, "src", "main", "resources", "META-INF", "native-image")
+            os.makedirs(meta_inf, exist_ok=True)
+            shutil.copyfile(os.path.join(self.test_prj_path, "src", "main", "resources", "META-INF", "native-image", "proxy-config.json"), os.path.join(meta_inf, "proxy-config.json"))
+
             # gradle needs jdk <= 22, but it looks like the 'gradle nativeCompile' cmd does not complain if higher,
             # which is fine, because we need to build the native binary with a graalvm build
             # and the one we have set in JAVA_HOME is at least jdk24
@@ -320,12 +331,6 @@ def test_gradle_generated_app_external_resources(self):
             out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir)
             util.check_ouput("hello java", out)
 
-            # 2.) check java build and exec
-            cmd = gradle_cmd + ["run"]
-            out, return_code = util.run_cmd(cmd, self.env, cwd=target_dir, gradle = True)
-            util.check_ouput("BUILD SUCCESS", out)
-            util.check_ouput("hello java", out)
-
     @unittest.skipUnless(is_gradle_enabled, "ENABLE_GRADLE_STANDALONE_UNITTESTS is not true")
     def test_gradle_fail_without_graalpy_dep(self):
         with tempfile.TemporaryDirectory() as tmpdir:

graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/tasks/VFSFilesListTask.java

@@ -44,7 +44,7 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleScriptException;
 import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.InputDirectory;
+import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.TaskAction;
 
 import java.io.File;
@@ -56,7 +56,7 @@
 
 public abstract class VFSFilesListTask extends DefaultTask {
 
-    @InputDirectory
+    @InputFiles
     public abstract Property<File> getResourcesDir();
 
     @TaskAction