Simplify friend paths configuration

libraries/tools/kotlin-gradle-plugin/src/agp25/kotlin/org/jetbrains/kotlin/gradle/plugin/android/Android25ProjectHandler.kt

@@ -56,9 +56,6 @@ class Android25ProjectHandler(kotlinConfigurationTools: KotlinConfigurationTools
             kotlinClasspath + project.files(AndroidGradleWrapper.getRuntimeJars(androidPlugin, androidExt))
         }
 
-        kotlinTask.javaOutputDir = javaTask.destinationDir
-        kotlinAfterJavaTask?.javaOutputDir = javaTask.destinationDir
-
         // Use kapt1 annotations file for up-to-date check since annotation processing is done with javac
         kotlinTask.kaptOptions.annotationsFile?.let { javaTask.inputs.file(it) }
 
@@ -72,10 +69,11 @@ class Android25ProjectHandler(kotlinConfigurationTools: KotlinConfigurationTools
         }
 
         // Find the classpath entries that comes from the tested variant and register it as the friend path, lazily
-        kotlinTask.friendClasspathEntries = lazy {
+        kotlinTask.friendPaths = lazy {
             variantData.getCompileClasspathArtifacts(preJavaClasspathKey)
                     .filter { it.id.componentIdentifier is TestedComponentIdentifier }
                     .map { it.file.absolutePath }
+                    .toTypedArray()
         }
     }
 

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt

@@ -112,14 +112,16 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractCo
     // TODO: consider more reliable approach (see usage)
     internal var anyClassesCompiled: Boolean = false
     internal var friendTaskName: String? = null
+    internal var javaOutputDir: File? = null
     internal var sourceSetName: String by Delegates.notNull()
     internal val moduleName: String
             get() = "${project.name}_$sourceSetName"
 
-    var javaOutputDir: File? = null
+    @Suppress("UNCHECKED_CAST")
+    protected val friendTask: AbstractKotlinCompile<T>?
+            get() = friendTaskName?.let { project.tasks.findByName(it) } as? AbstractKotlinCompile<T>
 
-    // In case the way to retrieve friend classpath entries is known at configuration time, it will be set
+    var friendPaths: Lazy<Array<String>?> = lazy { friendTask?.javaOutputDir?.absolutePath?.let { arrayOf(it) } }
-    var friendClasspathEntries: Lazy<List<String>?> = lazyOf(null)
 
     override fun compile() {
         assert(false, { "unexpected call to compile()" })
@@ -206,7 +208,6 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), Kotl
         val kaptPluginOptions = getKaptPluginOptions()
         args.pluginOptions = (pluginOptions.arguments + kaptPluginOptions.arguments).toTypedArray()
 
-        args.moduleName = moduleName
         args.addCompilerBuiltIns = true
 
         val gradleVersion = getGradleVersion()
@@ -214,7 +215,11 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), Kotl
             args.loadBuiltInsFromDependencies = true
         }
 
-        friendTaskName?.let { addFriendPathForTestTask(it, args) }
+        args.moduleName = friendTask?.moduleName ?: moduleName
+        logger.kotlinDebug { "args.moduleName = ${args.moduleName}" }
+
+        args.friendPaths = friendPaths.value
+        logger.kotlinDebug { "args.friendPaths = ${args.friendPaths?.joinToString() ?: "[]"}" }
 
         if (defaultsOnly) return
 
@@ -226,15 +231,6 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), Kotl
         logger.kotlinDebug { "$name destinationDir = $destinationDir" }
     }
 
-    internal fun addFriendPathForTestTask(friendKotlinTaskName: String, args: K2JVMCompilerArguments) {
-        val friendTask = project.getTasksByName(friendKotlinTaskName, /* recursive = */false).firstOrNull() as? KotlinCompile ?: return
-        args.friendPaths = arrayOf(
-                friendTask.javaOutputDir!!.absolutePath,
-                *friendClasspathEntries.value.orEmpty().toTypedArray())
-        args.moduleName = friendTask.moduleName
-        logger.kotlinDebug("java destination directory for production = ${friendTask.javaOutputDir}")
-    }
-
     override fun getSourceRoots() = SourceRoots.ForJvm.create(getSource(), sourceRootsContainer)
 
     override fun callCompiler(args: K2JVMCompilerArguments, sourceRoots: SourceRoots, changedFiles: ChangedFiles) {