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

Switch to Gradle 4.6 distro

Browse Source
This commit is contained in:
BoykoAlex
2018-03-08 19:46:30 -05:00
parent 75564b34cc
commit 1f219728a2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,8 +76,8 @@ public class GradleCore {
*/
((DefaultGradleConnector) gradleConnector).daemonMaxIdleTime(1, TimeUnit.SECONDS);
configuration.configure(gradleConnector);
// Use patched Gradle 4.3 distribution as a workaround for https://github.com/gradle/gradle/issues/2483
gradleConnector.useDistribution(URI.create("http://s3-test.spring.io/sts4/custom-gradle-builds/gradle-4.3-build.zip"));
// Use patched Gradle 4.4 distribution or higher as a workaround for https://github.com/gradle/gradle/issues/2483
gradleConnector.useGradleVersion("4.6");
connection = gradleConnector.connect();
return connection.getModel(modelType);
} catch (GradleConnectionException e) {

2
headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java
View File

@@ -83,7 +83,7 @@ public class GradleProjectTest {
@Test
public void outputFolder() throws Exception {
GradleJavaProject project = getGradleProject("test-app-1");
assertTrue(project.getClasspath().getOutputFolder().endsWith("bin"));
assertTrue(project.getClasspath().getOutputFolder().toString().contains("/bin"));
}
@Test