Skip to content

Commit c5bcf2f

Browse files
committed
Use the copy task instead of the sync task to improve performance
1 parent 53cd451 commit c5bcf2f

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@ The plugin is equivalent to the following gradle script:
2020
```groovy
2121
def domaResources = ['doma.compile.config', 'META-INF/**/*.sql', 'META-INF/**/*.script']
2222
23-
task syncDomaResourcesJava(type: Sync) {
23+
task copyDomaResourcesJava(type: Copy) {
2424
from sourceSets.main.resources.srcDirs
2525
into compileJava.destinationDir
2626
include domaResources
2727
}
2828
2929
compileJava {
30-
dependsOn syncDomaResourcesJava
30+
dependsOn copyDomaResourcesJava
3131
}
3232
3333
processResources {
3434
exclude domaResources
3535
}
3636
37-
task syncDomaResourcesKotlin(type: Sync) {
37+
task copyDomaResourcesKotlin(type: Copy) {
3838
from sourceSets.main.resources.srcDirs
3939
into compileKotlin.destinationDir
4040
include domaResources
4141
}
4242
4343
compileKotlin {
44-
dependsOn syncDomaResourcesKotlin
44+
dependsOn copyDomaResourcesKotlin
4545
}
4646
4747
kapt {

compile/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=org.seasar.doma
2-
version=1.0.0
2+
version=1.1.0-SNAPSHOT

compile/src/main/groovy/org/seasar/doma/gradle/compile/ConfigureKotlin.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ class ConfigureKotlin {
1313
kapt.arguments {
1414
arg('doma.resources.dir', compileKotlin.get().destinationDir)
1515
}
16-
def syncResources = tasks.register(SyncResources.NAME + "Kotlin", SyncResources.class, sourceSet, compileKotlin)
16+
def copyResources = tasks.register(CopyResources.NAME + "Kotlin", CopyResources.class, sourceSet, compileKotlin)
1717
compileKotlin.configure {
18-
dependsOn syncResources
18+
dependsOn copyResources
1919
}
2020
}
2121
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public static void configure(Project project, SourceSet sourceSet) {
1616
tasks.named(sourceSet.getCompileJavaTaskName(), JavaCompile.class);
1717
TaskProvider<ProcessResources> processResources =
1818
tasks.named(sourceSet.getProcessResourcesTaskName(), ProcessResources.class);
19-
TaskProvider<SyncResources> syncResources =
20-
tasks.register(SyncResources.NAME + "Java", SyncResources.class, sourceSet, javaCompile);
19+
TaskProvider<CopyResources> copyResources =
20+
tasks.register(CopyResources.NAME + "Java", CopyResources.class, sourceSet, javaCompile);
2121

22-
javaCompile.configure(task -> task.dependsOn(syncResources));
23-
processResources.configure(task -> task.exclude(SyncResources.DOMA_RESOURCES));
22+
javaCompile.configure(task -> task.dependsOn(copyResources));
23+
processResources.configure(task -> task.exclude(CopyResources.DOMA_RESOURCES));
2424
}
2525
}

compile/src/main/java/org/seasar/doma/gradle/compile/SyncResources.java renamed to compile/src/main/java/org/seasar/doma/gradle/compile/CopyResources.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
import java.util.Collections;
55
import java.util.List;
66
import javax.inject.Inject;
7+
import org.gradle.api.tasks.Copy;
78
import org.gradle.api.tasks.SourceSet;
8-
import org.gradle.api.tasks.Sync;
99
import org.gradle.api.tasks.TaskProvider;
1010
import org.gradle.api.tasks.compile.AbstractCompile;
1111

12-
public class SyncResources extends Sync {
12+
public class CopyResources extends Copy {
1313

14-
public static final String NAME = "domaSyncResources";
14+
public static final String NAME = "domaCopyResources";
1515

1616
public static final List<String> DOMA_RESOURCES =
1717
Collections.unmodifiableList(
1818
Arrays.asList("doma.compile.config", "META-INF/**/*.sql", "META-INF/**/*.script"));
1919

2020
@Inject
21-
public SyncResources(SourceSet sourceSet, TaskProvider<AbstractCompile> compile) {
21+
public CopyResources(SourceSet sourceSet, TaskProvider<AbstractCompile> compile) {
2222
from(sourceSet.getResources().getSourceDirectories());
2323
into(compile.get().getDestinationDir());
2424
include(DOMA_RESOURCES);

0 commit comments

Comments
 (0)