From 5720356814d5d4deaec66aa911f57ae1583976af Mon Sep 17 00:00:00 2001 From: Dmitry Zhuravlev Date: Mon, 17 Apr 2017 12:30:12 +0300 Subject: [PATCH] + added cleanup for buildFileClasspath collection + added FIXME: newBuildFileClasspath called twice --- .../src/main/kotlin/com/beust/kobalt/BuildScript.kt | 1 + .../src/main/kotlin/com/beust/kobalt/api/Kobalt.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/BuildScript.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/BuildScript.kt index a6db65b3..4c35b9ed 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/BuildScript.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/BuildScript.kt @@ -116,6 +116,7 @@ fun buildFileClasspath(vararg deps: String) { } fun newBuildFileClasspath(vararg deps: String) { + //FIXME newBuildFileClasspath called twice deps.forEach { Kobalt.addBuildFileClasspath(it) } } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Kobalt.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Kobalt.kt index 048f5540..7d37a0b8 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Kobalt.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Kobalt.kt @@ -72,7 +72,6 @@ class Kobalt { fun addBuildFileClasspath(dep: String) { val dependencyManager = Kobalt.INJECTOR.getInstance(DependencyManager::class.java) - //FIXME buildFileClasspath collection never becomes clear! each synchronization will add the same dependencies to it buildFileClasspath.add(dependencyManager.create(dep)) } @@ -136,6 +135,7 @@ class Kobalt { fun cleanUp() { buildSourceDirs.clear() + buildFileClasspath.clear() } } }