rife2/bld-kotlin
rife2/bld-kotlin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Not longer defaults to noStdLib unless set from project

Browse source
This commit is contained in:
Erik C. Thauvin 2023-11-15 12:32:24 -08:00
parent 28ad500a12
commit f5caba550d
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/rife/bld/extension/CompileKotlinOperation.java
View file

@ -332,6 +332,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
* <li>{@link #testSourceFiles() testSourceFile} to the {@code kotlin} directory in * <li>{@link #testSourceFiles() testSourceFile} to the {@code kotlin} directory in
* {@link BaseProject#srcTestDirectory() srcTestDirectory}</li> * {@link BaseProject#srcTestDirectory() srcTestDirectory}</li>
* <li>{@link CompileKotlinOptions#jdkRelease jdkRelease} to {@link BaseProject#javaRelease() javaRelease}</li> * <li>{@link CompileKotlinOptions#jdkRelease jdkRelease} to {@link BaseProject#javaRelease() javaRelease}</li>
* <li>{@link CompileKotlinOptions#noStdLib(boolean) noStdLib} to {@code true}</li>
* </ul> * </ul>
* *
* @param project the project to configure the compile operation from * @param project the project to configure the compile operation from
@ -347,6 +348,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
if (project.javaRelease() != null && !compileOptions_.hasRelease()) { if (project.javaRelease() != null && !compileOptions_.hasRelease()) {
compileOptions_.jdkRelease(project.javaRelease()); compileOptions_.jdkRelease(project.javaRelease());
} }
compileOptions_.noStdLib(true);
return op; return op;
} }

4
src/main/java/rife/bld/extension/CompileKotlinOptions.java
View file

@ -16,10 +16,10 @@
package rife.bld.extension; package rife.bld.extension;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.io.File;
/** /**
* Configuration for the Kotlin compiler options. * Configuration for the Kotlin compiler options.
@ -45,7 +45,7 @@ public class CompileKotlinOptions {
private String moduleName_; private String moduleName_;
private boolean noJdk_; private boolean noJdk_;
private boolean noReflect_; private boolean noReflect_;
private boolean noStdLib_ = true; private boolean noStdLib_;
private boolean noWarn_; private boolean noWarn_;
private String path_; private String path_;
private boolean progressive_; private boolean progressive_;