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

[JS IR BE] Support JS IR in maven plugin

Browse Source
This commit is contained in:
Roman Artemev
2019-06-13 18:02:24 +03:00
committed by romanart
parent cc46657c99
commit 8015152bfc
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt
+1
View File
@@ -78,6 +78,7 @@ object LibraryUtils {
return manifestFound && irFound
}
@JvmStatic
fun isKotlinJavascriptIrLibrary(candidate: File): Boolean {
return when {
FileUtil.isJarOrZip(candidate) -> isZippedKlib(candidate)
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
+12 -2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.maven;
import com.intellij.openapi.util.text.StringUtil;
import kotlin.collections.CollectionsKt;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -94,6 +95,9 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase<K2JSCompilerArgument
@Parameter(defaultValue = "plain")
private String moduleKind;
@Parameter(defaultValue = "false")
private boolean useIrBackend;
@Override
protected void configureSpecificCompilerArguments(@NotNull K2JSCompilerArguments arguments, @NotNull List<File> sourceRoots) throws MojoExecutionException {
arguments.setOutputFile(outputFile);
@@ -101,6 +105,8 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase<K2JSCompilerArgument
arguments.setMetaInfo(metaInfo);
arguments.setModuleKind(moduleKind);
arguments.setMain(main);
arguments.setIrBackend(useIrBackend);
arguments.setIrLegacyGradlePluginCompatibility(true);
List<String> libraries;
try {
@@ -138,6 +144,10 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase<K2JSCompilerArgument
return project.getCompileClasspathElements();
}
private boolean checkIsKotlinJavascriptLibrary(File file) {
return useIrBackend ? LibraryUtils.isKotlinJavascriptIrLibrary(file) : LibraryUtils.isKotlinJavascriptLibrary(file);
}
/**
* Returns all Kotlin Javascript dependencies that this project has, including transitive ones.
*
@@ -150,7 +160,7 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase<K2JSCompilerArgument
for (String path : getClassPathElements()) {
File file = new File(path);
if (file.exists() && LibraryUtils.isKotlinJavascriptLibrary(file)) {
if (file.exists() && checkIsKotlinJavascriptLibrary(file)) {
libraries.add(file.getAbsolutePath());
}
else {
@@ -162,7 +172,7 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase<K2JSCompilerArgument
for (String path : paths) {
File file = new File(path);
if (file.exists() && LibraryUtils.isKotlinJavascriptLibrary(file)) {
if (file.exists() && checkIsKotlinJavascriptLibrary(file)) {
libraries.add(file.getAbsolutePath());
}
else {