Merge branch 'KengoTODA-replace-outdated-api'

Author: siordache

src/main/java/org/javamodularity/moduleplugin/ModuleName.java

@@ -9,7 +9,9 @@
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
 import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.util.GradleVersion;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -23,8 +25,15 @@ class ModuleName {
     Optional<String> findModuleName(Project project) {
         SourceSet main;
         try {
-            JavaPluginConvention javaConvention = project.getConvention().getPlugin(JavaPluginConvention.class);
-            main = javaConvention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+            if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) {
+                // JavaPluginExtension#getSourceSets() is supported from Gradle 7.1
+                // https://docs.gradle.org/7.1/javadoc/org/gradle/api/plugins/JavaPluginExtension.html#getSourceSets--
+                JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
+                main = javaPluginExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+            } else {
+                JavaPluginConvention javaConvention = project.getConvention().getPlugin(JavaPluginConvention.class);
+                main = javaConvention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+            }
         } catch (IllegalStateException | UnknownDomainObjectException e) {
             LOGGER.warn("Cannot obtain JavaPluginConvention", e);
             return Optional.empty();

src/main/java/org/javamodularity/moduleplugin/tasks/CompileModuleInfoTask.java

@@ -65,10 +65,18 @@ public void execute(Jar jar) {
                 jar.doFirst(new Action<Task>() {
                     @Override
                     public void execute(Task task) {
-                        File classesDir = CompileModuleInfoTask.this.helper().mainSourceSet().getJava().getOutputDir();
+                        File classesDir;
+                        if (GradleVersion.current().compareTo(GradleVersion.version("6.1")) >= 0) {
+                            // SourceDirectorySet#getClassesDirectory() is supported from Gradle 6.1
+                            // https://docs.gradle.org/6.1/javadoc/org/gradle/api/file/SourceDirectorySet.html#getClassesDirectory--
+                            classesDir = helper().mainSourceSet().getJava().getClassesDirectory().get().getAsFile();
+                        } else {
+                            classesDir = helper().mainSourceSet().getJava().getOutputDir();
+                        }
+
                         File mainModuleInfoFile = new File(classesDir, "module-info.class");
                         File customModuleInfoFile = new File(moduleInfoDir, "module-info.class");
-                        if (mainModuleInfoFile.isFile() && customModuleInfoFile.isFile()) {
+                        if(mainModuleInfoFile.isFile() && customModuleInfoFile.isFile()) {
                             mainModuleInfoFile.delete();
                         }
                     }
@@ -90,7 +98,13 @@ private JavaCompile preconfigureCompileModuleInfoJava(JavaCompile compileJava) {
         compileModuleInfoJava.setSource(pathToModuleInfoJava());
         compileModuleInfoJava.getOptions().setSourcepath(project.files(pathToModuleInfoJava().getParent()));
 
-        compileModuleInfoJava.setDestinationDir(helper().getModuleInfoDir());
+        if (GradleVersion.current().compareTo(GradleVersion.version("6.1")) >= 0) {
+            // AbstractCompile#getDestinationDirectory() is supported from Gradle 6.1
+            // https://docs.gradle.org/6.1/javadoc/org/gradle/api/tasks/compile/AbstractCompile.html#getDestinationDirectory--
+            compileModuleInfoJava.getDestinationDirectory().set(helper().getModuleInfoDir());
+        } else {
+            compileModuleInfoJava.setDestinationDir(helper().getModuleInfoDir());
+        }
 
         // we need all the compiled classes before compiling module-info.java
         compileModuleInfoJava.dependsOn(compileJava);

src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java

@@ -38,7 +38,7 @@ void before() throws IOException {
 
     @CartesianProductTest(name = "smokeTest({arguments})")
     @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0"})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0", "7.1", "7.2"})
     void smokeTest(String projectName, String gradleVersion) {
         LOGGER.info("Executing smokeTest with Gradle {}", gradleVersion);
         var result = GradleRunner.create()