Check Gradle compatibility when importing fails #1965
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CsCherrYY
force-pushed
the
cs-gradle-compatibility
branch
2 times, most recently
from
7467d15
to
a68bb65
Compare
Signed-off-by: Shi Chen <[email protected]>
CsCherrYY
force-pushed
the
cs-gradle-compatibility
branch
from
fd266c1
to
50cba35
Compare
org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/ProjectsManager.java
Outdated
Show resolved
Hide resolved
| GradleBuild gradleBuild = GradleCore.getWorkspace().createBuild(build); | ||
| try { | ||
| gradleBuild.withConnection(connection -> { | ||
| connection.newBuild().forTasks("wrapper").run(); |
There was a problem hiding this comment.
gradle wrapper --gradle-version 7.3.1 --distribution-type allYou can pass the wrapper version argument in forTasks directly, no need to create "gradle-wrapper.properties" file in advance.
There was a problem hiding this comment.
If we keep the properties file unchanged and try to execute the wrapper task, the Gradle will try to configure the project with the old Gradle version before executing this task, and it will result in the same compatibility error. So we should modify the properties file manually in advance.
rgrunber
reviewed
Jan 18, 2022
...dt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleCompatibilityErrorMarker.java
Outdated
Show resolved
Hide resolved
...se.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleCompatibilityChecker.java
Outdated
Show resolved
Hide resolved
...eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Shi Chen <[email protected]>
Signed-off-by: Shi Chen <[email protected]>
|
test this please |
org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/ResourceUtils.java
Outdated
Show resolved
Hide resolved
...se.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleCompatibilityChecker.java
Outdated
Show resolved
Hide resolved
...eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java
Outdated
Show resolved
Hide resolved
...eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java
Outdated
Show resolved
Hide resolved
...eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java
Outdated
Show resolved
Hide resolved
| @@ -387,8 +463,83 @@ public boolean accept(File dir, String name) { | |||
| return shouldSynchronize; | |||
| } | |||
|
|
|||
| public static boolean upgradeGradleVersion(String projectDir, IProgressMonitor monitor) { | |||
| String newDistributionUrl = String.format("https://services.gradle.org/distributions/gradle-%s-bin.zip", GradleCompatibilityChecker.CURRENT_GRADLE); | |||
| Path projectFolder = Paths.get(projectDir); | |||
There was a problem hiding this comment.
projectDir is passed as a uri string, doesPaths.get(uriString) support uri string?
There was a problem hiding this comment.
Currently it's a path string actually. I'll correct the naming of this variable.
Signed-off-by: Shi Chen <[email protected]>
Signed-off-by: Shi Chen <[email protected]>
testforstephen
approved these changes
Jan 19, 2022
rgrunber
reviewed
Jan 19, 2022
...eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Shi Chen <[email protected]>
rgrunber
approved these changes
Jan 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
related to redhat-developer/vscode-java#2245
Will add unit tests later.
Signed-off-by: Shi Chen [email protected]