Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use gradle wrapper if available otherwise gradle 8.5 by default.

Browse Source
This commit is contained in:
aboyko
2024-09-12 10:30:38 -04:00
parent fca3fc0566
commit 9fdc1117bd
5 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
View File

@@ -11,6 +11,7 @@
package org.springframework.ide.vscode.commons.gradle;
import java.io.File;
import java.nio.file.Files;
import java.util.concurrent.TimeUnit;
import org.gradle.tooling.GradleConnectionException;
@@ -78,8 +79,11 @@ public class GradleCore {
*/
((DefaultGradleConnector) gradleConnector).daemonMaxIdleTime(1, TimeUnit.SECONDS);
configuration.configure(gradleConnector);
// Use patched Gradle 4.4 distribution or higher as a workaround for https://github.com/gradle/gradle/issues/2483
gradleConnector.useGradleVersion("7.6");
if (Files.exists(projectDir.toPath().resolve("gradle/wrapper/gradle-wrapper.properties"))) {
gradleConnector.useBuildDistribution();
} else {
gradleConnector.useGradleVersion("8.5");
}
connection = gradleConnector.connect();
return connection.getModel(modelType);
} catch (GradleConnectionException e) {