From bfa2fb072e585d98ac11b4abe67875223da23334 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Fri, 31 Mar 2017 09:19:37 -0700 Subject: [PATCH] =?UTF-8?q?Fix:=20the=20sources=20don=E2=80=99t=20get=20do?= =?UTF-8?q?wnloaded=20if=20the=20jar=20file=20is=20present.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beust/kobalt/maven/aether/AetherDependency.kt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/AetherDependency.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/AetherDependency.kt index f7de93a2..8fc960dc 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/AetherDependency.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/AetherDependency.kt @@ -4,9 +4,6 @@ import com.beust.kobalt.api.Dependencies import com.beust.kobalt.api.IClasspathDependency import com.beust.kobalt.api.Kobalt import com.beust.kobalt.maven.CompletedFuture -import com.beust.kobalt.maven.LocalDep -import com.beust.kobalt.maven.LocalRepo -import com.beust.kobalt.maven.MavenId import com.beust.kobalt.misc.StringVersion import com.beust.kobalt.misc.warn import org.eclipse.aether.artifact.Artifact @@ -26,18 +23,13 @@ class AetherDependency(val artifact: Artifact, override val optional: Boolean = private fun toId(a: Artifact) = a.toString() override val jarFile: Future - get() = if (artifact.file != null) { - CompletedFuture(artifact.file) - } else { - val localRepo = Kobalt.INJECTOR.getInstance(LocalRepo::class.java) - val file = File(LocalDep(MavenId.create(id), localRepo).toAbsoluteJarFilePath(version)) - if (file.exists()) { - CompletedFuture(file) + get() = + if (artifact.file != null) { + CompletedFuture(artifact.file) } else { val td = aether.resolve(artifact, null) CompletedFuture(td.root.artifact.file) } - } override fun toMavenDependencies(scope: String?) : org.apache.maven.model.Dependency { val passedScope = scope