From 25629e4cf71f16118742659d52e1df3b79af3471 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Wed, 8 Jun 2016 20:22:37 -0800 Subject: [PATCH] val --- .../src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt | 2 +- .../main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt index e1f9b3a9..b24b1fbb 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt @@ -152,7 +152,7 @@ class CompilerUtils @Inject constructor(val files: KFiles, * Copy the resources from a source directory to the build one */ private fun copyResources(project: Project, context: KobaltContext, sourceSet: SourceSet) { - var outputDir = sourceSet.outputDir + val outputDir = sourceSet.outputDir val variantSourceDirs = context.variant.resourceDirectories(project, sourceSet) if (variantSourceDirs.size > 0) { diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt index 94b2edc5..7dbde4c4 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt @@ -180,7 +180,7 @@ open class JvmCompilerPlugin @Inject constructor( // If this project has a kapt{} directive, we want to run the Java compiler first 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 -> val compilerResults = compilerUtils.invokeCompiler(project, context, compiler, sourceDirectories(project, context), isTest)