From 43003cffbbceaebb4cb61225731d6ea215cf00a7 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 21 Jan 2017 00:22:02 +0300 Subject: [PATCH] Make kotlin-runtime dependency optional for kotlin script executor for maven, but still add if it's found. --- .../kotlin/maven/ExecuteKotlinScriptMojo.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java index ee5391ae4fa..2100e5d9c1e 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java @@ -270,21 +270,25 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo { Artifact stdlibDep = null; Artifact runtimeDep = null; + ArrayList files = new ArrayList(2); + for (Artifact dep: project.getArtifacts()) { if (dep.getArtifactId().equals("kotlin-stdlib")) { + files.add(getArtifactFile(dep)); stdlibDep = dep; } if (dep.getArtifactId().equals("kotlin-runtime")) { + files.add(getArtifactFile(dep)); runtimeDep = dep; } if (stdlibDep != null && runtimeDep != null) break; } - if (stdlibDep == null || runtimeDep == null) { - throw new MojoExecutionException("Unable to find kotlin-stdlib and kotlin-runtime artifacts among project dependencies"); + if (stdlibDep == null) { + throw new MojoExecutionException("Unable to find kotlin-stdlib artifacts among project dependencies"); } - return Arrays.asList(getArtifactFile(stdlibDep), getArtifactFile(runtimeDep)); + return files; } private void initCompiler() {