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

val

Browse source
This commit is contained in:
Cedric Beust 2016-06-08 20:22:37 -08:00
parent ef7c3cd92c
commit 25629e4cf7
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -152,7 +152,7 @@ class CompilerUtils @Inject constructor(val files: KFiles,
* Copy the resources from a source directory to the build one * Copy the resources from a source directory to the build one
*/ */
private fun copyResources(project: Project, context: KobaltContext, sourceSet: SourceSet) { private fun copyResources(project: Project, context: KobaltContext, sourceSet: SourceSet) {
var outputDir = sourceSet.outputDir val outputDir = sourceSet.outputDir
val variantSourceDirs = context.variant.resourceDirectories(project, sourceSet) val variantSourceDirs = context.variant.resourceDirectories(project, sourceSet)
if (variantSourceDirs.size > 0) { if (variantSourceDirs.size > 0) {

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

@ -180,7 +180,7 @@ open class JvmCompilerPlugin @Inject constructor(
// If this project has a kapt{} directive, we want to run the Java compiler first // If this project has a kapt{} directive, we want to run the Java compiler first
val hasKapt = project.projectProperties.get("kaptConfig") != null val hasKapt = project.projectProperties.get("kaptConfig") != null
var finalAllCompilers = if (hasKapt) swapJavaAndKotlin(allCompilers) else allCompilers val finalAllCompilers = if (hasKapt) swapJavaAndKotlin(allCompilers) else allCompilers
finalAllCompilers.forEach { compiler -> finalAllCompilers.forEach { compiler ->
val compilerResults = compilerUtils.invokeCompiler(project, context, compiler, val compilerResults = compilerUtils.invokeCompiler(project, context, compiler,
sourceDirectories(project, context), isTest) sourceDirectories(project, context), isTest)