azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-11261 Implement MavenArchetypesProvider extension point

Browse Source
This commit is contained in:
Sergey Mashkov
2016-04-01 18:23:55 +03:00
parent f2ddc83f86
commit c64b59ed82
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenArchetypesProvider.kt
+7 -2
View File
@@ -61,8 +61,13 @@ class KotlinMavenArchetypesProvider(val kotlinPluginVersion: String) : MavenArch
.map { it.asJsonObject } .map { it.asJsonObject }
.map { MavenArchetype(it.get("g").asString, it.get("a").asString, it.get("v").asString, null, null) } .map { MavenArchetype(it.get("g").asString, it.get("a").asString, it.get("v").asString, null, null) }
.filter { it.version?.startsWith(versionPrefix) ?: false } .filter { it.version?.startsWith(versionPrefix) ?: false }
.maxBy { MavenVersionComparable(it.version) } .groupBy { it.groupId + ":" + it.artifactId }
.let { listOfNotNull(it) } .mapValues { chooseVersion(it.value) }
.mapNotNull { it.value }
private fun chooseVersion(versions: List<MavenArchetype>): MavenArchetype? {
return versions.maxBy { MavenVersionComparable(it.version) }
}
private fun mavenSearchUrl(group: String, artifactId: String? = null, version: String? = null, packaging: String? = null, rowsLimit: Int = 20): String { private fun mavenSearchUrl(group: String, artifactId: String? = null, version: String? = null, packaging: String? = null, rowsLimit: Int = 20): String {
val q = listOf( val q = listOf(
idea/tests/org/jetbrains/kotlin/idea/configuration/KotlinMavenArchetypesProviderTest.kt
+2 -1
View File
@@ -39,7 +39,8 @@ class KotlinMavenArchetypesProviderTest {
assertEquals( assertEquals(
listOf( listOf(
MavenArchetype("org.jetbrains.kotlin", "kotlin-archetype-jvm", "1.0.1-2", null, null) MavenArchetype("org.jetbrains.kotlin", "kotlin-archetype-jvm", "1.0.1-2", null, null),
MavenArchetype("org.jetbrains.kotlin", "kotlin-archetype-js", "1.0.0", null, null)
).sortedBy { it.artifactId + "." + it.version }, ).sortedBy { it.artifactId + "." + it.version },
versions.sortedBy { it.artifactId + "." + it.version } versions.sortedBy { it.artifactId + "." + it.version }
) )