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

Added no-stdlib and -Xfriend-paths compile options

Browse source
This commit is contained in:
Erik C. Thauvin 2023-11-08 22:12:34 -08:00
parent 04fd7fe037
commit 51d046a2f7
4 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -198,7 +198,8 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
executeBuildSources(
compileMainClasspath(),
sources(mainSourceFiles(), mainSourceDirectories()),
buildMainDirectory());
buildMainDirectory(),
null);
}
/**
@ -207,8 +208,9 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
* @param classpath the classpath list used for the compilation
* @param sources the source files to compile
* @param destination the destination directory
* @param friendPaths the output directory for friendly modules
*/
protected void executeBuildSources(Collection<String> classpath, Collection<File> sources, File destination)
protected void executeBuildSources(Collection<String> classpath, Collection<File> sources, File destination, File friendPaths)
throws IOException {
if (sources.isEmpty() || destination == null) {
return;
@ -225,8 +227,11 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
args.add("-d");
args.add(destination.getAbsolutePath());
args.add("-no-reflect");
args.add("-no-stdlib");
// friend-path
if (friendPaths != null) {
args.add("-Xfriend-paths");
args.add(friendPaths.getAbsolutePath());
}
// options
if (compileOptions_ != null) {
@ -254,7 +259,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
executeBuildSources(
compileTestClasspath(),
sources(testSourceFiles(), testSourceDirectories()),
buildTestDirectory());
buildTestDirectory(), buildMainDirectory());
}
/**