From 446901283df97e96eb8ab00dcfe78ab5dab10024 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Wed, 1 Mar 2017 10:12:38 -0800 Subject: [PATCH] Better version parsing. --- .../src/main/kotlin/com/beust/kobalt/misc/KFiles.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt index ec239452..a396827a 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt @@ -37,9 +37,10 @@ class KFiles { // kobalt-wrapper.properties: kobalt.version=0.827 // When Kobalt can't find the newest jar file, it will instead use the classes produced by IDEA // in the directories specified here: - val previousVersion = "0." + (Kobalt.version.split(".")[1].toInt() - 1).toString() + val leftSuffix = Kobalt.version.substring(0, Kobalt.version.lastIndexOf(".") + 1) + val previousVersion = leftSuffix + (Kobalt.version.split(".")[1].toInt() - 1).toString() val previousJar = joinDir(distributionsDir, "kobalt-" + previousVersion, - "kobalt/wrapper/kobalt-" + previousVersion + ".jar") + "kobalt/wrapper/kobalt-$previousVersion.jar") val result = listOf("", "modules/kobalt-plugin-api", "modules/wrapper").map { File(homeDir(KFiles.joinDir("kotlin", "kobalt", it, "kobaltBuild", "classes"))) .absolutePath