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

updated various gradle versions to allow to operate on JDK >= 11

Browse Source
This commit is contained in:
Martin Lippert
2020-12-21 14:24:33 +01:00
parent fbae32fb0e
commit 6f031972ab
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless-services/commons/commons-gradle/pom.xml
View File

@@ -14,7 +14,7 @@
</parent>
<properties>
<gradle-tooling.version>4.3</gradle-tooling.version>
<gradle-tooling.version>6.7</gradle-tooling.version>
</properties>
<repositories>

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

@@ -77,7 +77,7 @@ 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("4.6");
gradleConnector.useGradleVersion("6.7");
connection = gradleConnector.connect();
return connection.getModel(modelType);
} catch (GradleConnectionException e) {

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

@@ -87,14 +87,14 @@ public class GradleProjectClasspath implements IClasspath {
for (EclipseExternalDependency dep : project.getClasspath()) {
entries.add(new CPE(Classpath.ENTRY_KIND_BINARY, dep.getFile().getAbsolutePath()));
}
for (EclipseProjectDependency dep : project.getProjectDependencies()) {
/** for (EclipseProjectDependency dep : project.getProjectDependencies()) {
EclipseProject peer = findPeer(root, dep.getTargetProject().getName());
if (peer!=null) {
for (EclipseSourceDirectory sf : peer.getSourceDirectories()) {
entries.add(createSourceCPE(peer, sf));
}
}
}
} */
for (EclipseSourceDirectory sf : project.getSourceDirectories()) {
CPE cpe = createSourceCPE(project, sf);
cpe.setOwn(true);

2
headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

2
headless-services/commons/commons-gradle/src/test/resources/test-app-1/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

2
headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip