From 8015152bfcb08db460a5a84e5b0f9045bccfa72d Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Thu, 13 Jun 2019 18:02:24 +0300 Subject: [PATCH] [JS IR BE] Support JS IR in maven plugin --- .../src/org/jetbrains/kotlin/utils/LibraryUtils.kt | 1 + .../jetbrains/kotlin/maven/K2JSCompilerMojo.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt index 1b4b183bcd6..2216f7f9cab 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt @@ -78,6 +78,7 @@ object LibraryUtils { return manifestFound && irFound } + @JvmStatic fun isKotlinJavascriptIrLibrary(candidate: File): Boolean { return when { FileUtil.isJarOrZip(candidate) -> isZippedKlib(candidate) diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java index cc4106e5ed7..5ccbd7d7bb3 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java @@ -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 sourceRoots) throws MojoExecutionException { arguments.setOutputFile(outputFile); @@ -101,6 +105,8 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase libraries; try { @@ -138,6 +144,10 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase