From 3bf7eef4d806a8a5831533102c41fe1641658495 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Mon, 14 Jun 2021 16:00:45 +0200 Subject: [PATCH] [imltogradle] Generate maven repos based on 'jarRepositories.xml' from Community This commit minimizes difference between build.gradle.kts files generated from ultimate & community infrastructure --- .../src/org/jetbrains/kotlin/generators/imltogradle/Main.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/generators/ide-iml-to-gradle-generator/src/org/jetbrains/kotlin/generators/imltogradle/Main.kt b/generators/ide-iml-to-gradle-generator/src/org/jetbrains/kotlin/generators/imltogradle/Main.kt index 35d00823f35..8ed0c90dc8e 100644 --- a/generators/ide-iml-to-gradle-generator/src/org/jetbrains/kotlin/generators/imltogradle/Main.kt +++ b/generators/ide-iml-to-gradle-generator/src/org/jetbrains/kotlin/generators/imltogradle/Main.kt @@ -21,6 +21,7 @@ import java.util.* private lateinit var intellijModuleNameToGradleDependencyNotationsMapping: Map> private val KOTLIN_REPO_ROOT = File(".").canonicalFile private val INTELLIJ_REPO_ROOT = KOTLIN_REPO_ROOT.resolve("kotlin-ide") +private val INTELLIJ_COMMUNITY_REPO_ROOT = INTELLIJ_REPO_ROOT.resolve("kotlin").takeIf { it.exists() } ?: INTELLIJ_REPO_ROOT private val intellijModuleNameToGradleDependencyNotationsMappingManual: List> = listOf( "intellij.platform.jps.build" to GradleDependencyNotation("jpsBuildTest()"), @@ -195,7 +196,7 @@ fun convertJpsModule(imlFile: File, jpsModule: JpsModule): String { .mapValues { entry -> entry.value.joinToString("\n") { convertJpsModuleSourceRoot(imlFile, it) } } .let { Pair(it[false] ?: "", it[true] ?: "") } - val mavenRepos = INTELLIJ_REPO_ROOT.resolve(".idea/jarRepositories.xml").readXml().traverseChildren() + val mavenRepos = INTELLIJ_COMMUNITY_REPO_ROOT.resolve(".idea/jarRepositories.xml").readXml().traverseChildren() .filter { it.getAttributeValue("name") == "url" } .map { it.getAttributeValue("value")!! } .map { "maven { setUrl(\"$it\") }" }