Skip to content

Commit dbedbdc

Browse files
committed
QuarkusBuildTask uses getBuildForkOptions
1 parent 7fa4088 commit dbedbdc

File tree

7 files changed

+71
-1
lines changed

7 files changed

+71
-1
lines changed

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ void generateBuild() {
272272
.collect(Collectors.joining("\n ", "\n ", "")));
273273
}
274274

275-
WorkQueue workQueue = workQueue(quarkusProperties, getExtensionView().getCodeGenForkOptions().get());
275+
WorkQueue workQueue = workQueue(quarkusProperties, getExtensionView().getBuildForkOptions().get());
276276

277277
workQueue.submit(BuildWorker.class, params -> {
278278
params.getBuildSystemProperties()

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusPluginExtensionView.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public QuarkusPluginExtensionView(Project project, QuarkusPluginExtension extens
6464
getCleanupBuildOutput().set(extension.getCleanupBuildOutput());
6565
getFinalName().set(extension.getFinalName());
6666
getCodeGenForkOptions().set(getProviderFactory().provider(() -> extension.codeGenForkOptions));
67+
getBuildForkOptions().set(getProviderFactory().provider(() -> extension.buildForkOptions));
6768
getIgnoredEntries().set(extension.ignoredEntriesProperty());
6869
getMainResources().setFrom(project.getExtensions().getByType(SourceSetContainer.class).getByName(MAIN_SOURCE_SET_NAME)
6970
.getResources().getSourceDirectories());
@@ -127,6 +128,9 @@ private Provider<Map<String, String>> getQuarkusRelevantProjectProperties(Projec
127128
@Nested
128129
public abstract ListProperty<Action<? super JavaForkOptions>> getCodeGenForkOptions();
129130

131+
@Nested
132+
public abstract ListProperty<Action<? super JavaForkOptions>> getBuildForkOptions();
133+
130134
@Input
131135
@Optional
132136
public abstract Property<Boolean> getJarEnabled();
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
plugins {
2+
java
3+
id("io.quarkus")
4+
}
5+
6+
repositories {
7+
mavenCentral()
8+
mavenLocal()
9+
}
10+
11+
val quarkusPlatformGroupId: String by project
12+
val quarkusPlatformArtifactId: String by project
13+
val quarkusPlatformVersion: String by project
14+
15+
dependencies {
16+
implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
17+
}
18+
19+
quarkus {
20+
buildForkOptions {
21+
println("message!")
22+
}
23+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
quarkusPlatformArtifactId=quarkus-bom
2+
quarkusPlatformGroupId=io.quarkus
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
pluginManagement {
2+
repositories {
3+
mavenLocal {
4+
content {
5+
includeGroupByRegex 'io.quarkus.*'
6+
includeGroup 'org.hibernate.orm'
7+
}
8+
}
9+
mavenCentral()
10+
gradlePluginPortal()
11+
}
12+
plugins {
13+
id 'io.quarkus' version "${quarkusPluginVersion}"
14+
}
15+
}
16+
rootProject.name='code-with-quarkus'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.acme;
2+
3+
4+
5+
public class EntryPoint {
6+
public static void main(String[] args) {
7+
8+
}
9+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package io.quarkus.gradle;
2+
3+
import static org.assertj.core.api.Assertions.assertThat;
4+
5+
import org.junit.jupiter.api.Test;
6+
7+
public class BuildForkOptionsAreIncludedInQuarkusBuildTaskTest extends QuarkusGradleWrapperTestBase {
8+
9+
@Test
10+
public void testBuildForkOptionsAreProcessed() throws Exception {
11+
var projectDir = getProjectDir("basic-java-application-with-fork-options");
12+
var buildResult = runGradleWrapper(projectDir, "clean", "quarkusBuild");
13+
assertThat(BuildResult.isSuccessful(buildResult.getTasks().get(":quarkusGenerateCode"))).isTrue();
14+
assertThat(buildResult.getOutput().contains("message!")).isTrue();
15+
}
16+
}

0 commit comments

Comments
 (0)