File tree Expand file tree Collapse file tree 2 files changed +13
-7
lines changed
grails-shell/src/main/groovy/org/grails/cli/gradle Expand file tree Collapse file tree 2 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -43,13 +43,21 @@ class GradleUtil {
4343 private static final boolean DEFAULT_SUPPRESS_OUTPUT = true
4444
4545 public static ProjectConnection openGradleConnection (File baseDir ) {
46- DefaultGradleConnector gradleConnector = ( DefaultGradleConnector ) GradleConnector . newConnector(). forProjectDirectory(baseDir)
46+ GradleConnector gradleConnector = GradleConnector . newConnector(). forProjectDirectory(baseDir)
4747 if (System . getenv(" GRAILS_GRADLE_HOME" )) {
4848 gradleConnector. useInstallation(new File (System . getenv(" GRAILS_GRADLE_HOME" )))
4949 }
50+ else {
51+ def userHome = System . getProperty(" user.home" )
52+ if (userHome) {
53+ File sdkManGradle = new File (" $userHome /.sdkman/candidates/gradle/current" )
54+ if (sdkManGradle. exists()) {
55+ gradleConnector. useInstallation(sdkManGradle)
56+ }
57+ }
58+ }
5059
51- gradleConnector. embedded(! Environment . isInteractiveMode())
52- .connect()
60+ gradleConnector. connect()
5361 }
5462
5563 public static <T> T withProjectConnection (File baseDir , boolean suppressOutput = DEFAULT_SUPPRESS_OUTPUT ,
Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ import org.gradle.tooling.GradleConnector
2121import org.gradle.tooling.ProjectConnection
2222import org.gradle.tooling.internal.consumer.ConnectorServices
2323import org.gradle.tooling.internal.consumer.DefaultGradleConnector
24+ import org.grails.cli.gradle.GradleUtil
2425import org.grails.cli.profile.ProjectContext
2526
2627import java.util.concurrent.Callable
@@ -64,10 +65,7 @@ abstract class CachedGradleOperation<T> implements Callable<T> {
6465 }
6566
6667 try {
67- GradleConnector dgc = (GradleConnector )GradleConnector . newConnector()
68- .forProjectDirectory(projectContext. baseDir)
69-
70- def projectConnection = dgc. connect()
68+ ProjectConnection projectConnection = GradleUtil . openGradleConnection(projectContext. baseDir)
7169 try {
7270 updateStatusMessage()
7371 def data = readFromGradle(projectConnection)
You can’t perform that action at this time.
0 commit comments