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

CLI: Allow to specify JDK for classpath building with '-jdk' compiler argument.

Browse Source 
Maven: support jdk parameter linked to kotlin.compiler.jdk property.
Gradle: support jdk compiler option.
This commit is contained in:
Ilya Gorbunov
2016-06-16 22:00:07 +03:00
parent 1157e052ee
commit 644df89dc9
7 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+1
View File
@@ -195,6 +195,7 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
logger.kotlinDebug("args.pluginOptions = ${args.pluginOptions.joinToString(File.pathSeparator)}")
args.noStdlib = true
args.jdk = kotlinOptions.jdk
args.noJdk = kotlinOptions.noJdk
args.noInline = kotlinOptions.noInline
args.noOptimize = kotlinOptions.noOptimize
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
+8 -5
View File
@@ -16,11 +16,7 @@
package org.jetbrains.kotlin.maven;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -30,7 +26,6 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments;
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import static com.intellij.openapi.util.text.StringUtil.join;
@@ -67,6 +62,9 @@ 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;
@NotNull
@Override
protected K2JVMCompiler createCompiler() {
@@ -111,5 +109,10 @@ 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;
}
}
}