Skip to content

Improve the dependencies between gradle tasks #1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2019
Merged

Improve the dependencies between gradle tasks #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devtools/gradle-it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<configuration>
<executable>${gradle.executable}</executable>
<arguments>
<argument>quarkusBuild</argument>
<argument>build</argument>
<argument>-S</argument>
</arguments>
<skip>${skip.gradle.build}</skip>
Expand Down
36 changes: 26 additions & 10 deletions devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
import org.gradle.api.GradleException;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.plugins.BasePlugin;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.tasks.TaskContainer;
import org.gradle.util.GradleVersion;

import io.quarkus.gradle.tasks.QuarkusAddExtension;
Expand All @@ -34,20 +38,32 @@ public class QuarkusPlugin implements Plugin<Project> {
@Override
public void apply(Project project) {
verifyGradleVersion();
//register extension
// register extension
project.getExtensions().create("quarkus", QuarkusPluginExtension.class, project);

registerListExtensions(project);
registerTasks(project);
}

private void registerListExtensions(Project project) {
project.getTasks().create("listExtensions", QuarkusListExtensions.class);
project.getTasks().create("addExtension", QuarkusAddExtension.class);
project.getTasks().create("quarkusDev", QuarkusDev.class).dependsOn("build");
project.getTasks().create("quarkusBuild", QuarkusBuild.class).dependsOn("build");
project.getTasks()
.create("quarkusNative", QuarkusNative.class)
.dependsOn("quarkusBuild");
private void registerTasks(Project project) {
TaskContainer tasks = project.getTasks();
tasks.create("listExtensions", QuarkusListExtensions.class);
tasks.create("addExtension", QuarkusAddExtension.class);

Task quarkusBuild = tasks.create("quarkusBuild", QuarkusBuild.class);
Task quarkusDev = tasks.create("quarkusDev", QuarkusDev.class);

project.getPlugins().withType(
BasePlugin.class,
basePlugin -> tasks.getByName(BasePlugin.ASSEMBLE_TASK_NAME).dependsOn(quarkusBuild));
project.getPlugins().withType(
JavaPlugin.class,
javaPlugin -> {
Task classesTask = tasks.getByName(JavaPlugin.CLASSES_TASK_NAME);
quarkusDev.dependsOn(classesTask);
quarkusBuild.dependsOn(classesTask);
});

tasks.create("quarkusNative", QuarkusNative.class).dependsOn(quarkusBuild);
}

private void verifyGradleVersion() {
Expand Down
24 changes: 23 additions & 1 deletion devtools/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
public class QuarkusPluginTest {

@Test
public void quarkusTest() {
public void shouldCreateTasks() {
Project project = ProjectBuilder.builder().build();
project.getPluginManager().apply("io.quarkus.gradle.plugin");

Expand All @@ -24,4 +24,26 @@ public void quarkusTest() {
assertNotNull(tasks.getByName("addExtension"));
}

@Test
public void shouldMakeAssembleDependOnQuarkusBuild() {
Project project = ProjectBuilder.builder().build();
project.getPluginManager().apply("io.quarkus.gradle.plugin");
project.getPluginManager().apply("base");

TaskContainer tasks = project.getTasks();

assertTrue(tasks.getByName("assemble").getDependsOn().contains(tasks.getByName("quarkusBuild")));
}

@Test
public void shouldMakeQuarkusDevAndQuarkusBuildDependOnClassesTask() {
Project project = ProjectBuilder.builder().build();
project.getPluginManager().apply("io.quarkus.gradle.plugin");
project.getPluginManager().apply("java");

TaskContainer tasks = project.getTasks();

assertTrue(tasks.getByName("quarkusBuild").getDependsOn().contains(tasks.getByName("classes")));
assertTrue(tasks.getByName("quarkusDev").getDependsOn().contains(tasks.getByName("classes")));
}
}