From 51d046a2f7bb205dc7d58d31ab5024bc0caf0596 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 8 Nov 2023 22:12:34 -0800
Subject: [PATCH] Added no-stdlib and -Xfriend-paths compile options

---
 examples/.idea/.name                           |  1 +
 .../bld/extension/CompileKotlinOperation.java  | 15 ++++++++++-----
 .../bld/extension/CompileKotlinOptions.java    | 18 ++++++++++++++++++
 .../extension/CompileKotlinOptionsTest.java    |  2 ++
 4 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 examples/.idea/.name

diff --git a/examples/.idea/.name b/examples/.idea/.name
new file mode 100644
index 0000000..c15df89
--- /dev/null
+++ b/examples/.idea/.name
@@ -0,0 +1 @@
+bld-koltin-examples
\ No newline at end of file
diff --git a/src/main/java/rife/bld/extension/CompileKotlinOperation.java b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
index cdc8141..33ce802 100644
--- a/src/main/java/rife/bld/extension/CompileKotlinOperation.java
+++ b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
@@ -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());
     }
 
     /**
diff --git a/src/main/java/rife/bld/extension/CompileKotlinOptions.java b/src/main/java/rife/bld/extension/CompileKotlinOptions.java
index ff82c56..ca6d76d 100644
--- a/src/main/java/rife/bld/extension/CompileKotlinOptions.java
+++ b/src/main/java/rife/bld/extension/CompileKotlinOptions.java
@@ -45,6 +45,7 @@ public class CompileKotlinOptions {
     private String moduleName_;
     private boolean noJdk_;
     private boolean noReflect_;
+    private boolean noStdLib_ = true;
     private boolean noWarn_;
     private String path_;
     private boolean progressive_;
@@ -177,6 +178,11 @@ public class CompileKotlinOptions {
             args.add("-no-reflect");
         }
 
+        // no-std-lib
+        if (noStdLib_) {
+            args.add("-no-stdlib");
+        }
+
         // no-warn
         if (noWarn_) {
             args.add("-no-warn");
@@ -398,6 +404,18 @@ public class CompileKotlinOptions {
         return this;
     }
 
+    /**
+     * Don't automatically include the Kotlin/JVM stdlib ({@code kotlin-stdlib.jar}) and Kotlin reflection
+     * ({@code kotlin-reflect.jar}) into the classpath.
+     *
+     * @param noStdLib {@code true} or {@code false}
+     * @return this class instance
+     */
+    public CompileKotlinOptions noStdLib(boolean noStdLib) {
+        noStdLib_ = noStdLib;
+        return this;
+    }
+
     /**
      * Suppress the compiler from displaying warnings during compilation.
      *
diff --git a/src/test/java/rife/bld/extension/CompileKotlinOptionsTest.java b/src/test/java/rife/bld/extension/CompileKotlinOptionsTest.java
index 64c07cf..f549b1e 100644
--- a/src/test/java/rife/bld/extension/CompileKotlinOptionsTest.java
+++ b/src/test/java/rife/bld/extension/CompileKotlinOptionsTest.java
@@ -31,6 +31,7 @@ class CompileKotlinOptionsTest {
         var args = new CompileKotlinOptions()
                 .argFile(List.of("arg1.txt", "arg2.txt"))
                 .classpath(List.of("path1", "path2"))
+                .noStdLib(false)
                 .optIn(List.of("opt1", "opt2"))
                 .options(List.of("-foo", "-bar"))
                 .scriptTemplates(List.of("temp1", "temp2"))
@@ -92,6 +93,7 @@ class CompileKotlinOptionsTest {
                 "-module-name", "module",
                 "-no-jdk",
                 "-no-reflect",
+                "-no-stdlib",
                 "-no-warn",
                 "-opt-in", "opt1",
                 "-opt-in", "opt2",