erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 08:38:13 -07:00
Code Releases Activity

Move IClasspathDependency into the API.

Browse source
This commit is contained in:
Cedric Beust 2015-11-29 09:59:05 -08:00
parent 569eaf9fa8
commit 651b9c02ba
25 changed files with 58 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/com/beust/kobalt/BuildScript.kt
View file

@ -4,7 +4,7 @@ import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.maven.DepFactory import com.beust.kobalt.maven.DepFactory
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.SystemProperties import com.beust.kobalt.SystemProperties
import java.io.File import java.io.File

2
src/main/kotlin/com/beust/kobalt/Main.kt
View file

@ -12,7 +12,7 @@ import com.beust.kobalt.internal.remote.KobaltServer
import com.beust.kobalt.maven.DepFactory import com.beust.kobalt.maven.DepFactory
import com.beust.kobalt.maven.Http import com.beust.kobalt.maven.Http
import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.maven.LocalRepo
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.misc.* import com.beust.kobalt.misc.*
import com.google.inject.Guice import com.google.inject.Guice
import java.io.File import java.io.File

2
src/main/kotlin/com/beust/kobalt/Plugins.kt
View file

@ -5,7 +5,7 @@ import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.internal.PluginInfo
import com.beust.kobalt.internal.TaskManager import com.beust.kobalt.internal.TaskManager
import com.beust.kobalt.maven.DepFactory import com.beust.kobalt.maven.DepFactory
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.maven.LocalRepo
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors

2
src/main/kotlin/com/beust/kobalt/ResolveDependency.kt
View file

@ -1,7 +1,7 @@
package com.beust.kobalt package com.beust.kobalt
import com.beust.kobalt.maven.* import com.beust.kobalt.maven.*
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.maven.dependency.MavenDependency
import com.beust.kobalt.misc.Node import com.beust.kobalt.misc.Node
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log

2
src/main/kotlin/com/beust/kobalt/api/IClasspathContributor.kt
View file

@ -1,6 +1,6 @@
package com.beust.kobalt.api package com.beust.kobalt.api
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
/** /**
* Plugins that export classpath entries need to implement this interface. * Plugins that export classpath entries need to implement this interface.

31
src/main/kotlin/com/beust/kobalt/api/IClasspathDependency.kt Normal file
View file

@ -0,0 +1,31 @@
package com.beust.kobalt.api
import org.apache.maven.model.Dependency
import java.io.File
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://"
}
/** Identifier for this dependency */
val id: String
/** Absolute path to the jar file on the local file system */
val jarFile: Future<File>
/** Convert to a Maven <dependency> model tag */
fun toMavenDependencies() : Dependency
/** The list of dependencies for this element (not the transitive closure */
fun directDependencies(): List<IClasspathDependency>
/** Used to only keep the most recent version for an artifact if no version was specified */
val shortId: String
}

2
src/main/kotlin/com/beust/kobalt/api/IClasspathInterceptor.kt
View file

@ -1,6 +1,6 @@
package com.beust.kobalt.api package com.beust.kobalt.api
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
/** /**
* Modify a list of dependencies before Kobalt starts using them. * Modify a list of dependencies before Kobalt starts using them.

2
src/main/kotlin/com/beust/kobalt/api/ICompilerContributor.kt
View file

@ -1,7 +1,7 @@
package com.beust.kobalt.api package com.beust.kobalt.api
import com.beust.kobalt.TaskResult import com.beust.kobalt.TaskResult
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import java.io.File import java.io.File
interface ICompilerContributor : IAffinity { interface ICompilerContributor : IAffinity {

2
src/main/kotlin/com/beust/kobalt/api/IRunnerContributor.kt
View file

@ -1,7 +1,7 @@
package com.beust.kobalt.api package com.beust.kobalt.api
import com.beust.kobalt.TaskResult import com.beust.kobalt.TaskResult
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
/** /**
* Plugins that can run a project (task "run" or "test") should implement this interface. * Plugins that can run a project (task "run" or "test") should implement this interface.

2
src/main/kotlin/com/beust/kobalt/api/Project.kt
View file

@ -3,7 +3,7 @@ package com.beust.kobalt.api
import com.beust.kobalt.Plugins import com.beust.kobalt.Plugins
import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.internal.IProjectInfo import com.beust.kobalt.internal.IProjectInfo
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.maven.dependency.MavenDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.plugin.android.AndroidPlugin import com.beust.kobalt.plugin.android.AndroidPlugin

2
src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
View file

@ -6,7 +6,7 @@ import com.beust.kobalt.TaskResult
import com.beust.kobalt.api.IRunnerContributor import com.beust.kobalt.api.IRunnerContributor
import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import java.io.File import java.io.File

2
src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt
View file

@ -3,7 +3,7 @@ package com.beust.kobalt.internal
import com.beust.kobalt.api.IAffinity import com.beust.kobalt.api.IAffinity
import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
public class JUnitRunner() : GenericTestRunner() { public class JUnitRunner() : GenericTestRunner() {

2
src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt
View file

@ -3,7 +3,7 @@ package com.beust.kobalt.internal
import com.beust.kobalt.api.IAffinity import com.beust.kobalt.api.IAffinity
import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import java.io.File import java.io.File

2
src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt
View file

@ -6,7 +6,7 @@ import com.beust.kobalt.internal.PluginInfo
import com.beust.kobalt.internal.build.BuildFile import com.beust.kobalt.internal.build.BuildFile
import com.beust.kobalt.internal.build.BuildFileCompiler import com.beust.kobalt.internal.build.BuildFileCompiler
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.maven.dependency.MavenDependency
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log

2
src/main/kotlin/com/beust/kobalt/maven/DepFactory.kt
View file

@ -2,7 +2,7 @@ package com.beust.kobalt.maven
import com.beust.kobalt.KobaltException import com.beust.kobalt.KobaltException
import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.maven.dependency.FileDependency
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.maven.dependency.MavenDependency
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import java.util.concurrent.ExecutorService import java.util.concurrent.ExecutorService

8
src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt
View file

@ -1,11 +1,7 @@
package com.beust.kobalt.maven package com.beust.kobalt.maven
import com.beust.kobalt.api.IClasspathContributor import com.beust.kobalt.api.*
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.FileDependency
import com.beust.kobalt.maven.dependency.IClasspathDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.warn import com.beust.kobalt.misc.warn
@ -53,7 +49,7 @@ public class DependencyManager @Inject constructor(val executors: KobaltExecutor
result.add(projectDependency) result.add(projectDependency)
projectDependency.id.let { projectDependency.id.let {
result.add(depFactory.create(it, executor)) result.add(depFactory.create(it, executor))
val downloaded = projectDependency.transitiveDependencies(executor) val downloaded = transitiveClosure(projectDependency.directDependencies())
result.addAll(downloaded) result.addAll(downloaded)
} }

2
src/main/kotlin/com/beust/kobalt/maven/Kurl.kt
View file

@ -1,6 +1,6 @@
package com.beust.kobalt.maven package com.beust.kobalt.maven
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.google.inject.assistedinject.Assisted import com.google.inject.assistedinject.Assisted
import java.io.* import java.io.*
import java.net.HttpURLConnection import java.net.HttpURLConnection

1
src/main/kotlin/com/beust/kobalt/maven/dependency/FileDependency.kt
View file

@ -1,5 +1,6 @@
package com.beust.kobalt.maven.dependency package com.beust.kobalt.maven.dependency
import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.maven.CompletedFuture import com.beust.kobalt.maven.CompletedFuture
import org.apache.maven.model.Dependency import org.apache.maven.model.Dependency
import java.io.File import java.io.File

62
src/main/kotlin/com/beust/kobalt/maven/dependency/IClasspathDependency.kt
View file

@ -1,62 +0,0 @@
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://"
}
/** Identifier for this dependency */
val id: String
/** Absolute path to the jar file on the local file system */
val jarFile: Future<File>
/** Convert to a Maven <dependency> model tag */
fun toMavenDependencies() : Dependency
/** The list of dependencies for this element (not the transitive closure */
fun directDependencies(): List<IClasspathDependency>
/** Used to only keep the most recent version for an artifact if no version was specified */
val shortId: String
fun transitiveDependencies(executor: ExecutorService) : List<IClasspathDependency> {
/**
* All the dependencies we have already downloaded.
*/
val seen = ConcurrentHashMap<String, String>()
val thisDep = MavenDependency.create(id, executor)
var result = ArrayList<IClasspathDependency>(transitiveDependencies(thisDep, seen, executor))
result.add(thisDep)
return result
}
private fun transitiveDependencies(dep: IClasspathDependency, seen: ConcurrentHashMap<String, String>,
executor: ExecutorService) : List<IClasspathDependency> {
val result = arrayListOf<IClasspathDependency>()
seen.put(dep.id, dep.id)
dep.directDependencies().filter {
! seen.containsKey(it.id)
}.forEach {
seen.put(it.id, it.id)
val thisDep = MavenDependency.create(it.id, executor)
result.add(thisDep)
result.addAll(transitiveDependencies(thisDep, seen, executor))
}
return result
}
}

1
src/main/kotlin/com/beust/kobalt/maven/dependency/MavenDependency.kt
View file

@ -1,6 +1,7 @@
package com.beust.kobalt.maven.dependency package com.beust.kobalt.maven.dependency
import com.beust.kobalt.KobaltException import com.beust.kobalt.KobaltException
import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.api.Kobalt import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.maven.* import com.beust.kobalt.maven.*
import com.beust.kobalt.misc.DependencyExecutor import com.beust.kobalt.misc.DependencyExecutor

2
src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt
View file

@ -6,7 +6,7 @@ import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.maven.MavenId import com.beust.kobalt.maven.MavenId
import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.maven.dependency.FileDependency
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.maven.dependency.MavenDependency import com.beust.kobalt.maven.dependency.MavenDependency
import com.beust.kobalt.misc.* import com.beust.kobalt.misc.*
import com.beust.kobalt.plugin.java.JavaCompiler import com.beust.kobalt.plugin.java.JavaCompiler

1
src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt
View file

@ -7,7 +7,6 @@ import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.internal.ActorUtils import com.beust.kobalt.internal.ActorUtils
import com.beust.kobalt.internal.JvmCompilerPlugin import com.beust.kobalt.internal.JvmCompilerPlugin
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.dependency.IClasspathDependency
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.RunCommand import com.beust.kobalt.misc.RunCommand
import com.beust.kobalt.misc.warn import com.beust.kobalt.misc.warn

14
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
View file

@ -1,16 +1,13 @@
package com.beust.kobalt.plugin.kotlin; package com.beust.kobalt.plugin.kotlin;
import com.beust.kobalt.TaskResult import com.beust.kobalt.TaskResult
import com.beust.kobalt.api.CompilerActionInfo import com.beust.kobalt.api.*
import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project
import com.beust.kobalt.internal.ICompilerAction import com.beust.kobalt.internal.ICompilerAction
import com.beust.kobalt.internal.JvmCompiler import com.beust.kobalt.internal.JvmCompiler
import com.beust.kobalt.maven.DepFactory import com.beust.kobalt.maven.DepFactory
import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.dependency.IClasspathDependency
import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.maven.LocalRepo
import com.beust.kobalt.maven.dependency.FileDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
@ -29,7 +26,8 @@ import kotlin.properties.Delegates
*/ */
@Singleton @Singleton
class KotlinCompiler @Inject constructor(val localRepo : LocalRepo, class KotlinCompiler @Inject constructor(val localRepo : LocalRepo,
val files: com.beust.kobalt.misc.KFiles, val files: KFiles,
val dependencyManager: DependencyManager,
val depFactory: DepFactory, val depFactory: DepFactory,
val executors: KobaltExecutors, val executors: KobaltExecutors,
val jvmCompiler: JvmCompiler) { val jvmCompiler: JvmCompiler) {
@ -115,7 +113,7 @@ class KotlinCompiler @Inject constructor(val localRepo : LocalRepo,
val executor = executors.newExecutor("KotlinCompiler", 10) val executor = executors.newExecutor("KotlinCompiler", 10)
val compilerDep = depFactory.create("org.jetbrains.kotlin:kotlin-compiler-embeddable:$KOTLIN_VERSION", executor) val compilerDep = depFactory.create("org.jetbrains.kotlin:kotlin-compiler-embeddable:$KOTLIN_VERSION", executor)
val deps = compilerDep.transitiveDependencies(executor) val deps = dependencyManager.transitiveClosure(listOf(compilerDep))
// Force a download of the compiler dependencies // Force a download of the compiler dependencies
deps.forEach { it.jarFile.get() } deps.forEach { it.jarFile.get() }

1
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
View file

@ -10,7 +10,6 @@ import com.beust.kobalt.maven.DepFactory
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.maven.LocalRepo
import com.beust.kobalt.maven.dependency.FileDependency 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.maven.dependency.MavenDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors

2
src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
View file

@ -11,7 +11,7 @@ import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.glob import com.beust.kobalt.glob
import com.beust.kobalt.internal.JvmCompilerPlugin import com.beust.kobalt.internal.JvmCompilerPlugin
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.dependency.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.maven.LocalRepo
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors