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

Clean up ProjectInfo.

Browse source
This commit is contained in:
Cedric Beust 2016-02-04 21:58:06 +04:00
parent 638d16588e
commit ff23b223cc
8 changed files with 26 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt
View file

@ -55,9 +55,6 @@ public class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val b
// Find all the projects in the build file, possibly compiling them
//
val allProjects = findProjects(context)
allProjects.forEach {
it.projectExtra = Project.ProjectExtra(it)
}
plugins.applyPlugins(context, allProjects)
return allProjects

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

@ -31,7 +31,7 @@ class WarGenerator @Inject constructor(val dependencyManager: DependencyManager)
// The transitive closure of libraries goes into WEB-INF/libs.
// Copy them all in kobaltBuild/war/WEB-INF/libs and create one IncludedFile out of that directory
//
val dependentProjects = listOf(ProjectDescription(project, project.projectInfo.dependsOn))
val dependentProjects = listOf(ProjectDescription(project, project.projectExtra.dependsOn))
val allDependencies = dependencyManager.calculateDependencies(project, context, dependentProjects,
project.compileDependencies)