From 1f219728a2fe41c8baa6c0af6806ee2697fb87d3 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Thu, 8 Mar 2018 19:46:30 -0500 Subject: [PATCH] Switch to Gradle 4.6 distro --- .../springframework/ide/vscode/commons/gradle/GradleCore.java | 4 ++-- .../ide/vscode/commons/gradle/GradleProjectTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java index cef457221..f9af09e06 100644 --- a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java +++ b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java @@ -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) { diff --git a/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java b/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java index 8e58dc89e..7def43ca1 100644 --- a/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java +++ b/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java @@ -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