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

Rename -jdk compiler option to -jdk-home (jdkHome), add jdk path validation.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-06-23 16:33:25 +03:00
parent 13016cae93
commit 7c5c4610e8
13 changed files with 64 additions and 34 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/K2JVMCompileMojo.java
+5 -5
View File
@@ -62,8 +62,8 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
@Parameter(property = "kotlin.compiler.jvmTarget", required = false, readonly = false)
protected String jvmTarget;
@Parameter(property = "kotlin.compiler.jdk", required = false, readonly = false)
protected String jdk;
@Parameter(property = "kotlin.compiler.jdkHome", required = false, readonly = false)
protected String jdkHome;
@NotNull
@Override
@@ -110,9 +110,9 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
arguments.languageVersion = languageVersion;
arguments.jvmTarget = jvmTarget;
if (jdk != null) {
getLog().info("Overriding JDK path with: " + jdk);
arguments.jdk = jdk;
if (jdkHome != null) {
getLog().info("Overriding JDK home path with: " + jdkHome);
arguments.jdkHome = jdkHome;
}
}
}