Merge pull request #59 from domaframework/refactor/replace-deprecated…

…-api Replace deprecated APIs
domaframework · Sep 29, 2024 · 1c565d6 · 1c565d6
2 parents 7170d4c + b68c88e
commit 1c565d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/compile/src/main/java/org/seasar/doma/gradle/compile/CompilePlugin.java b/compile/src/main/java/org/seasar/doma/gradle/compile/CompilePlugin.java
@@ -3,7 +3,7 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
 
 public class CompilePlugin implements Plugin<Project> {
@@ -15,10 +15,10 @@ public void apply(Project project) {
         .withType(
             JavaPlugin.class,
             javaPlugin -> {
-              JavaPluginConvention javaConvention =
-                  project.getConvention().getPlugin(JavaPluginConvention.class);
+              JavaPluginExtension javaPluginExtension =
+                  project.getExtensions().getByType(JavaPluginExtension.class);
               SourceSet mainSourceSet =
-                  javaConvention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+                  javaPluginExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
               ConfigureJava.configure(project, mainSourceSet);
               ConfigureKotlin.configure(project, mainSourceSet);
             });

diff --git a/compile/src/main/java/org/seasar/doma/gradle/compile/ConfigureJava.java b/compile/src/main/java/org/seasar/doma/gradle/compile/ConfigureJava.java
@@ -21,7 +21,7 @@ public static void configure(Project project, SourceSet sourceSet) {
             CopyResources.NAME + "Java",
             CopyResources.class,
             sourceSet,
-            javaCompile.getDestinationDir());
+            javaCompile.getDestinationDirectory());
 
     javaCompile.dependsOn(copyResources);
     processResources.configure(task -> task.exclude(CopyResources.DOMA_RESOURCES));