Use explicit Gradle project dependency notation and test on Gradle 9.6.1

build-logic/common-plugins/src/main/groovy/org.graalvm.build.github-actions-helper.gradle

@@ -12,7 +12,7 @@ def latestMatrixDefault = [
 
 // # Following versions are disabled temporarily in order to speed up PR testing  "7.3.3", "7.2", "7.1", "6.8.3",
 def gradleVersions = [
-        "gradle-version": ["current", "8.4", "8.14.2", "9.0.0"],
+        "gradle-version": ["current", "8.4", "8.14.2", "9.0.0", "9.6.1"],
 ]
 
 def gradleCachedVersions = [

build-logic/gradle-functional-testing/src/main/groovy/org.graalvm.build.functional-testing.gradle

@@ -84,7 +84,7 @@ def graalVm = javaToolchains.launcherFor {
 
 def fullFunctionalTest = tasks.register("fullFunctionalTest")
 
-['functionalTest': ["current", "8.4", "8.14.2", "9.0.0"],
+['functionalTest': ["current", "8.4", "8.14.2", "9.0.0", "9.6.1"],
  'configCacheFunctionalTest': ['current', "9.0.0"]
 ].each { baseName, gradleVersions ->
     gradleVersions.each { gradleVersion ->

docs/spec/requirements.md

@@ -40,7 +40,7 @@ metadata lines.
 
 The plugins require Java 17+ to run. Native Image workflows must support JDK 25+, and are tested
 against the two most recent GraalVM LTS versions. The Gradle plugin
-supports Gradle 8.3+ and currently tests `current`, `8.4`, `8.14.2`, and `9.0.0`. The Maven plugin
+supports Gradle 8.3+ and currently tests `current`, `8.4`, `8.14.2`, `9.0.0`, and `9.6.1`. The Maven plugin
 supports Maven 3.9.x and currently tests with `3.9.9`. Metadata defaults must track the latest
 compatible published repository while remaining pinnable by version, URI, or local path.
 

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/JavaApplicationFunctionalTest.groovy

@@ -41,6 +41,7 @@
 
 package org.graalvm.buildtools.gradle
 
+import org.gradle.util.GradleVersion
 import org.graalvm.buildtools.gradle.fixtures.AbstractFunctionalTest
 import spock.lang.Ignore
 import spock.lang.IgnoreIf
@@ -50,6 +51,27 @@ import spock.lang.Requires
 import java.nio.file.Files
 
 class JavaApplicationFunctionalTest extends AbstractFunctionalTest {
+    @Issue("https://github.com/graalvm/native-build-tools/issues/900")
+    @Requires({
+        def currentVersion = System.getProperty("gradle.test.version", GradleVersion.current().version)
+        if (currentVersion == "current") {
+            currentVersion = GradleVersion.current().version
+        }
+        GradleVersion.version(currentVersion).baseVersion >= GradleVersion.version("9.6")
+    })
+    def "does not use deprecated Project dependency notation"() {
+        given:
+        withSample("java-application")
+
+        when:
+        run 'help', '--warning-mode=fail'
+
+        then:
+        tasks {
+            succeeded ':help'
+        }
+    }
+
     @Issue("https://github.com/graalvm/native-build-tools/issues/855")
     def "does not resolve runtime classpath during configuration when dependencies change after evaluate"() {
         given:

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

@@ -952,7 +952,8 @@ private static void createNativeConfigurations(Project project, String binaryNam
                 }
             });
         });
-        compileOnly.getDependencies().add(project.getDependencies().create(project));
+        // Native-image classpaths must model the current project through Gradle's supported dependency APIs. §gradle/FS-plugin-model.
+        compileOnly.getDependencies().add(project.getDependencies().project(Collections.singletonMap("path", project.getPath())));
     }
 
     private NativeImageOptions createMainOptions(GraalVMExtension graalExtension, Project project) {