diff --git a/tools/gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt b/tools/gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt index e7259c49e20..ae649170900 100644 --- a/tools/gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt +++ b/tools/gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt @@ -99,8 +99,8 @@ open class KonanCompilerConfig( } fun useInterop(interopConfig: KonanInteropConfig) { - var generateStubsTask = interopConfig.generateStubsTask - var compileStubsTask = interopConfig.compileStubsTask + val generateStubsTask = interopConfig.generateStubsTask + val compileStubsTask = interopConfig.compileStubsTask compilationTask.dependsOn(compileStubsTask) compilationTask.dependsOn(generateStubsTask) diff --git a/tools/gradle-plugin/src/main/kotlin/KonanInteropConfig.kt b/tools/gradle-plugin/src/main/kotlin/KonanInteropConfig.kt index 7cfeac29671..3901ace49e0 100644 --- a/tools/gradle-plugin/src/main/kotlin/KonanInteropConfig.kt +++ b/tools/gradle-plugin/src/main/kotlin/KonanInteropConfig.kt @@ -59,7 +59,7 @@ open class KonanInteropConfig( // Config and task to compile *.kt stubs in a *.bc library internal val compileStubsConfig = KonanCompilerConfig("${name}InteropStubs", project, "compile").apply { compilationTask.dependsOn(generateStubsTask) - outputDir(generateStubsTask.stubsDir.absolutePath) + outputDir("${project.konanInteropCompiledStubsDir}/$name") noLink() inputFiles(project.fileTree(generateStubsTask.stubsDir).apply { builtBy(generateStubsTask) }) } diff --git a/tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt b/tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt index 8dcf6b921bb..84fccc87d3a 100644 --- a/tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt +++ b/tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt @@ -38,10 +38,11 @@ internal val Project.konanHome: String return extensions.extraProperties.get(KonanPlugin.KONAN_HOME_PROPERTY_NAME).toString() } -internal val Project.konanBuildRoot get() = "${buildDir.canonicalPath}/konan" -internal val Project.konanCompilerOutputDir get() = "${konanBuildRoot}/bin" -internal val Project.konanInteropStubsOutputDir get() = "${konanBuildRoot}/interopStubs" -internal val Project.konanInteropLibsOutputDir get() = "${konanBuildRoot}/nativelibs" +internal val Project.konanBuildRoot get() = "${buildDir.canonicalPath}/konan" +internal val Project.konanCompilerOutputDir get() = "${konanBuildRoot}/bin" +internal val Project.konanInteropStubsOutputDir get() = "${konanBuildRoot}/interopStubs" +internal val Project.konanInteropCompiledStubsDir get() = "${konanBuildRoot}/interopCompiledStubs" +internal val Project.konanInteropLibsOutputDir get() = "${konanBuildRoot}/nativelibs" internal val Project.konanArtifactsContainer: KonanArtifactsContainer get() = extensions.getByName(KonanPlugin.COMPILER_EXTENSION_NAME) as KonanArtifactsContainer