From e92ac6cba310dda048980b20864503a82bc27b7d Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Wed, 18 Nov 2015 19:56:48 +0300
Subject: [PATCH] fix access to internal from tests for android projects which
 compiled via gradle

---
 .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index ae8f98c9247..3c20ec15e45 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -135,20 +135,27 @@ public open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments
         args.noParamAssertions = kotlinOptions.noParamAssertions
         args.moduleName = kotlinOptions.moduleName ?: extraProperties.getOrNull<String>("defaultModuleName")
 
-        if (this.name == "compileTestKotlin") {
-            getLogger().kotlinDebug("try to determine the output directory of corresponding compileKotlin task")
-            val tasks = project.getTasksByName("compileKotlin", false)
-            getLogger().kotlinDebug("tasks for compileKotlin: ${tasks}")
+        fun  addFriendPathForTestTask(taskName: String) {
+            logger.kotlinDebug("try to determine the output directory of corresponding $taskName task")
+            val tasks = project.getTasksByName("$taskName", false)
+            logger.kotlinDebug("tasks for $taskName: ${tasks}")
             if (tasks.size == 1) {
                 val task = tasks.firstOrNull() as? KotlinCompile
                 if (task != null) {
-                    getLogger().kotlinDebug("destinantion directory for production = ${task.destinationDir}")
+                    logger.kotlinDebug("destinantion directory for production = ${task.destinationDir}")
                     args.friendPaths = arrayOf(task.destinationDir.absolutePath)
                     args.moduleName = task.kotlinOptions.moduleName ?: task.extensions.extraProperties.getOrNull<String>("defaultModuleName")
                 }
             }
         }
 
+        if (this.name == "compileTestKotlin") {
+            addFriendPathForTestTask("compileKotlin")
+        }
+        if (this.name == "compileDebugUnitTestKotlin") {
+            addFriendPathForTestTask("compileDebugKotlin")
+        }
+
         getLogger().kotlinDebug("args.moduleName = ${args.moduleName}")
     }