From 9228a1000450b4ee6c351a8cb1a0aaec77ff3ff7 Mon Sep 17 00:00:00 2001 From: Alexey Kalina Date: Tue, 26 Mar 2024 11:51:16 +0100 Subject: [PATCH] [evaluation-plugin] ML-2984 SetupJDKStep failed for intellij-teamcity-config GitOrigin-RevId: 5fcd7aef230d2f4391d226a51e98fbae107e6574 --- .../src/com/intellij/cce/evaluation/SetupJDKStep.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/evaluation-plugin/languages/java/src/com/intellij/cce/evaluation/SetupJDKStep.kt b/plugins/evaluation-plugin/languages/java/src/com/intellij/cce/evaluation/SetupJDKStep.kt index e4851ac6497c..8b1586078d09 100644 --- a/plugins/evaluation-plugin/languages/java/src/com/intellij/cce/evaluation/SetupJDKStep.kt +++ b/plugins/evaluation-plugin/languages/java/src/com/intellij/cce/evaluation/SetupJDKStep.kt @@ -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) {