From be8456e6d53430a486fa3c88c59772f86026d981 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Wed, 18 Oct 2017 17:18:13 +0300 Subject: [PATCH] gradle-plugin: Minor fixes in repo list generation --- .../kotlin/gradle/plugin/KonanCompileConfig.kt | 6 +++--- .../kotlin/gradle/plugin/KonanInteropLibrary.kt | 2 +- .../kotlin/gradle/plugin/KonanLibrariesSpec.kt | 10 ++++++---- .../org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt | 6 +++--- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileConfig.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileConfig.kt index efa4f8353b1..2264c01d4c7 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileConfig.kt +++ b/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 } \ No newline at end of file diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropLibrary.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropLibrary.kt index 3e050320283..2488da9d15d 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropLibrary.kt +++ b/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 diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanLibrariesSpec.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanLibrariesSpec.kt index 6825c7fed4f..80f714e7626 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanLibrariesSpec.kt +++ b/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() val repos: Set - @Input get() = explicitRepos + - task.outputDir + - task.project.konanLibsOutputDir + - artifacts.flatMap { it.libraries.repos }.toSet() + @Input get() = mutableSetOf().apply { + addAll(explicitRepos) + add(task.outputDir) // TODO: Check if task is a library - create a Library interface + add(task.project.konanLibsBaseDir.resolve(target.userName)) + addAll(artifacts.flatMap { it.libraries.repos }) + } val target: KonanTarget @Internal get() = task.target diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt index 22081697108..e258e1be5da 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt +++ b/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.konanLibsOutputDir get() = konanBuildRoot.resolve("libs") -internal val Project.konanBitcodeOutputDir get() = konanBuildRoot.resolve("bitcode") +internal val Project.konanBinBaseDir get() = konanBuildRoot.resolve("bin") +internal val Project.konanLibsBaseDir get() = konanBuildRoot.resolve("libs") +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)