From 7af789d282f143d4a7605ea091bb17ca347ff07a Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sat, 28 Nov 2015 11:06:26 -0800 Subject: [PATCH] Move IClasspathDependency in its own package. --- .../kotlin/com/beust/kobalt/BuildScript.kt | 2 +- src/main/kotlin/com/beust/kobalt/Plugins.kt | 2 +- .../com/beust/kobalt/ResolveDependency.kt | 2 + .../beust/kobalt/api/IClasspathContributor.kt | 2 +- .../beust/kobalt/api/IRunnerContributor.kt | 2 +- .../kotlin/com/beust/kobalt/api/Project.kt | 4 +- .../beust/kobalt/internal/GenericRunner.kt | 2 +- .../com/beust/kobalt/internal/JUnitRunner.kt | 2 +- .../com/beust/kobalt/internal/JvmCompiler.kt | 2 +- .../com/beust/kobalt/internal/TestNgRunner.kt | 2 +- .../internal/remote/GetDependenciesCommand.kt | 4 +- .../com/beust/kobalt/maven/DepFactory.kt | 3 ++ .../beust/kobalt/maven/DependencyManager.kt | 2 + .../kotlin/com/beust/kobalt/maven/Kurl.kt | 1 + .../kobalt/maven/dependency/FileDependency.kt | 39 ++++++++++++++++ .../{ => dependency}/IClasspathDependency.kt | 46 ++++--------------- .../maven/{ => dependency}/MavenDependency.kt | 8 ++-- .../com/beust/kobalt/misc/CheckVersions.kt | 2 +- .../kobalt/plugin/android/AndroidPlugin.kt | 4 +- .../plugin/application/ApplicationPlugin.kt | 2 +- .../kobalt/plugin/kotlin/KotlinCompiler.kt | 6 +-- .../kobalt/plugin/kotlin/KotlinPlugin.kt | 3 ++ .../plugin/packaging/PackagingPlugin.kt | 2 +- .../com/beust/kobalt/maven/RemoteRepoTest.kt | 1 + 24 files changed, 85 insertions(+), 60 deletions(-) create mode 100644 src/main/kotlin/com/beust/kobalt/maven/dependency/FileDependency.kt rename src/main/kotlin/com/beust/kobalt/maven/{ => dependency}/IClasspathDependency.kt (62%) rename src/main/kotlin/com/beust/kobalt/maven/{ => dependency}/MavenDependency.kt (94%) diff --git a/src/main/kotlin/com/beust/kobalt/BuildScript.kt b/src/main/kotlin/com/beust/kobalt/BuildScript.kt index 95c14a02..eddcc32c 100644 --- a/src/main/kotlin/com/beust/kobalt/BuildScript.kt +++ b/src/main/kotlin/com/beust/kobalt/BuildScript.kt @@ -4,7 +4,7 @@ import com.beust.kobalt.api.Kobalt import com.beust.kobalt.api.Project import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.maven.DepFactory -import com.beust.kobalt.maven.IClasspathDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.SystemProperties import java.io.File diff --git a/src/main/kotlin/com/beust/kobalt/Plugins.kt b/src/main/kotlin/com/beust/kobalt/Plugins.kt index fdfe11e4..aa7bd3c0 100644 --- a/src/main/kotlin/com/beust/kobalt/Plugins.kt +++ b/src/main/kotlin/com/beust/kobalt/Plugins.kt @@ -5,7 +5,7 @@ import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.internal.TaskManager import com.beust.kobalt.maven.DepFactory -import com.beust.kobalt.maven.IClasspathDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KobaltExecutors diff --git a/src/main/kotlin/com/beust/kobalt/ResolveDependency.kt b/src/main/kotlin/com/beust/kobalt/ResolveDependency.kt index d04ee5db..379ed2c7 100644 --- a/src/main/kotlin/com/beust/kobalt/ResolveDependency.kt +++ b/src/main/kotlin/com/beust/kobalt/ResolveDependency.kt @@ -1,6 +1,8 @@ package com.beust.kobalt import com.beust.kobalt.maven.* +import com.beust.kobalt.maven.dependency.IClasspathDependency +import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.misc.Node import com.beust.kobalt.misc.log import com.google.inject.Inject diff --git a/src/main/kotlin/com/beust/kobalt/api/IClasspathContributor.kt b/src/main/kotlin/com/beust/kobalt/api/IClasspathContributor.kt index 6b3cfcba..01632a32 100644 --- a/src/main/kotlin/com/beust/kobalt/api/IClasspathContributor.kt +++ b/src/main/kotlin/com/beust/kobalt/api/IClasspathContributor.kt @@ -1,6 +1,6 @@ package com.beust.kobalt.api -import com.beust.kobalt.maven.IClasspathDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency /** * Plugins that export classpath entries need to implement this interface. diff --git a/src/main/kotlin/com/beust/kobalt/api/IRunnerContributor.kt b/src/main/kotlin/com/beust/kobalt/api/IRunnerContributor.kt index 24b6e153..bafdefa3 100644 --- a/src/main/kotlin/com/beust/kobalt/api/IRunnerContributor.kt +++ b/src/main/kotlin/com/beust/kobalt/api/IRunnerContributor.kt @@ -1,7 +1,7 @@ package com.beust.kobalt.api import com.beust.kobalt.TaskResult -import com.beust.kobalt.maven.IClasspathDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency /** * Plugins that can run a project (task "run" or "test") should implement this interface. diff --git a/src/main/kotlin/com/beust/kobalt/api/Project.kt b/src/main/kotlin/com/beust/kobalt/api/Project.kt index ad8824a7..62f01897 100644 --- a/src/main/kotlin/com/beust/kobalt/api/Project.kt +++ b/src/main/kotlin/com/beust/kobalt/api/Project.kt @@ -3,8 +3,8 @@ package com.beust.kobalt.api import com.beust.kobalt.Plugins import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.internal.IProjectInfo -import com.beust.kobalt.maven.IClasspathDependency -import com.beust.kobalt.maven.MavenDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency +import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.misc.KFiles import com.beust.kobalt.plugin.android.AndroidPlugin import com.beust.kobalt.plugin.android.Proguard diff --git a/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt index 46c30284..30bcd33a 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt @@ -6,7 +6,7 @@ import com.beust.kobalt.TaskResult import com.beust.kobalt.api.IRunnerContributor import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project -import com.beust.kobalt.maven.IClasspathDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.log import java.io.File diff --git a/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt index 3c249a81..1f824ef0 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt @@ -3,7 +3,7 @@ package com.beust.kobalt.internal import com.beust.kobalt.api.IRunnerContributor import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project -import com.beust.kobalt.maven.IClasspathDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency public class JUnitRunner() : GenericTestRunner() { diff --git a/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt b/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt index 5cdc804e..60ba0787 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt @@ -5,7 +5,7 @@ import com.beust.kobalt.TaskResult import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project import com.beust.kobalt.maven.DependencyManager -import com.beust.kobalt.maven.IClasspathDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency import com.google.inject.Inject import java.io.File import java.util.* diff --git a/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt index 639f4164..5368d8e4 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt @@ -3,7 +3,7 @@ package com.beust.kobalt.internal import com.beust.kobalt.api.IRunnerContributor import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project -import com.beust.kobalt.maven.IClasspathDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.misc.KFiles import java.io.File diff --git a/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt b/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt index 2396cbaf..1d074a98 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt @@ -6,8 +6,8 @@ import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.internal.build.BuildFile import com.beust.kobalt.internal.build.BuildFileCompiler import com.beust.kobalt.maven.DependencyManager -import com.beust.kobalt.maven.IClasspathDependency -import com.beust.kobalt.maven.MavenDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency +import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.log import com.google.gson.Gson diff --git a/src/main/kotlin/com/beust/kobalt/maven/DepFactory.kt b/src/main/kotlin/com/beust/kobalt/maven/DepFactory.kt index 11553317..5ba9a8d7 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/DepFactory.kt +++ b/src/main/kotlin/com/beust/kobalt/maven/DepFactory.kt @@ -1,6 +1,9 @@ package com.beust.kobalt.maven import com.beust.kobalt.KobaltException +import com.beust.kobalt.maven.dependency.FileDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency +import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.misc.KobaltExecutors import java.util.concurrent.ExecutorService import javax.inject.Inject diff --git a/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt b/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt index e2db13fd..4235ead4 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt +++ b/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt @@ -4,6 +4,8 @@ import com.beust.kobalt.api.IClasspathContributor import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project import com.beust.kobalt.api.ProjectDescription +import com.beust.kobalt.maven.dependency.FileDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.warn diff --git a/src/main/kotlin/com/beust/kobalt/maven/Kurl.kt b/src/main/kotlin/com/beust/kobalt/maven/Kurl.kt index 56c9d134..656d25a8 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/Kurl.kt +++ b/src/main/kotlin/com/beust/kobalt/maven/Kurl.kt @@ -1,5 +1,6 @@ package com.beust.kobalt.maven +import com.beust.kobalt.maven.dependency.IClasspathDependency import com.google.inject.assistedinject.Assisted import java.io.* import java.net.HttpURLConnection diff --git a/src/main/kotlin/com/beust/kobalt/maven/dependency/FileDependency.kt b/src/main/kotlin/com/beust/kobalt/maven/dependency/FileDependency.kt new file mode 100644 index 00000000..a37c4f02 --- /dev/null +++ b/src/main/kotlin/com/beust/kobalt/maven/dependency/FileDependency.kt @@ -0,0 +1,39 @@ +package com.beust.kobalt.maven.dependency + +import com.beust.kobalt.maven.CompletedFuture +import org.apache.maven.model.Dependency +import java.io.File + +open public class FileDependency(open val fileName: String) : IClasspathDependency, Comparable { + override val id = IClasspathDependency.PREFIX_FILE + fileName + + override val jarFile = CompletedFuture(File(fileName)) + + override fun toMavenDependencies(): Dependency { + with(Dependency()) { + systemPath = jarFile.get().absolutePath + return this + } + } + + override val shortId = fileName + + override fun directDependencies() = arrayListOf() + + override fun compareTo(other: FileDependency) = fileName.compareTo(other.fileName) + + override fun toString() = fileName + + override fun equals(other: Any?): Boolean{ + if (this === other) return true + if (other?.javaClass != javaClass) return false + + other as FileDependency + + if (id != other.id) return false + + return true + } + + override fun hashCode() = id.hashCode() +} diff --git a/src/main/kotlin/com/beust/kobalt/maven/IClasspathDependency.kt b/src/main/kotlin/com/beust/kobalt/maven/dependency/IClasspathDependency.kt similarity index 62% rename from src/main/kotlin/com/beust/kobalt/maven/IClasspathDependency.kt rename to src/main/kotlin/com/beust/kobalt/maven/dependency/IClasspathDependency.kt index 48d44d7a..b0795871 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/IClasspathDependency.kt +++ b/src/main/kotlin/com/beust/kobalt/maven/dependency/IClasspathDependency.kt @@ -1,11 +1,17 @@ -package com.beust.kobalt.maven +package com.beust.kobalt.maven.dependency +import org.apache.maven.model.Dependency import java.io.File import java.util.* import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ExecutorService import java.util.concurrent.Future +/** + * Encapsulate a dependency that can be put on the classpath. This interface + * has two subclasses: FileDependency (a physical file) and MavenDependency, + * which represents a dependency living in a Maven repo. + */ interface IClasspathDependency { companion object { val PREFIX_FILE: String = "file://" @@ -18,7 +24,7 @@ interface IClasspathDependency { val jarFile: Future /** Convert to a Maven model tag */ - fun toMavenDependencies() : org.apache.maven.model.Dependency + fun toMavenDependencies() : Dependency /** The list of dependencies for this element (not the transitive closure */ fun directDependencies(): List @@ -53,38 +59,4 @@ interface IClasspathDependency { } return result } -} - -open public class FileDependency(open val fileName: String) : IClasspathDependency, Comparable { - override val id = IClasspathDependency.PREFIX_FILE + fileName - - override val jarFile = CompletedFuture(File(fileName)) - - override fun toMavenDependencies(): org.apache.maven.model.Dependency { - with(org.apache.maven.model.Dependency()) { - systemPath = jarFile.get().absolutePath - return this - } - } - - override val shortId = fileName - - override fun directDependencies() = arrayListOf() - - override fun compareTo(other: FileDependency) = fileName.compareTo(other.fileName) - - override fun toString() = fileName - - override fun equals(other: Any?): Boolean{ - if (this === other) return true - if (other?.javaClass != javaClass) return false - - other as FileDependency - - if (id != other.id) return false - - return true - } - - override fun hashCode() = id.hashCode() -} +} \ No newline at end of file diff --git a/src/main/kotlin/com/beust/kobalt/maven/MavenDependency.kt b/src/main/kotlin/com/beust/kobalt/maven/dependency/MavenDependency.kt similarity index 94% rename from src/main/kotlin/com/beust/kobalt/maven/MavenDependency.kt rename to src/main/kotlin/com/beust/kobalt/maven/dependency/MavenDependency.kt index 44ce048f..086f07ca 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/MavenDependency.kt +++ b/src/main/kotlin/com/beust/kobalt/maven/dependency/MavenDependency.kt @@ -1,11 +1,13 @@ -package com.beust.kobalt.maven +package com.beust.kobalt.maven.dependency import com.beust.kobalt.KobaltException import com.beust.kobalt.api.Kobalt +import com.beust.kobalt.maven.* import com.beust.kobalt.misc.DependencyExecutor import com.beust.kobalt.misc.Versions import com.beust.kobalt.misc.warn import com.google.inject.Key +import org.apache.maven.model.Dependency import java.io.File import java.util.concurrent.ExecutorService import java.util.concurrent.Future @@ -59,8 +61,8 @@ public class MavenDependency @Inject constructor(mavenId: MavenId, override val id = mavenId.toId - override fun toMavenDependencies(): org.apache.maven.model.Dependency { - return org.apache.maven.model.Dependency().apply { + override fun toMavenDependencies(): Dependency { + return Dependency().apply { setGroupId(groupId) setArtifactId(artifactId) setVersion(version) diff --git a/src/main/kotlin/com/beust/kobalt/misc/CheckVersions.kt b/src/main/kotlin/com/beust/kobalt/misc/CheckVersions.kt index afa5f79a..034bf176 100644 --- a/src/main/kotlin/com/beust/kobalt/misc/CheckVersions.kt +++ b/src/main/kotlin/com/beust/kobalt/misc/CheckVersions.kt @@ -2,7 +2,7 @@ package com.beust.kobalt.misc import com.beust.kobalt.api.Project import com.beust.kobalt.maven.DepFactory -import com.beust.kobalt.maven.MavenDependency +import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.maven.MavenId import javax.inject.Inject diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt index 2fb7c3cc..32186e8c 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt @@ -5,9 +5,9 @@ import com.beust.kobalt.api.* import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.internal.CompilerActionInfo -import com.beust.kobalt.maven.FileDependency -import com.beust.kobalt.maven.IClasspathDependency import com.beust.kobalt.maven.MavenId +import com.beust.kobalt.maven.dependency.FileDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.RunCommand import com.beust.kobalt.misc.log diff --git a/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt index 0700e105..e1eac71b 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt @@ -6,7 +6,7 @@ import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.internal.JvmCompilerPlugin import com.beust.kobalt.maven.DependencyManager -import com.beust.kobalt.maven.IClasspathDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.RunCommand import com.beust.kobalt.misc.warn diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt index fa703e12..ebbe58dc 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt @@ -8,8 +8,8 @@ import com.beust.kobalt.internal.CompilerActionInfo import com.beust.kobalt.internal.ICompilerAction import com.beust.kobalt.internal.JvmCompiler import com.beust.kobalt.maven.DepFactory -import com.beust.kobalt.maven.FileDependency -import com.beust.kobalt.maven.IClasspathDependency +import com.beust.kobalt.maven.dependency.FileDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KobaltExecutors @@ -127,7 +127,7 @@ class KotlinCompiler @Inject constructor(val localRepo : LocalRepo, // getKotlinCompilerJar("kotlin-compiler-embeddable")) // .map { FileDependency(it) } - val dependencies = compileDependencies + otherClasspath.map { FileDependency(it)} + val dependencies = compileDependencies + otherClasspath.map { FileDependency(it) } val info = CompilerActionInfo(project?.directory, dependencies, sourceFiles, outputDir, args) return jvmCompiler.doCompile(project, context, compilerAction, info) } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt index fa967508..276003f1 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt @@ -11,6 +11,9 @@ import com.beust.kobalt.internal.CompilerActionInfo import com.beust.kobalt.internal.JvmCompiler import com.beust.kobalt.internal.JvmCompilerPlugin import com.beust.kobalt.maven.* +import com.beust.kobalt.maven.dependency.FileDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency +import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.warn diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt index 114e61e4..e554eb44 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt @@ -11,7 +11,7 @@ import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.glob import com.beust.kobalt.internal.JvmCompilerPlugin import com.beust.kobalt.maven.DependencyManager -import com.beust.kobalt.maven.IClasspathDependency +import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KobaltExecutors diff --git a/src/test/kotlin/com/beust/kobalt/maven/RemoteRepoTest.kt b/src/test/kotlin/com/beust/kobalt/maven/RemoteRepoTest.kt index 6d5e4efb..72948d08 100644 --- a/src/test/kotlin/com/beust/kobalt/maven/RemoteRepoTest.kt +++ b/src/test/kotlin/com/beust/kobalt/maven/RemoteRepoTest.kt @@ -2,6 +2,7 @@ package com.beust.kobalt.maven import com.beust.kobalt.Args import com.beust.kobalt.TestModule +import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.misc.DependencyExecutor import com.beust.kobalt.misc.MainModule import com.google.inject.Guice