Skip to content

Commit 1c565d6

Browse files
authored
Merge pull request #59 from domaframework/refactor/replace-deprecated-api
Replace deprecated APIs
2 parents 7170d4c + b68c88e commit 1c565d6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

compile/src/main/java/org/seasar/doma/gradle/compile/CompilePlugin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.gradle.api.Plugin;
44
import org.gradle.api.Project;
55
import org.gradle.api.plugins.JavaPlugin;
6-
import org.gradle.api.plugins.JavaPluginConvention;
6+
import org.gradle.api.plugins.JavaPluginExtension;
77
import org.gradle.api.tasks.SourceSet;
88

99
public class CompilePlugin implements Plugin<Project> {
@@ -15,10 +15,10 @@ public void apply(Project project) {
1515
.withType(
1616
JavaPlugin.class,
1717
javaPlugin -> {
18-
JavaPluginConvention javaConvention =
19-
project.getConvention().getPlugin(JavaPluginConvention.class);
18+
JavaPluginExtension javaPluginExtension =
19+
project.getExtensions().getByType(JavaPluginExtension.class);
2020
SourceSet mainSourceSet =
21-
javaConvention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
21+
javaPluginExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
2222
ConfigureJava.configure(project, mainSourceSet);
2323
ConfigureKotlin.configure(project, mainSourceSet);
2424
});

compile/src/main/java/org/seasar/doma/gradle/compile/ConfigureJava.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static void configure(Project project, SourceSet sourceSet) {
2121
CopyResources.NAME + "Java",
2222
CopyResources.class,
2323
sourceSet,
24-
javaCompile.getDestinationDir());
24+
javaCompile.getDestinationDirectory());
2525

2626
javaCompile.dependsOn(copyResources);
2727
processResources.configure(task -> task.exclude(CopyResources.DOMA_RESOURCES));

0 commit comments

Comments
 (0)