From b29169213b77f88c39d3fee7da1a800a8ef58922 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 12 Nov 2023 00:36:23 -0800
Subject: [PATCH] Don't configure the operations Java/JDK version if the
 project's Java release is not set

---
 .idea/misc.xml                                         |  2 ++
 .../rife/bld/extension/CompileKotlinOperation.java     | 10 +++++++---
 .../java/rife/bld/extension/dokka/DokkaOperation.java  |  7 ++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6b98b1b..43ba136 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <pattern value="rife.bld.extension.CompileKotlinOperationBuild" method="pmd" />
@@ -11,6 +12,7 @@
         <option value="$PROJECT_DIR$/../bld-checkstyle/config/pmd.xml" />
         <option value="$PROJECT_DIR$/../bld-exec/config/pmd.xml" />
         <option value="$PROJECT_DIR$/../bld-testng/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../bld-generated-version/config/pmd.xml" />
       </list>
     </option>
     <option name="skipTestSources" value="false" />
diff --git a/src/main/java/rife/bld/extension/CompileKotlinOperation.java b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
index 0d671c0..60ddfef 100644
--- a/src/main/java/rife/bld/extension/CompileKotlinOperation.java
+++ b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
@@ -324,13 +324,17 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
      */
     public CompileKotlinOperation fromProject(BaseProject project) {
         project_ = project;
-        return buildMainDirectory(project.buildMainDirectory())
+        var op = buildMainDirectory(project.buildMainDirectory())
                 .buildTestDirectory(project.buildTestDirectory())
                 .compileMainClasspath(project.compileMainClasspath())
                 .compileTestClasspath(project.compileTestClasspath())
                 .mainSourceFiles(getKotlinFileList(new File(project.srcMainDirectory(), "kotlin")))
-                .testSourceFiles(getKotlinFileList(new File(project.srcTestDirectory(), "kotlin")))
-                .compileOptions(new CompileKotlinOptions().jdkRelease(project.javaRelease()));
+                .testSourceFiles(getKotlinFileList(new File(project.srcTestDirectory(), "kotlin")));
+        if (project.javaRelease() != null) {
+            return op.compileOptions(new CompileKotlinOptions().jdkRelease(project.javaRelease()));
+        }
+
+        return op;
     }
 
     /**
diff --git a/src/main/java/rife/bld/extension/dokka/DokkaOperation.java b/src/main/java/rife/bld/extension/dokka/DokkaOperation.java
index 2214654..5d86a3e 100644
--- a/src/main/java/rife/bld/extension/dokka/DokkaOperation.java
+++ b/src/main/java/rife/bld/extension/dokka/DokkaOperation.java
@@ -227,9 +227,10 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
     @Override
     public DokkaOperation fromProject(BaseProject project) {
         project_ = project;
-        sourceSet_ = new SourceSet()
-                .src(new File(project.srcMainDirectory(), "kotlin").getAbsolutePath())
-                .jdkVersion(project.javaRelease());
+        sourceSet_ = new SourceSet().src(new File(project.srcMainDirectory(), "kotlin").getAbsolutePath());
+        if (project.javaRelease() != null) {
+            sourceSet_ = sourceSet_.jdkVersion(project.javaRelease());
+        }
         moduleName_ = project.name();
         return this;
     }