From c3c3b0863a4d44b22a37602d327421a4cf860f32 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Tue, 25 Apr 2017 10:59:40 -0700 Subject: [PATCH] Kotlin 1.1.2. --- kobalt/src/Build.kt | 2 +- .../src/main/kotlin/com/beust/kobalt/Constants.kt | 2 +- src/main/kotlin/com/beust/kobalt/app/BuildFiles.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 99ee7f52..e76ec18f 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -32,7 +32,7 @@ object Versions { val maven = "3.3.9" val mavenResolver = "1.0.3" val slf4j = "1.7.3" - val kotlin = "1.1.1" + val kotlin = "1.1.2" val aether = "1.0.2.v20150114" val testng = "6.11" diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt index 979c2ffe..e7a6c3dd 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt @@ -9,7 +9,7 @@ object Constants { val BUILD_FILE_NAME = "Build.kt" val BUILD_FILE_DIRECTORY = "kobalt/src" val BUILD_FILE_PATH = KFiles.joinDir(BUILD_FILE_DIRECTORY, BUILD_FILE_NAME) - val KOTLIN_COMPILER_VERSION = "1.1.1" + val KOTLIN_COMPILER_VERSION = "1.1.2" internal val DEFAULT_REPOS = listOf( // "https://maven-central.storage.googleapis.com/", diff --git a/src/main/kotlin/com/beust/kobalt/app/BuildFiles.kt b/src/main/kotlin/com/beust/kobalt/app/BuildFiles.kt index 98d8815a..b630f253 100644 --- a/src/main/kotlin/com/beust/kobalt/app/BuildFiles.kt +++ b/src/main/kotlin/com/beust/kobalt/app/BuildFiles.kt @@ -119,7 +119,7 @@ class BuildFiles @Inject constructor(val factory: BuildFileCompiler.IFactory, parentFile.mkdirs() val imp = arrayListOf().apply { addAll(imports) - }.distinct() + }.toMutableSet().toMutableList() Collections.sort(imp) writeText(imp.joinToString("\n")) appendText(code.joinToString("\n"))