Made compile options modifiable

Author: ethauvin

README.md

@@ -19,7 +19,6 @@ To compile the source code located in `src/main/kotlin` and `src/test/kotlin` fr
 public void compile() throws IOException {
     new CompileKotlinOperation()
             .fromProject(this)
-            .compileOptions(new CompileKotlinOptions().verbose(true))
             .execute();
 }
 ```

examples/.idea/misc.xml

@@ -3,7 +3,6 @@
 import rife.bld.BuildCommand;
 import rife.bld.Project;
 import rife.bld.extension.CompileKotlinOperation;
-import rife.bld.extension.CompileKotlinOptions;
 import rife.bld.extension.dokka.DokkaOperation;
 import rife.bld.extension.dokka.LoggingLevel;
 import rife.bld.extension.dokka.OutputFormat;
@@ -64,12 +63,11 @@ public void compile() throws IOException {
         // The source code located in src/main/kotlin and src/test/kotlin will be compiled
         new CompileKotlinOperation()
                 .fromProject(this)
-                .compileOptions(
-                        new CompileKotlinOptions()
-                                .jdkRelease(javaRelease)
-                                .verbose(true)
-                )
                 .execute();
+
+//        var op = new CompileKotlinOperation().fromProject(this);
+//        op.compileOptions().verbose(true);
+//        op.execute();
     }
 
     @BuildCommand(value = "dokka-gfm", summary = "Generates documentation in GitHub flavored markdown format")

examples/src/bld/java/com/example/ExampleBuild.java

@@ -46,7 +46,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
     private final Collection<File> testSourceFiles_ = new ArrayList<>();
     private File buildMainDirectory_;
     private File buildTestDirectory_;
-    private CompileKotlinOptions compileOptions_;
+    private CompileKotlinOptions compileOptions_ = new CompileKotlinOptions();
     private BaseProject project_;
 
     /**
@@ -159,6 +159,13 @@ public Collection<String> compileMainClasspath() {
         return compileMainClasspath_;
     }
 
+    /**
+     * Retrieves the list of compilation options for the compiler.
+     */
+    public CompileKotlinOptions compileOptions() {
+        return compileOptions_;
+    }
+
     /**
      * Provides a list of compilation options to pass to the {@code kotlinc} compiler.
      *
@@ -320,9 +327,11 @@ protected void executeCreateBuildDirectories() throws IOException {
      *     <li>{@link #buildTestDirectory() buildTestDirectory}</li>
      *     <li>{@link #compileMainClasspath() compileMainClassPath}</li>
      *     <li>{@link #compileTestClasspath() compilesTestClassPath}</li>
-     *     <li>{@link #mainSourceFiles() mainSourceFiles}</li>
-     *     <li>{@link #testSourceFiles() testSourceFile}</li>
-     *     <li>{@link CompileKotlinOptions#jdkRelease jdkRelease}</li>
+     *     <li>{@link #mainSourceFiles() mainSourceFiles} to the {@code kotlin} directory in
+     *     {@link BaseProject#srcMainDirectory() srcMainDirectory}</li>
+     *     <li>{@link #testSourceFiles() testSourceFile} to the {@code kotlin} directory in
+     *     {@link BaseProject#srcTestDirectory() srcTestDirectory}</li>
+     *     <li>{@link CompileKotlinOptions#jdkRelease jdkRelease} to {@link BaseProject#javaRelease() javaRelease}</li>
      * </ul>
      *
      * @param project the project to configure the compile operation from
@@ -335,8 +344,8 @@ public CompileKotlinOperation fromProject(BaseProject project) {
                 .compileTestClasspath(project.compileTestClasspath())
                 .mainSourceFiles(getKotlinFileList(new File(project.srcMainDirectory(), "kotlin")))
                 .testSourceFiles(getKotlinFileList(new File(project.srcTestDirectory(), "kotlin")));
-        if (project.javaRelease() != null) {
-            return op.compileOptions(new CompileKotlinOptions().jdkRelease(project.javaRelease()));
+        if (project.javaRelease() != null && !compileOptions_.hasRelease()) {
+            compileOptions_.jdkRelease(project.javaRelease());
         }
 
         return op;
@@ -440,6 +449,26 @@ public CompileKotlinOperation plugins(File directory, CompileKotlinPlugin... plu
         return this;
     }
 
+    /**
+     * Provides compiler plugins.
+     *
+     * @param jars    the list of plugin JARs
+     * @param plugins one or more plugins
+     * @return this class instance
+     */
+    public CompileKotlinOperation plugins(Collection<File> jars, CompileKotlinPlugin... plugins) {
+        jars.forEach(jar -> {
+            for (var plugin : plugins) {
+                if (jar.getName().matches(plugin.label)) {
+                    plugins_.add(jar.getAbsolutePath());
+                    break;
+                }
+            }
+        });
+
+        return this;
+    }
+
     // Combine Kotlin sources
     private Collection<File> sources(Collection<File> files, Collection<File> directories) {
         var sources = new ArrayList<>(files);

src/main/java/rife/bld/extension/CompileKotlinOperation.java

@@ -265,6 +265,15 @@ public CompileKotlinOptions classpath(Collection<String> paths) {
         return this;
     }
 
+    /**
+     * Indicates whether the {@link #jdkRelease(String) jdkRelease} was set.
+     *
+     * @return {@code true} if the release was set; or {@code false} otherwise
+     */
+    public boolean hasRelease() {
+        return jdkRelease_ != null;
+    }
+
     /**
      * Include the Kotlin runtime into the resulting JAR file. Makes the resulting archive runnable on any Java-enabled
      * environment.
@@ -317,7 +326,7 @@ public CompileKotlinOptions jdkRelease(String version) {
      * Specify the target version of the generated JVM bytecode.
      *
      * @param version the target version
-     * @return this class insance
+     * @return this class instance
      * @see #jdkRelease(String)
      */
     public CompileKotlinOptions jdkRelease(int version) {
@@ -557,7 +566,7 @@ public CompileKotlinOptions verbose(boolean verbose) {
      * @param wError {@code true} or {@code false}
      * @return this class instance
      */
-    public CompileKotlinOptions wErrpr(boolean wError) {
+    public CompileKotlinOptions wError(boolean wError) {
         wError_ = wError;
         return this;
     }

src/main/java/rife/bld/extension/CompileKotlinOptions.java

@@ -17,7 +17,7 @@
 package rife.bld.extension.dokka;
 
 /**
- * Dokka analysis platforms.
+ * Dokka's analysis platforms.
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
  * @since 1.0

src/main/java/rife/bld/extension/dokka/AnalysisPlatform.java

@@ -52,7 +52,7 @@ public class SourceSet {
     /**
      * Sets the platform used for setting up analysis. Default is {@link AnalysisPlatform#JVM}
      *
-     * @param analysisPlatform the analysis platfrom
+     * @param analysisPlatform the analysis platform
      * @return this operation instance
      */
     public SourceSet analysisPlatform(AnalysisPlatform analysisPlatform) {
@@ -424,7 +424,7 @@ public SourceSet perPackageOptions(String... perPackageOptions) {
     }
 
     /**
-     * Sets Wwether to report undocumented declarations.
+     * Sets whether to report undocumented declarations.
      *
      * @param reportUndocumented {@code true} or {@code false}
      * @return this operation instance

src/main/java/rife/bld/extension/dokka/SourceSet.java

@@ -72,14 +72,14 @@ void testExecute() throws IOException {
             var op = new CompileKotlinOperation()
                     .fromProject(new BaseProjectBlueprint(new File("examples"), "com.example",
                             "Example"))
-                    .compileOptions(new CompileKotlinOptions().verbose(true))
                     .buildMainDirectory(mainDir)
                     .buildTestDirectory(testDir)
                     .compileMainClasspath(compileJars)
                     .compileTestClasspath(testJars)
                     .compileTestClasspath(compileJars)
                     .compileTestClasspath(mainDir.getAbsolutePath());
 
+            op.compileOptions().verbose(true);
             op.execute();
 
             assertThat(tmpDir).isNotEmptyDirectory();

src/test/java/rife/bld/extension/CompileKotlinOperationTest.java

@@ -76,7 +76,7 @@ void argsTest() {
                 .progressive(true)
                 .scriptTemplates("name", "name2")
                 .verbose(true)
-                .wErrpr(true)
+                .wError(true)
                 .args();
 
         var matches = List.of(