azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gradle plugin: ignore non kotlin-js libraries in dependencies.

Browse Source
This commit is contained in:
Zalim Bashorov
2014-12-23 18:21:42 +03:00
parent eac0e99e65
commit 1e4100afd5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+8 -1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.jet.cli.common.CLICompiler import org.jetbrains.jet.cli.common.CLICompiler
import com.intellij.ide.highlighter.JavaFileType import com.intellij.ide.highlighter.JavaFileType
import org.jetbrains.jet.plugin.JetFileType import org.jetbrains.jet.plugin.JetFileType
import org.jetbrains.jet.utils.LibraryUtils
abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractCompile() { abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractCompile() {
@@ -203,7 +204,13 @@ public open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArgumen
args.outputFile = outputFile() args.outputFile = outputFile()
args.outputPrefix = kotlinOptions.outputPrefix args.outputPrefix = kotlinOptions.outputPrefix
args.outputPostfix = kotlinOptions.outputPostfix args.outputPostfix = kotlinOptions.outputPostfix
args.libraryFiles = (kotlinOptions.libraryFiles + getProject().getConfigurations().getByName("compile").map{ it.canonicalPath }).copyToArray()
val kotlinJsLibsFromDependencies =
getProject().getConfigurations().getByName("compile")
.filter { LibraryUtils.isKotlinJavascriptLibrary(it) }
.map { it.getAbsolutePath() }
args.libraryFiles = (kotlinOptions.libraryFiles + kotlinJsLibsFromDependencies).copyToArray()
args.target = kotlinOptions.target args.target = kotlinOptions.target
args.sourceMap = kotlinOptions.sourceMap args.sourceMap = kotlinOptions.sourceMap