MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[evaluation-plugin] ML-2984 SetupJDKStep failed for intellij-teamcity-config

Browse Source 
GitOrigin-RevId: 5fcd7aef230d2f4391d226a51e98fbae107e6574
This commit is contained in:
Alexey Kalina
2024-04-02 17:46:26 +00:00
committed by intellij-monorepo-bot
parent 3af15b92de
commit 9228a10004
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/evaluation-plugin/languages/java/src/com/intellij/cce/evaluation/SetupJDKStep.kt
+7 -4
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.cce.evaluation
import com.intellij.application.options.PathMacrosImpl
@@ -64,7 +64,7 @@ class SetupJDKStep(private val project: Project) : SetupSdkStep() {
}
}
JvmBuildSystem.findFor(project).refresh(project)
JvmBuildSystem.tryFindFor(project)?.refresh(project)
return workspace
}
@@ -128,7 +128,7 @@ class SetupJDKStep(private val project: Project) : SetupSdkStep() {
}
private fun forceUseProjectJdkForImporter(project: Project) {
when (JvmBuildSystem.findFor(project)) {
when (JvmBuildSystem.tryFindFor(project)) {
JvmBuildSystem.Maven -> {
val mavenManager = MavenProjectsManager.getInstance(project)
mavenManager.importingSettings.jdkForImporter = ExternalSystemJdkUtil.USE_PROJECT_JDK
@@ -153,6 +153,9 @@ private fun forceUseProjectJdkForImporter(project: Project) {
val outPath = Path.of(PathUtil.getJarPathForClass(PathUtil::class.java)).parent.parent
JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(jpsProject).outputUrl = outPath.toString()
}
else -> {
println("Unknown JVM build system. No additional setup will be performed.")
}
}
}
@@ -189,7 +192,7 @@ enum class JvmBuildSystem {
ProjectOpenProcessor.EXTENSION_POINT_NAME.extensionList.first { it.name.lowercase().contains("maven") }
}
fun findFor(project: Project): JvmBuildSystem = entries.first { it.accepts(project) }
fun tryFindFor(project: Project): JvmBuildSystem? = entries.firstOrNull { it.accepts(project) }
}
internal fun refresh(project: Project) {