From 33d5afd6c34fe9b02d6ae478cc36a4d9a03ea316 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 17 Mar 2016 01:36:55 +0400 Subject: [PATCH] Cleaner version computation. --- kobalt/src/Build.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 97febbef..ae64d104 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -169,13 +169,13 @@ val kobaltApp = project(kobaltPluginApi, wrapper) { } fun readVersion() : String { - val p = java.util.Properties() - var localFile = java.io.File("src/main/resources/kobalt.properties") - if (! localFile.exists()) { - localFile = File(homeDir("kotlin", "kobalt", "src/main/resources/kobalt.properties")) + val localFile = + listOf("src/main/resources/kobalt.properties", + homeDir("kotlin", "kobalt", "src/main/resources/kobalt.properties")).first { File(it).exists() } + with(java.util.Properties()) { + load(java.io.FileReader(localFile)) + return getProperty("kobalt.version") } - p.load(java.io.FileReader(localFile)) - return p.getProperty("kobalt.version") } @Task(name = "copyVersionForWrapper", runBefore = arrayOf("assemble"), runAfter = arrayOf("compile"), description = "")