From 35e2a46ae00e6c8f6fc4db40a301c7dbad669c95 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 23 Dec 2014 18:26:12 +0300 Subject: [PATCH] Minor in Gradle plugin: don't copy kotlin.js --- .../kotlin/gradle/plugin/KotlinPlugin.kt | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index b51312a46c8..f4123b0c10c 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -159,13 +159,6 @@ class Kotlin2JsSourceSetProcessor( private fun kotlinTaskDestinationDir(): File? = kotlinTask.kotlinDestinationDir private fun kotlinJsDestinationDir(): File? = kotlinTask.outputFile()?.let { File(it).directory } - private fun copyKotlinJsTaskOutput(): String? = if (kotlinJsDestinationDir() == null) { - null - } else { - val copyTask = project.getTasks().getByName(copyKotlinJsTaskName) as Copy - "${copyTask.getDestinationDir()}/kotlin.js" - } - private fun kotlinSourcePathsForSourceMap() = sourceSet.getAllSource() .map { it.path } .filter { it.endsWith(".kt") } @@ -178,27 +171,9 @@ class Kotlin2JsSourceSetProcessor( build?.dependsOn(kotlinTaskName) clean?.dependsOn("clean" + kotlinTaskName.capitalize()) - createCopyKotlinJsTask(GradleUtils(scriptHandler, project).resolveJsLibrary().getAbsolutePath()) createCleanSourceMapTask() } - private fun createCopyKotlinJsTask(jsLibraryJar: String) { - val copyKotlinJsTaskName = sourceSet.getTaskName("copy", "kotlinJs") - - val copyKotlinJsTask = project.getTasks().create(copyKotlinJsTaskName, javaClass()) - copyKotlinJsTask.from(project.zipTree(jsLibraryJar)) - copyKotlinJsTask.into(MethodClosure(this, "kotlinJsDestinationDir")) - copyKotlinJsTask.include("kotlin.js") - copyKotlinJsTask.onlyIf { kotlinJsDestinationDir() != null } - build?.dependsOn(copyKotlinJsTaskName) - - val cleanTaskName = "clean" + copyKotlinJsTaskName.capitalize() - val cleanTask = project.getTasks().create(cleanTaskName, javaClass()) - cleanTask.delete(MethodClosure(this, "copyKotlinJsTaskOutput")) - copyKotlinJsTask.onlyIf { copyKotlinJsTaskOutput() != null } - clean?.dependsOn(cleanTaskName) - } - private fun createCleanSourceMapTask() { val taskName = sourceSet.getTaskName("clean", "sourceMap") val task = project.getTasks().create(taskName, javaClass())