From 814eb5739665459610f1533c1140da75ee1f325a Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Thu, 2 Jun 2016 21:29:51 -0800
Subject: [PATCH] Refactor.

---
 .../main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt | 7 ++++---
 .../kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt  | 4 ++--
 2 files changed, 6 insertions(+), 5 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 8d9b9294..c078c996 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
@@ -15,9 +15,10 @@ import java.util.*
 class CompilerUtils @Inject constructor(val files: KFiles,
         val dependencyManager: DependencyManager) {
 
+    class CompilerResult(val successResults: List<TaskResult>, val failedResult: TaskResult?)
+
     fun invokeCompiler(project: Project, context: KobaltContext, compiler: ICompiler,
-            sourceDirectories: List<File>, isTest: Boolean):
-            Pair<List<TaskResult>, TaskResult?> {
+            sourceDirectories: List<File>, isTest: Boolean): CompilerResult {
         val results = arrayListOf<TaskResult>()
         var failedResult: TaskResult? = null
         val contributedSourceDirs =
@@ -42,7 +43,7 @@ class CompilerUtils @Inject constructor(val files: KFiles,
             log(2, "Compiler $compiler not running on ${project.name} since no source files were found")
         }
 
-        return Pair(results, failedResult)
+        return CompilerResult(results, failedResult)
     }
 
     /**
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 3e52c46e..0e7bc9be 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
@@ -164,8 +164,8 @@ open class JvmCompilerPlugin @Inject constructor(
             allCompilers.forEach { compiler ->
                 val compilerResults = compilerUtils.invokeCompiler(project, context, compiler,
                         sourceDirectories(project, context), isTest)
-                results.addAll(compilerResults.first)
-                if (failedResult == null) failedResult = compilerResults.second
+                results.addAll(compilerResults.successResults)
+                if (failedResult == null) failedResult = compilerResults.failedResult
             }
             return if (failedResult != null) failedResult!!
                 else if (results.size > 0) results[0]