[gradle] do not use deprecated methods from GradleInstallationManager

GitOrigin-RevId: f02061db65623297c74743735c074c66be27c2d5

plugins/gradle/src/org/jetbrains/plugins/gradle/GradleManager.java

@@ -110,15 +110,15 @@ public final class GradleManager
       String rootProjectPath = projectLevelSettings != null ? projectLevelSettings.getExternalProjectPath() : projectPath;
 
       GradleInstallationManager gradleInstallationManager = GradleInstallationManager.getInstance();
-      File gradleHome = gradleInstallationManager.getGradleHome(project, rootProjectPath);
+      Path gradleHome = gradleInstallationManager.getGradleHomePath(project, rootProjectPath);
       String localGradlePath = null;
       if (gradleHome != null) {
         try {
           // Try to resolve symbolic links as there were problems with them at the gradle side.
-          localGradlePath = gradleHome.getCanonicalPath();
+          localGradlePath = gradleHome.toRealPath().toString();
         }
         catch (IOException e) {
-          localGradlePath = gradleHome.getAbsolutePath();
+          localGradlePath = gradleHome.toAbsolutePath().toString();
         }
       }
 

plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.kt

@@ -388,6 +388,7 @@ open class GradleInstallationManager : Disposable.Default {
       return null
     }
 
+    @JvmStatic
     fun getGradleVersion(gradleHome: Path?): String? {
       if (gradleHome == null) {
         return null
@@ -516,6 +517,7 @@ open class GradleInstallationManager : Disposable.Default {
       return buildLayoutParameters.gradleVersion
     }
 
+    @JvmStatic
     fun parseDistributionVersion(path: String): GradleVersion? {
       var path = path
       path = StringUtil.substringAfterLast(path, "/") ?: return null

plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleLocalSettings.java

@@ -11,6 +11,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.gradle.service.GradleInstallationManager;
 import org.jetbrains.plugins.gradle.util.GradleConstants;
 
+import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -44,7 +45,7 @@ public final class GradleLocalSettings extends AbstractExternalSystemLocalSettin
     if (state.myGradleVersions == null) {
       state.myGradleVersions = new HashMap<>();
     }
-    state.myGradleVersions.put(linkedProjectPath, GradleInstallationManager.getGradleVersion(gradleHome));
+    state.myGradleVersions.put(linkedProjectPath, GradleInstallationManager.getGradleVersion(Path.of(gradleHome)));
   }
 
   @ApiStatus.Internal

plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/GradleImportHelper.kt

@@ -134,6 +134,6 @@ internal class LoadKtGradleConfigurationAction : AnAction() {
 }
 
 fun getGradleVersion(project: Project, settings: GradleProjectSettings): String {
-    val gradleHome = service<GradleInstallationManager>().getGradleHome(project, settings.externalProjectPath)?.path
+    val gradleHome = service<GradleInstallationManager>().getGradleHomePath(project, settings.externalProjectPath)
     return GradleInstallationManager.getGradleVersion(gradleHome) ?: GradleVersion.current().version
 }

plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/ProjectGradleSettingsListener.kt

@@ -16,6 +16,7 @@ import org.jetbrains.plugins.gradle.service.GradleInstallationManager
 import org.jetbrains.plugins.gradle.settings.DistributionType
 import org.jetbrains.plugins.gradle.settings.GradleProjectSettings
 import org.jetbrains.plugins.gradle.settings.GradleSettingsListener
+import java.nio.file.Path
 import java.nio.file.Paths
 
 class ProjectGradleSettingsListener(
@@ -60,7 +61,7 @@ class ProjectGradleSettingsListener(
     }
 
     override fun onGradleHomeChange(oldPath: String?, newPath: String?, linkedProjectPath: String) {
-        val version = GradleInstallationManager.getGradleVersion(newPath)
+        val version = GradleInstallationManager.getGradleVersion(newPath?.let { Path.of(it) })
         buildRootsManager.reloadBuildRoot(linkedProjectPath, version)
     }
 

plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/importing/KotlinDslSyncListener.kt

@@ -52,8 +52,8 @@ class KotlinDslSyncListener : ExternalSystemTaskNotificationListener {
 
         if (sync.gradleHome == null) {
             sync.gradleHome = GradleInstallationManager.getInstance()
-                .getGradleHome(project, sync.workingDir)
-                ?.path
+                .getGradleHomePath(project, sync.workingDir)
+                ?.toString()
         }
 
         if (sync.javaHome == null) {

plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/roots/GradleBuildRootsManager.kt

@@ -42,6 +42,7 @@ import org.jetbrains.plugins.gradle.settings.GradleSettings
 import org.jetbrains.plugins.gradle.util.GradleConstants
 import java.nio.file.FileSystems
 import java.nio.file.Files
+import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.attribute.BasicFileAttributes
 import java.util.concurrent.ConcurrentLinkedQueue
@@ -312,7 +313,7 @@ class GradleBuildRootsManager(val project: Project, private val coroutineScope:
         return tryCreateImportedRoot(settings.externalProjectPath) {
             GradleBuildRootDataSerializer.getInstance().read(it)?.let { data ->
                 val gradleHome = data.gradleHome
-                if (gradleHome.isNotBlank() && GradleInstallationManager.getGradleVersion(gradleHome) != version) return@let null
+                if (gradleHome.isNotBlank() && GradleInstallationManager.getGradleVersion(Path.of(gradleHome)) != version) return@let null
 
                 addFromSettings(data, settings)
             }