erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 16:28:12 -07:00
Code Releases Activity

Reformat.

Browse source
This commit is contained in:
Cedric Beust 2016-02-02 02:57:49 +04:00
parent f39c3ce514
commit 5027a92087
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
View file

@ -238,10 +238,8 @@ abstract class JvmCompilerPlugin @Inject constructor(
CompilerActionInfo { CompilerActionInfo {
copyResources(project, JvmCompilerPlugin.SOURCE_SET_MAIN) copyResources(project, JvmCompilerPlugin.SOURCE_SET_MAIN)
val fullClasspath = if (isTest) val fullClasspath = if (isTest) dependencyManager.testDependencies(project, context)
dependencyManager.testDependencies(project, context) else dependencyManager.dependencies(project, context)
else
dependencyManager.dependencies(project, context)
// Remove all the excluded dependencies from the classpath // Remove all the excluded dependencies from the classpath
val classpath = fullClasspath.filter { val classpath = fullClasspath.filter {
@ -257,11 +255,11 @@ abstract class JvmCompilerPlugin @Inject constructor(
// Source directories from the contributors // Source directories from the contributors
initialSourceDirectories.addAll( initialSourceDirectories.addAll(
if (isTest) { if (isTest) {
context.pluginInfo.testSourceDirContributors.flatMap { it.testSourceDirectoriesFor(project, context) } context.pluginInfo.testSourceDirContributors.flatMap { it.testSourceDirectoriesFor(project, context) }
} else { } else {
context.pluginInfo.sourceDirContributors.flatMap { it.sourceDirectoriesFor(project, context) } context.pluginInfo.sourceDirContributors.flatMap { it.sourceDirectoriesFor(project, context) }
}) })
// Transform them with the interceptors, if any // Transform them with the interceptors, if any
val sourceDirectories = if (isTest) { val sourceDirectories = if (isTest) {