From 68a7d8867383ea1ec8d84d7b40bfb88dea0ba8b3 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Thu, 13 Oct 2016 13:44:59 +0300
Subject: [PATCH] Refactoring: reorder IncrementalJvmCompilerRunner constructor
 parameters

---
 .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt     | 13 +++++++------
 .../incremental/IncrementalJvmCompilerRunner.kt    | 14 +++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 7f746b63aed..a73baa8fec4 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -184,14 +184,15 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), Kotl
         val messageCollector = GradleMessageCollector(logger)
         val compiler = IncrementalJvmCompilerRunner(
                 taskBuildDirectory,
-                kaptAnnotationsFileUpdater,
-                artifactDifferenceRegistryProvider,
-                sourceAnnotationsRegistry,
                 getJavaSourceRoots(),
-                kapt2GeneratedSourcesDir,
-                artifactFile,
                 cacheVersions,
-                reporter)
+                reporter,
+                kaptAnnotationsFileUpdater,
+                sourceAnnotationsRegistry,
+                kapt2GeneratedSourcesDir,
+                artifactDifferenceRegistryProvider,
+                artifactFile
+        )
         args.classpathAsList = classpath.toList()
         args.destinationAsFile = destinationDir
         compiler.compile(allKotlinSources, changedFiles, args, messageCollector)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
index 3dce2278f7e..c04c9238bae 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
@@ -42,14 +42,14 @@ import java.util.*
 
 internal class IncrementalJvmCompilerRunner(
         workingDir: File,
-        private var kaptAnnotationsFileUpdater: AnnotationFileUpdater?,
-        private val artifactDifferenceRegistryProvider: ArtifactDifferenceRegistryProvider?,
-        private val sourceAnnotationsRegistry: SourceAnnotationsRegistry?,
         private val javaSourceRoots: Set<File>,
-        private val kapt2GeneratedSourcesDir: File,
-        private val artifactFile: File?,
         private val cacheVersions: List<CacheVersion>,
-        private val reporter: IncReporter
+        private val reporter: IncReporter,
+        private var kaptAnnotationsFileUpdater: AnnotationFileUpdater? = null,
+        private val sourceAnnotationsRegistry: SourceAnnotationsRegistry? = null,
+        private val kapt2GeneratedSourcesDir: File? = null,
+        private val artifactDifferenceRegistryProvider: ArtifactDifferenceRegistryProvider? = null,
+        private val artifactFile: File? = null
 ) {
     var anyClassesCompiled: Boolean = false
             private set
@@ -273,7 +273,7 @@ internal class IncrementalJvmCompilerRunner(
 
             caches.lookupCache.update(lookupTracker, sourcesToCompile, removedKotlinSources)
 
-            val generatedJavaFiles = kapt2GeneratedSourcesDir.walk().filter { it.isJavaFile() }.toList()
+            val generatedJavaFiles = (kapt2GeneratedSourcesDir?.walk() ?: emptySequence<File>()).filter(File::isJavaFile).toList()
             val generatedJavaFilesDiff = caches.incrementalCache.compareAndUpdateFileSnapshots(generatedJavaFiles)
 
             if (compilationMode is CompilationMode.Rebuild) {