diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt index 87673668..4a77fe02 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt @@ -225,7 +225,7 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, : List { val transitive = hashSetOf() with(project) { - val scopeFilters = arrayListOf(Scope.COMPILE) + val scopeFilters : ArrayList = arrayListOf(Scope.COMPILE) context.variant.let { variant -> val deps = arrayListOf(compileDependencies, compileProvidedDependencies, variant.buildType.compileDependencies, diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/AetherDependency.kt similarity index 79% rename from modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt rename to modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/AetherDependency.kt index fda58cdf..d6826c78 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/AetherDependency.kt @@ -2,7 +2,6 @@ package com.beust.kobalt.maven.aether import com.beust.kobalt.api.IClasspathDependency import com.beust.kobalt.api.Kobalt -import com.beust.kobalt.api.Project import com.beust.kobalt.maven.CompletedFuture import com.beust.kobalt.maven.LocalDep import com.beust.kobalt.maven.LocalRepo @@ -10,25 +9,9 @@ import com.beust.kobalt.maven.MavenId import com.beust.kobalt.misc.Versions import com.beust.kobalt.misc.warn import org.eclipse.aether.artifact.Artifact -import org.eclipse.aether.util.artifact.JavaScopes import java.io.File import java.util.concurrent.Future -enum class Scope(val scope: String, val dependencyLambda: (Project) -> List) { - COMPILE(JavaScopes.COMPILE, Project::compileDependencies), - PROVIDED(JavaScopes.PROVIDED, Project::compileProvidedDependencies), - SYSTEM(JavaScopes.SYSTEM, { project -> emptyList() }), - RUNTIME(JavaScopes.RUNTIME, Project::compileRuntimeDependencies), - TEST(JavaScopes.TEST, Project::testDependencies) - ; - - companion object { - fun toScopes(isTest: Boolean) = if (isTest) listOf(Scope.TEST, Scope.COMPILE) else listOf(Scope.COMPILE) - } -} - -class DependencyResult(val dependency: IClasspathDependency, val repoUrl: String) - class AetherDependency(val artifact: Artifact, override val optional: Boolean = false) : IClasspathDependency, Comparable { val aether: KobaltMavenResolver get() = Kobalt.INJECTOR.getInstance(KobaltMavenResolver::class.java) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/DependencyResult.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/DependencyResult.kt new file mode 100644 index 00000000..bcf1e097 --- /dev/null +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/DependencyResult.kt @@ -0,0 +1,5 @@ +package com.beust.kobalt.maven.aether + +import com.beust.kobalt.api.IClasspathDependency + +class DependencyResult(val dependency: IClasspathDependency, val repoUrl: String) \ No newline at end of file diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Scope.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Scope.kt new file mode 100644 index 00000000..6c18f555 --- /dev/null +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Scope.kt @@ -0,0 +1,18 @@ +package com.beust.kobalt.maven.aether + +import com.beust.kobalt.api.IClasspathDependency +import com.beust.kobalt.api.Project +import org.eclipse.aether.util.artifact.JavaScopes + +sealed class Scope(val scope: String, val dependencyLambda: (Project) -> List) { + + companion object { + fun toScopes(isTest: Boolean) = if (isTest) listOf(TEST, COMPILE) else listOf(COMPILE) + } + + object COMPILE : Scope(JavaScopes.COMPILE, Project::compileDependencies) + object PROVIDED : Scope(JavaScopes.PROVIDED, Project::compileProvidedDependencies) + object SYSTEM : Scope(JavaScopes.SYSTEM, { project -> emptyList() }) + object RUNTIME : Scope(JavaScopes.RUNTIME, Project::compileRuntimeDependencies) + object TEST : Scope(JavaScopes.TEST, Project::testDependencies) +} \ No newline at end of file