gradle-plugin: Minor fixes in repo list generation

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileConfig.kt

@@ -58,7 +58,7 @@ open class KonanProgram(name: String, project: ProjectInternal, instantiator: In
         get() = "executable"
 
     override val defaultOutputDir: File
-        get() = project.konanBinOutputDir
+        get() = project.konanBinBaseDir
 }
 
 open class KonanLibrary(name: String, project: ProjectInternal, instantiator: Instantiator)
@@ -68,7 +68,7 @@ open class KonanLibrary(name: String, project: ProjectInternal, instantiator: In
         get() = "library"
 
     override val defaultOutputDir: File
-        get() = project.konanLibsOutputDir
+        get() = project.konanLibsBaseDir
 }
 
 open class KonanBitcode(name: String, project: ProjectInternal, instantiator: Instantiator)
@@ -86,5 +86,5 @@ open class KonanBitcode(name: String, project: ProjectInternal, instantiator: In
             "Generates bitcode for the artifact '${task.name}' for current host"
 
     override val defaultOutputDir: File
-        get() = project.konanBitcodeOutputDir
+        get() = project.konanBitcodeBaseDir
 }

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropLibrary.kt

@@ -21,7 +21,7 @@ open class KonanInteropLibrary(name: String, project: ProjectInternal, instantia
             "Build the Kotlin/Native interop library '${task.name}' for current host"
 
     override val defaultOutputDir: File
-        get() = project.konanLibsOutputDir
+        get() = project.konanLibsBaseDir
 
     // DSL
 

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanLibrariesSpec.kt

@@ -25,10 +25,12 @@ open class KonanLibrariesSpec(val task: KonanArtifactWithLibrariesTask, val proj
     @Internal val explicitRepos = mutableSetOf<File>()
 
     val repos: Set<File>
-        @Input get() = explicitRepos +
+        @Input get() = mutableSetOf<File>().apply {
-                task.outputDir +
+            addAll(explicitRepos)
-                task.project.konanLibsOutputDir +
+            add(task.outputDir) // TODO: Check if task is a library - create a Library interface
-                artifacts.flatMap { it.libraries.repos }.toSet()
+            add(task.project.konanLibsBaseDir.resolve(target.userName))
+            addAll(artifacts.flatMap { it.libraries.repos })
+        }
 
     val target: KonanTarget
         @Internal get() = task.target

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt

@@ -55,9 +55,9 @@ internal val Project.konanHome: String
     }
 
 internal val Project.konanBuildRoot          get() = buildDir.resolve("konan")
-internal val Project.konanBinOutputDir       get() = konanBuildRoot.resolve("bin")
+internal val Project.konanBinBaseDir         get() = konanBuildRoot.resolve("bin")
-internal val Project.konanLibsOutputDir      get() = konanBuildRoot.resolve("libs")
+internal val Project.konanLibsBaseDir        get() = konanBuildRoot.resolve("libs")
-internal val Project.konanBitcodeOutputDir   get() = konanBuildRoot.resolve("bitcode")
+internal val Project.konanBitcodeBaseDir     get() = konanBuildRoot.resolve("bitcode")
 
 internal val Project.konanDefaultSrcFiles         get() = fileTree("${projectDir.canonicalPath}/src/main/kotlin")
 internal fun Project.konanDefaultDefFile(libName: String)