Skip to content

Make sure compileJava and compileKotlin run after compileQuarkusGeneratedSourcesXXX tasks #49864

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
Sep 4, 2025
Merged

Make sure compileJava and compileKotlin run after compileQuarkusGeneratedSourcesXXX tasks #49864

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
19 changes: 19 additions & 0 deletions devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/NamedImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package io.quarkus.gradle;

import java.util.Objects;

import org.gradle.api.Named;

class NamedImpl implements Named {

private final String name;

public NamedImpl(String name) {
this.name = Objects.requireNonNull(name);
}

@Override
public String getName() {
return name;
}
}
56 changes: 43 additions & 13 deletions devtools/gradle/gradle-application-plugin/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 @@ -471,39 +471,69 @@ public boolean isSatisfiedBy(Task t) {

tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile.class,
compileJava -> {
// add the code gen sources
final SourceSet generatedSourceSet = sourceSets
.getByName(QuarkusGenerateCode.QUARKUS_GENERATED_SOURCES);
addCodeGenSourceDirs(compileJava, generatedSourceSet, quarkusExt);
// quarkusGenerateCode is a dependency
compileJava.dependsOn(quarkusGenerateCode);
// quarkusGenerateCodeDev must run before compileJava in case quarkusDev is the target
compileJava.mustRunAfter(quarkusGenerateCodeDev);
// add the code gen sources
addCodeGenSourceDirs(compileJava,
sourceSets.getByName(QuarkusGenerateCode.QUARKUS_GENERATED_SOURCES), quarkusExt);

// The code below needs to be reviewed. There is no test coverage for it.
// We need to properly configure/use these tasks. For now they aren't actually used
// but w/o the code below, in some cases, Gradle may fail on determining task ordering.
// https://github.com/quarkusio/quarkus/issues/45057 states that this issue happens with
// org.gradle.parallel=true when building from IntelliJ
// Similar code is added for compileKotlin (although for Kotlin these task don't seem to exist).
if (tasks.contains(new NamedImpl(generatedSourceSet.getCompileJavaTaskName()))) {
compileJava.mustRunAfter(tasks.named(generatedSourceSet.getCompileJavaTaskName()));
}
});
tasks.named(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME, JavaCompile.class,
compileTestJava -> {
compileTestJava.dependsOn(quarkusGenerateCode);
compileTestJava.dependsOn(quarkusGenerateCodeTests);
// add the code gen test sources
final SourceSet generatedSourceSet = sourceSets
.getByName(QuarkusGenerateCode.QUARKUS_TEST_GENERATED_SOURCES);
addCodeGenSourceDirs(compileTestJava, generatedSourceSet, quarkusExt);
compileTestJava.dependsOn(quarkusGenerateCode, quarkusGenerateCodeTests);
if (tasks.contains(new NamedImpl(generatedSourceSet.getCompileJavaTaskName()))) {
compileTestJava.mustRunAfter(tasks.named(generatedSourceSet.getCompileJavaTaskName()));
}
if (project.getGradle().getStartParameter().getTaskNames().contains(QUARKUS_DEV_TASK_NAME)) {
compileTestJava.getOptions().setFailOnError(false);
}
// add the code gen test sources
addCodeGenSourceDirs(compileTestJava,
sourceSets.getByName(QuarkusGenerateCode.QUARKUS_TEST_GENERATED_SOURCES), quarkusExt);
});
});

project.getPlugins().withId("org.jetbrains.kotlin.jvm", plugin -> {
quarkusDev.configure(task -> task.shouldPropagateJavaCompilerArgs(false));
tasks.named("compileKotlin", task -> {
task.mustRunAfter(quarkusGenerateCode);
final SourceSet generatedSourceSet = project.getExtensions().getByType(SourceSetContainer.class)
.getByName(QuarkusGenerateCode.QUARKUS_GENERATED_SOURCES);
addCodeGenSourceDirs(task, generatedSourceSet, quarkusExt);
task.dependsOn(quarkusGenerateCode);
task.mustRunAfter(quarkusGenerateCodeDev);
addCodeGenSourceDirs(task, project.getExtensions().getByType(SourceSetContainer.class)
.getByName(QuarkusGenerateCode.QUARKUS_GENERATED_SOURCES), quarkusExt);
if (tasks.contains(new NamedImpl(generatedSourceSet.getCompileJavaTaskName()))) {
task.mustRunAfter(tasks.named(generatedSourceSet.getCompileJavaTaskName()));
}
String generatedSourcesCompileTaskName = generatedSourceSet.getCompileTaskName("kotlin");
if (tasks.contains(new NamedImpl(generatedSourcesCompileTaskName))) {
task.mustRunAfter(tasks.named(generatedSourcesCompileTaskName));
}
});
tasks.named("compileTestKotlin", task -> {
final SourceSet generatedSourceSet = project.getExtensions().getByType(SourceSetContainer.class)
.getByName(QuarkusGenerateCode.QUARKUS_TEST_GENERATED_SOURCES);
addCodeGenSourceDirs(task, generatedSourceSet, quarkusExt);
task.dependsOn(quarkusGenerateCodeTests);
addCodeGenSourceDirs(task, project.getExtensions().getByType(SourceSetContainer.class)
.getByName(QuarkusGenerateCode.QUARKUS_TEST_GENERATED_SOURCES), quarkusExt);
if (tasks.contains(new NamedImpl(generatedSourceSet.getCompileJavaTaskName()))) {
task.mustRunAfter(tasks.named(generatedSourceSet.getCompileJavaTaskName()));
}
final String generatedSourcesCompileTaskName = generatedSourceSet.getCompileTaskName("kotlin");
if (tasks.contains(new NamedImpl(generatedSourcesCompileTaskName))) {
task.mustRunAfter(tasks.named(generatedSourcesCompileTaskName));
}
});
});
}
Expand Down
4 changes: 2 additions & 2 deletions ...e/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusGradleUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ public static String getClassesDir(SourceSet sourceSet, File tmpDir, boolean pop
}

public static Path mergeClassesDirs(Collection<Path> classesDirs, File tmpDir, boolean populated, boolean test) {
List<Path> existingClassesDirs = classesDirs.stream().filter(p -> Files.exists(p)).toList();
List<Path> existingClassesDirs = classesDirs.stream().filter(Files::exists).toList();

if (existingClassesDirs.size() == 0) {
if (existingClassesDirs.isEmpty()) {
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion ...ion-tests/gradle/src/main/resources/grpc-descriptor-set-alternate-output-dir/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repositories {

dependencies {
implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
implementation 'io.quarkus:quarkus-resteasy'
implementation 'io.quarkus:quarkus-rest'
implementation 'io.quarkus:quarkus-grpc'
}

Expand Down
2 changes: 1 addition & 1 deletion ...gration-tests/gradle/src/main/resources/grpc-descriptor-set-alternate-output/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repositories {

dependencies {
implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
implementation 'io.quarkus:quarkus-resteasy'
implementation 'io.quarkus:quarkus-rest'
implementation 'io.quarkus:quarkus-grpc'
}

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/gradle/src/main/resources/grpc-descriptor-set/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repositories {

dependencies {
implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
implementation 'io.quarkus:quarkus-resteasy'
implementation 'io.quarkus:quarkus-rest'
implementation 'io.quarkus:quarkus-grpc'
}

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/gradle/src/main/resources/grpc-include-project/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repositories {

dependencies {
implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
implementation 'io.quarkus:quarkus-resteasy'
implementation 'io.quarkus:quarkus-rest'
implementation 'io.quarkus:quarkus-grpc'
}

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/gradle/src/main/resources/grpc-multi-module-project/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ subprojects {

dependencies {

implementation 'io.quarkus:quarkus-resteasy'
implementation 'io.quarkus:quarkus-rest'

testImplementation 'io.quarkus:quarkus-junit5'

Expand Down
Loading