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

Kotlin script execution for maven: include kotlin-runtime as explicit dependency for script.

Browse Source 
Relates to #KT-11839
This commit is contained in:
Ilya Gorbunov
2016-08-12 23:00:56 +03:00
parent fbd6edce92
commit 0f8bf310f2
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java
+19 -11
View File
@@ -58,6 +58,7 @@ import java.io.IOException;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
@@ -215,7 +216,7 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo {
private List<File> getDependenciesForScript() throws MojoExecutionException { private List<File> getDependenciesForScript() throws MojoExecutionException {
List<File> deps = new ArrayList<File>(); List<File> deps = new ArrayList<File>();
deps.add(getKotlinStdlibDependency()); deps.addAll(getKotlinRuntimeDependencies());
deps.add(getThisPluginAsDependency()); deps.add(getThisPluginAsDependency());
deps.addAll(getThisPluginDependencies()); deps.addAll(getThisPluginDependencies());
@@ -226,13 +227,16 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo {
private File getDependencyFile(ComponentDependency dep) { private File getDependencyFile(ComponentDependency dep) {
ArtifactHandler artifactHandler = artifactHandlerManager.getArtifactHandler(dep.getType()); ArtifactHandler artifactHandler = artifactHandlerManager.getArtifactHandler(dep.getType());
Artifact artifact = new DefaultArtifact(dep.getGroupId(), dep.getArtifactId(), dep.getVersion(), null, dep.getType(), null, artifactHandler); Artifact artifact = new DefaultArtifact(dep.getGroupId(), dep.getArtifactId(), dep.getVersion(), null, dep.getType(), null, artifactHandler);
localRepository.find(artifact); return getArtifactFile(artifact);
return artifact.getFile();
} }
private File getDependencyFile(Dependency dep) { private File getDependencyFile(Dependency dep) {
ArtifactHandler artifactHandler = artifactHandlerManager.getArtifactHandler(dep.getType()); ArtifactHandler artifactHandler = artifactHandlerManager.getArtifactHandler(dep.getType());
Artifact artifact = new DefaultArtifact(dep.getGroupId(), dep.getArtifactId(), dep.getVersion(), null, dep.getType(), null, artifactHandler); Artifact artifact = new DefaultArtifact(dep.getGroupId(), dep.getArtifactId(), dep.getVersion(), null, dep.getType(), null, artifactHandler);
return getArtifactFile(artifact);
}
private File getArtifactFile(Artifact artifact) {
localRepository.find(artifact); localRepository.find(artifact);
return artifact.getFile(); return artifact.getFile();
} }
@@ -257,21 +261,25 @@ public class ExecuteKotlinScriptMojo extends AbstractMojo {
return getDependencyFile(dep); return getDependencyFile(dep);
} }
private File getKotlinStdlibDependency() throws MojoExecutionException { private List<File> getKotlinRuntimeDependencies() throws MojoExecutionException {
Dependency result = null; Artifact stdlibDep = null;
Artifact runtimeDep = null;
for (Dependency dep: project.getDependencies()) { for (Artifact dep: project.getArtifacts()) {
if (dep.getArtifactId().equals("kotlin-stdlib")) { if (dep.getArtifactId().equals("kotlin-stdlib")) {
result = dep; stdlibDep = dep;
break;
} }
if (dep.getArtifactId().equals("kotlin-runtime")) {
runtimeDep = dep;
}
if (stdlibDep != null && runtimeDep != null) break;
} }
if (result == null) { if (stdlibDep == null || runtimeDep == null) {
throw new MojoExecutionException("Unable to find Kotlin standard library among project dependencies"); throw new MojoExecutionException("Unable to find kotlin-stdlib and kotlin-runtime artifacts among project dependencies");
} }
return getDependencyFile(result); return Arrays.asList(getArtifactFile(stdlibDep), getArtifactFile(runtimeDep));
} }
private void initCompiler() { private void initCompiler() {