Skip to content

Commit 1bf7a96

Browse files
committed
Use gradle wrapper for invoking commands
1 parent 57f782f commit 1bf7a96

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/ContributionTask.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ public abstract class ContributionTask extends DefaultTask {
3535
@Inject
3636
protected abstract ExecOperations getExecOperations();
3737

38+
private Path gradlew;
39+
3840
private final ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT).setSerializationInclusion(JsonInclude.Include.NON_NULL);
3941

4042
private Path testsDirectory;
@@ -48,6 +50,7 @@ private record ContributingQuestion(String question, String help) {}
4850
private void initializeWorkingDirectories(){
4951
testsDirectory = Path.of(getProject().file(CoordinateUtils.replace("tests/src/$group$/$artifact$/$version$", coordinates)).getAbsolutePath());
5052
metadataDirectory = Path.of(getProject().file(CoordinateUtils.replace("metadata/$group$/$artifact$/$version$", coordinates)).getAbsolutePath());
53+
this.gradlew = Path.of(getProject().file("gradlew").getAbsolutePath());
5154
}
5255

5356
private void loadQuestions() throws IOException {
@@ -270,9 +273,9 @@ private List<Coordinates> getAdditionalDependencies() {
270273
private void createStubs(boolean shouldUpdate){
271274
InteractiveTaskUtils.printUserInfo("Generating stubs for: " + coordinates );
272275
if (shouldUpdate) {
273-
invokeCommand("gradle scaffold --coordinates " + coordinates + " --update", "Cannot generate stubs for: " + coordinates);
276+
invokeCommand(gradlew + " scaffold --coordinates " + coordinates + " --update", "Cannot generate stubs for: " + coordinates);
274277
} else {
275-
invokeCommand("gradle scaffold --coordinates " + coordinates, "Cannot generate stubs for: " + coordinates);
278+
invokeCommand(gradlew + " scaffold --coordinates " + coordinates, "Cannot generate stubs for: " + coordinates);
276279
}
277280
}
278281

@@ -431,10 +434,10 @@ private void addAgentConfigBlock() {
431434

432435
private void collectMetadata() {
433436
InteractiveTaskUtils.printUserInfo("Generating metadata");
434-
invokeCommand("gradle -Pagent test", "Cannot generate metadata", testsDirectory);
437+
invokeCommand(gradlew + " -Pagent test", "Cannot generate metadata", testsDirectory);
435438

436439
InteractiveTaskUtils.printUserInfo("Performing metadata copy");
437-
invokeCommand("gradle metadataCopy --task test --dir " + metadataDirectory, "Cannot perform metadata copy", testsDirectory);
440+
invokeCommand(gradlew + " metadataCopy --task test --dir " + metadataDirectory, "Cannot perform metadata copy", testsDirectory);
438441
}
439442

440443
private enum CONFIG_FILES {

0 commit comments

Comments
 (0)