From 922602f01af823459ddd51cf2d958df426deb870 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Thu, 7 Jul 2016 02:42:28 -0800
Subject: [PATCH] Refactor.

---
 .../beust/kobalt/maven/DependencyManager.kt   | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt
index 76bbda32..8a1209a8 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt
@@ -194,18 +194,20 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
             : List<IClasspathDependency> {
         val transitive = hashSetOf<IClasspathDependency>()
         with(project) {
-            val deps = arrayListOf(compileDependencies, compileProvidedDependencies,
-                    context.variant.buildType.compileDependencies,
-                    context.variant.buildType.compileProvidedDependencies,
-                    context.variant.productFlavor.compileDependencies,
-                    context.variant.productFlavor.compileProvidedDependencies
-            )
-            if (isTest) {
-                deps.add(testDependencies)
-                deps.add(testProvidedDependencies)
-            }
-            deps.filter { it.any() }.forEach {
-                transitive.addAll(calculateDependencies(project, context, it))
+            context.variant.let { variant ->
+                val deps = arrayListOf(compileDependencies, compileProvidedDependencies,
+                        variant.buildType.compileDependencies,
+                        variant.buildType.compileProvidedDependencies,
+                        variant.productFlavor.compileDependencies,
+                        variant.productFlavor.compileProvidedDependencies
+                )
+                if (isTest) {
+                    deps.add(testDependencies)
+                    deps.add(testProvidedDependencies)
+                }
+                deps.filter { it.any() }.forEach {
+                    transitive.addAll(calculateDependencies(project, context, it))
+                }
             }
         }