Optionally disable loading gradle from gradle wrapper #1026
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
|
@fbricon I have updated the PR. |
fbricon
requested changes
May 14, 2019
| if (gradleHomeFile != null) { | ||
| distribution = GradleDistribution.forLocalInstallation(gradleHomeFile); | ||
| if (JavaLanguageServerPlugin.getPreferencesManager() != null && JavaLanguageServerPlugin.getPreferencesManager().getPreferences().isGradleWrapperEnabled() && Files.exists(rootFolder.resolve("gradlew"))) { | ||
| return DEFAULT_DISTRIBUTION; |
There was a problem hiding this comment.
that should be GradleDistribution.fromBuild()
fbricon
requested changes
May 14, 2019
| @@ -185,7 +201,7 @@ private static boolean checkGradlePersistence(boolean shouldSynchronize, IProjec | |||
|
|
|||
| @Override | |||
| public boolean accept(File dir, String name) { | |||
| if (name != null && name.endsWith(GradleBuildSupport.GRADLE_SUFFIX)) { | |||
| if (name != null && (name.endsWith(GradleBuildSupport.GRADLE_SUFFIX) || name.equals(".settings"))) { | |||
| */ | ||
| public static final String GRADLE_WRAPPER_ENABLED = "java.import.gradle.wrapper.enabled"; | ||
| /** | ||
| * Preference key for gradle version. |
There was a problem hiding this comment.
Preference key for gradle version to use when the gradle wrapper is not used.
| @@ -540,6 +557,11 @@ public Preferences setJavaHome(String javaHome) { | |||
| return this; | |||
| } | |||
|
|
|||
| public Preferences setGradleVersion(String gradleVersion) { | |||
| this.gradleVersion = gradleVersion; | |||
There was a problem hiding this comment.
if null or blank, then assign null
Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>
|
@fbricon I have updated the PR. |
|
test this please |
fbricon
approved these changes
May 14, 2019
|
Two new properties are added: Importing a gradle project works in the following way:
|
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.
Fixes redhat-developer/vscode-java#875
Requires redhat-developer/vscode-java#917
Signed-off-by: Snjezana Peco snjezana.peco@redhat.com