MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[jdk] Recognise new JDK flavors with ExternalJavaConfigurationProvider-s

Browse Source 
#IDEA-358301

GitOrigin-RevId: 7cbc09ba5b34d1c42e2a4b29e1f397d6a7d43a83
This commit is contained in:
Louis Vignier
2024-08-29 16:27:20 +02:00
committed by intellij-monorepo-bot
parent 119088c1e9
commit daaaf9e9cf
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-impl/src/com/intellij/openapi/projectRoots/impl/SdkmanrcConfigurationProvider.kt
View File

@@ -7,7 +7,7 @@ import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.util.NlsSafe
import org.jetbrains.jps.model.java.JdkVersionDetector
import java.io.File
import java.util.Properties
import java.util.*
private val LOG = logger<SdkmanrcConfigurationProvider>()
@@ -36,11 +36,15 @@ data class SdkmanReleaseData(val target: String,
val variant = when {
vendor == "adpt" && flavour == "hs" -> JdkVersionDetector.Variant.AdoptOpenJdk_HS
vendor == "adpt" && flavour == "j9" -> JdkVersionDetector.Variant.AdoptOpenJdk_J9
vendor == "albba" -> JdkVersionDetector.Variant.Dragonwell
vendor == "amzn" -> JdkVersionDetector.Variant.Corretto
vendor == "bsg" -> JdkVersionDetector.Variant.BiSheng
vendor == "graal" -> JdkVersionDetector.Variant.GraalVM
vendor == "graalce" -> JdkVersionDetector.Variant.GraalVMCE
vendor == "jbr" -> JdkVersionDetector.Variant.JBR
vendor == "kona" -> JdkVersionDetector.Variant.Kona
vendor == "librca" -> JdkVersionDetector.Variant.Liberica
vendor == "ms" -> JdkVersionDetector.Variant.Microsoft
vendor == "oracle" -> JdkVersionDetector.Variant.Oracle
vendor == "open" -> JdkVersionDetector.Variant.Oracle
vendor == "sapmchn" -> JdkVersionDetector.Variant.SapMachine

3
java/java-impl/src/com/intellij/openapi/projectRoots/impl/ToolVersionsConfigurationProvider.kt
View File

@@ -33,9 +33,12 @@ data class AsdfReleaseData(val name: String, val vendor: String, val version: St
"adoptopenjdk-jre-openj9", "adoptopenjdk-jre-openj9-large_heap",
"adoptopenjdk-openj9", "adoptopenjdk-openj9-large_heap" -> JdkVersionDetector.Variant.AdoptOpenJdk_J9
"corretto" -> JdkVersionDetector.Variant.Corretto
"dragonwell" -> JdkVersionDetector.Variant.Dragonwell
"graalvm-community" -> JdkVersionDetector.Variant.GraalVMCE
"kona" -> JdkVersionDetector.Variant.Kona
"liberica", "liberica-javafx",
"liberica-jre", "liberica-jre-javafx", "liberica-lite" -> JdkVersionDetector.Variant.Liberica
"microsoft" -> JdkVersionDetector.Variant.Microsoft
"openjdk", "oracle" -> JdkVersionDetector.Variant.Oracle
"oracle-graalvm" -> JdkVersionDetector.Variant.GraalVM
"sapmachine", "sapmachine-jre" -> JdkVersionDetector.Variant.SapMachine