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

Warnings.

Browse source
This commit is contained in:
Cedric Beust 2015-11-07 15:06:20 -08:00
parent ef6fd3f2a2
commit cb0acdd352
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ abstract class JvmCompilerPlugin @Inject constructor(
with(project) { with(project) {
arrayListOf(compileDependencies, compileProvidedDependencies, testDependencies, arrayListOf(compileDependencies, compileProvidedDependencies, testDependencies,
testProvidedDependencies).forEach { testProvidedDependencies).forEach {
result.addAll(jvmCompiler.calculateDependencies(project, context!!, it)) result.addAll(jvmCompiler.calculateDependencies(project, context, it))
} }
} }
return dependencyManager.reorderDependencies(result) return dependencyManager.reorderDependencies(result)

24
src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
View file

@ -47,7 +47,7 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
public fun runTargets(targets: List<String>, projects: List<Project>) : Int { public fun runTargets(targets: List<String>, projects: List<Project>) : Int {
var result = 0 var result = 0
projects.forEach { project -> projects.forEach { project ->
val projectName = project.name!! val projectName = project.name
val tasksByNames = hashMapOf<String, PluginTask>() val tasksByNames = hashMapOf<String, PluginTask>()
plugins.allTasks.filter { plugins.allTasks.filter {
it.project.name == project.name it.project.name == project.name
@ -62,7 +62,7 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
val ti = TaskInfo(target) val ti = TaskInfo(target)
if (ti.matches(projectName)) { if (ti.matches(projectName)) {
val task = tasksByNames.get(ti.task) val task = tasksByNames[ti.task]
if (task != null && task.plugin.accept(project)) { if (task != null && task.plugin.accept(project)) {
val reverseAfter = hashMapOf<String, String>() val reverseAfter = hashMapOf<String, String>()
alwaysRunAfter.keys().forEach { from -> alwaysRunAfter.keys().forEach { from ->
@ -80,7 +80,7 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
TaskInfo(projectName, it.name).id == target TaskInfo(projectName, it.name).id == target
} }
if (currentFreeTask.size == 1) { if (currentFreeTask.size == 1) {
currentFreeTask.get(0).let { currentFreeTask[0].let {
graph.addNode(it) graph.addNode(it)
} }
} }
@ -92,7 +92,7 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
transitiveClosure.forEach { pluginTask -> transitiveClosure.forEach { pluginTask ->
val rb = runBefore.get(pluginTask.name) val rb = runBefore.get(pluginTask.name)
rb.forEach { rb.forEach {
val to = tasksByNames.get(it) val to = tasksByNames[it]
if (to != null) { if (to != null) {
graph.addEdge(pluginTask, to) graph.addEdge(pluginTask, to)
} else { } else {
@ -109,7 +109,7 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
allNodes.forEach { node -> allNodes.forEach { node ->
val other = alwaysRunAfter.get(node.name) val other = alwaysRunAfter.get(node.name)
other?.forEach { o -> other?.forEach { o ->
tasksByNames.get(o)?.let { tasksByNames[o]?.let {
graph.addEdge(it, node) graph.addEdge(it, node)
} }
} }
@ -151,7 +151,7 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
val freeTaskMap = hashMapOf<String, PluginTask>() val freeTaskMap = hashMapOf<String, PluginTask>()
tasksByNames.keys.forEach { tasksByNames.keys.forEach {
if (! runBefore.containsKey(it) && ! reverseAfter.containsKey(it)) { if (! runBefore.containsKey(it) && ! reverseAfter.containsKey(it)) {
freeTaskMap.put(it, tasksByNames.get(it)!!) freeTaskMap.put(it, tasksByNames[it]!!)
} }
} }
@ -173,9 +173,9 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
log(3, "toProcess size: " + toProcess.size) log(3, "toProcess size: " + toProcess.size)
toProcess.forEach { target -> toProcess.forEach { target ->
val currentTask = TaskInfo(project.name!!, target.task) val currentTask = TaskInfo(project.name, target.task)
transitiveClosure.add(tasksByNames.get(currentTask.task)!!) transitiveClosure.add(tasksByNames[currentTask.task]!!)
val thisTask = tasksByNames.get(target.task) val thisTask = tasksByNames[target.task]
if (thisTask == null) { if (thisTask == null) {
throw KobaltException("Unknown task: $target") throw KobaltException("Unknown task: $target")
} else { } else {
@ -188,7 +188,7 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
} }
runBefore.get(thisTask.name).forEach { runBefore.get(thisTask.name).forEach {
newToProcess.add(TaskInfo(project.name!!, it)) newToProcess.add(TaskInfo(project.name, it))
} }
} }
} }
@ -208,7 +208,7 @@ class TaskWorker(val tasks: List<PluginTask>, val dryRun: Boolean) : IWorker<Plu
override fun call() : TaskResult2<PluginTask> { override fun call() : TaskResult2<PluginTask> {
if (tasks.size > 0) { if (tasks.size > 0) {
tasks.get(0).let { tasks[0].let {
log(1, "========== ${it.project.name}:${it.name}") log(1, "========== ${it.project.name}:${it.name}")
} }
} }
@ -217,7 +217,7 @@ class TaskWorker(val tasks: List<PluginTask>, val dryRun: Boolean) : IWorker<Plu
val tr = if (dryRun) TaskResult() else it.call() val tr = if (dryRun) TaskResult() else it.call()
success = success and tr.success success = success and tr.success
} }
return TaskResult2(success, tasks.get(0)) return TaskResult2(success, tasks[0])
} }
// override val timeOut : Long = 10000 // override val timeOut : Long = 10000