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

JS: rename "-library-files" argument to "-libraries" and change separator

Browse Source 
Use the system separator (':' or ';') instead of commas

 #KT-16083 Fixed
This commit is contained in:
Alexander Udalov
2017-01-30 18:54:24 +03:00
parent fd24031a69
commit 464820458e
30 changed files with 68 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+1 -4
View File
@@ -325,10 +325,7 @@ open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArguments>(),
.filter { LibraryUtils.isKotlinJavascriptLibrary(it) }
.map { it.canonicalPath }
args.libraryFiles = when (friendDependency) {
null -> dependencies.toTypedArray()
else -> (dependencies + friendDependency).toTypedArray()
}
args.libraries = (dependencies + friendDependency.orEmpty()).joinToString(File.pathSeparator)
kotlinOptionsImpl.updateArguments(args)
return args
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
+3 -3
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.maven;
import com.intellij.util.ArrayUtil;
import com.intellij.openapi.util.text.StringUtil;
import kotlin.text.StringsKt;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugin.MojoExecutionException;
@@ -97,8 +97,8 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase<K2JSCompilerArgument
} catch (DependencyResolutionRequiredException e) {
throw new MojoExecutionException("Unresolved dependencies", e);
}
getLog().debug("libraryFiles: " + libraries);
arguments.libraryFiles = ArrayUtil.toStringArray(libraries);
getLog().debug("libraries: " + libraries);
arguments.libraries = StringUtil.join(libraries, File.pathSeparator);
arguments.sourceMap = sourceMap;