From 9a05c6d18103926cc18c844f7599254fafc8ad5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Champeau?= <cedric.champeau@oracle.com>
Date: Wed, 11 Oct 2023 22:11:13 +0200
Subject: [PATCH] Remove deprecated use of `getConvention` (#522)

* Remove deprecated use of `getConvention`

* Fix compile error
---
 docs/src/docs/asciidoc/index.adoc                        | 4 ++++
 .../org/graalvm/buildtools/gradle/NativeImagePlugin.java | 9 ++++-----
 .../graalvm/buildtools/gradle/internal/GradleUtils.java  | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docs/src/docs/asciidoc/index.adoc b/docs/src/docs/asciidoc/index.adoc
index 39ea81ccd..f32e4ca31 100644
--- a/docs/src/docs/asciidoc/index.adoc
+++ b/docs/src/docs/asciidoc/index.adoc
@@ -24,6 +24,10 @@ If you are using alternative build systems, see <<alternative-build-systems.adoc
 * Update JUnit configuration for native testing on GraalVM for JDK 21 with `--strict-image-heap` mode.
 * Fix path escaping problem for Windows users
 
+==== Gradle plugin
+
+- Remove use of deprecated `getConvention` APIs
+
 === Release 0.9.26
 
 * Relax GraalVM version check for dev versions
diff --git a/native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java b/native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java
index 5e9fd5cc8..a23976514 100644
--- a/native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java
+++ b/native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java
@@ -95,7 +95,7 @@
 import org.gradle.api.plugins.JavaApplication;
 import org.gradle.api.plugins.JavaLibraryPlugin;
 import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
@@ -259,7 +259,7 @@ private void configureJavaProject(Project project, Provider<NativeImageService>
 
         // Register Native Image tasks
         TaskContainer tasks = project.getTasks();
-        JavaPluginConvention javaConvention = project.getConvention().getPlugin(JavaPluginConvention.class);
+        JavaPluginExtension javaConvention = project.getExtensions().getByType(JavaPluginExtension.class);
         configureAutomaticTaskCreation(project, graalExtension, tasks, javaConvention.getSourceSets());
 
         TaskProvider<BuildNativeImageTask> imageBuilder = tasks.named(NATIVE_COMPILE_TASK_NAME, BuildNativeImageTask.class);
@@ -624,8 +624,7 @@ public void registerTestBinary(Project project,
 
         // Testing part begins here. -------------------------------------------
 
-        // In future Gradle releases this becomes a proper DirectoryProperty
-        File testResultsDir = GradleUtils.getJavaPluginConvention(project).getTestResultsDir();
+        DirectoryProperty testResultsDir = GradleUtils.getJavaPluginConvention(project).getTestResultsDir();
         DirectoryProperty testListDirectory = project.getObjects().directoryProperty();
 
         // Add DSL extension for testing
@@ -633,7 +632,7 @@ public void registerTestBinary(Project project,
 
         TaskProvider<Test> testTask = config.validate().getTestTask();
         testTask.configure(test -> {
-            File testList = new File(testResultsDir, test.getName() + "/testlist");
+            var testList = testResultsDir.dir(test.getName() + "/testlist");
             testListDirectory.set(testList);
             test.getOutputs().dir(testList);
             // Set system property read by the UniqueIdTrackingListener.
diff --git a/native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/internal/GradleUtils.java b/native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/internal/GradleUtils.java
index d60c72578..6d998da56 100644
--- a/native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/internal/GradleUtils.java
+++ b/native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/internal/GradleUtils.java
@@ -47,7 +47,7 @@
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.util.GradleVersion;
@@ -64,8 +64,8 @@ public static SourceSet findSourceSet(Project project, String sourceSetName) {
         return sourceSetContainer.findByName(sourceSetName);
     }
 
-    public static JavaPluginConvention getJavaPluginConvention(Project project) {
-        return project.getConvention().getPlugin(JavaPluginConvention.class);
+    public static JavaPluginExtension getJavaPluginConvention(Project project) {
+        return project.getExtensions().getByType(JavaPluginExtension.class);
     }