From e7d0ada68cc7230d8703cbd920b953f54c1b45a1 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 21 Mar 2025 21:24:44 -0700
Subject: [PATCH 1/2] Reorder the common kotlin compiler potential locations

---
 README.md                                        | 15 ++++++++-------
 .../bld/extension/CompileKotlinOperation.java    | 16 ++++++++++------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 06ce2cb..0c15334 100644
--- a/README.md
+++ b/README.md
@@ -44,13 +44,14 @@ for all available configuration options.
 
 Please make sure the Kotlin compiler is [installed](https://kotlinlang.org/docs/command-line.html#install-the-compiler).
 
-The plugin will look in common locations such as:
-- `KOTLIN_HOME`
-- `PATH`
-- SDKMAN!
-- Homebrew
-- JetBrains Toolbox (IntelliJ IDEA, Android Studio)
-- etc.
+The extension will look in common locations such as:
+
+ - `KOTLIN_HOME`
+ - `PATH`
+ - [SDKMAN!](https://sdkman.io/)
+ - [Homebrew](https://brew.sh/)
+ - [JetBrains Toolbox](https://www.jetbrains.com/toolbox-app/) (IntelliJ IDEA, Android Studio)
+ - etc.
 
 You can also manually configure the Kotlin home location as follows:
 
diff --git a/src/main/java/rife/bld/extension/CompileKotlinOperation.java b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
index f1c912b..2fd3e31 100644
--- a/src/main/java/rife/bld/extension/CompileKotlinOperation.java
+++ b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
@@ -79,6 +79,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
      * Locates the Kotlin compiler (kotlinc) executable.
      *
      * @return The path to the kotlinc executable, or {@code kotlinc}/{@code kotlinc.bat} if not found.
+     * @since 1.0.5
      */
     public static String findKotlincPath() {
         String kotlincPath;
@@ -108,10 +109,6 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
         List<String> commonPaths = new ArrayList<>();
 
         if (isLinux()) {
-            commonPaths.add("/usr/bin");
-            commonPaths.add("/usr/local/bin");
-            commonPaths.add("/usr/local/kotlin/bin");
-            commonPaths.add("/opt/kotlin/bin");
             var userHome = System.getProperty("user.home");
             if (userHome != null) {
                 commonPaths.add(userHome + "/.sdkman/candidates/kotlin/current/bin"); // SDKMAN!
@@ -119,6 +116,10 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
                 commonPaths.add(userHome + "/.local/share/JetBrains/Toolbox/apps/intellij-idea-community-edition/plugins/Kotlin/bin"); // Toolbox IDEA CE
                 commonPaths.add(userHome + "/.local/share/JetBrains/Toolbox/apps/android-studio/plugins/Kotlin/bin"); // Toolbox Android Studio
             }
+            commonPaths.add("/usr/bin");
+            commonPaths.add("/usr/local/bin");
+            commonPaths.add("/usr/local/kotlin/bin");
+            commonPaths.add("/opt/kotlin/bin");
         } else if (isWindows()) {
             var localAppData = System.getenv("LOCALAPPDATA");
             if (localAppData != null) {
@@ -131,8 +132,6 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
                 commonPaths.add(programFiles + File.separator + "Kotlin");
             }
         } else if (isMacOS()) {
-            commonPaths.add("/usr/local/bin"); // Homebrew
-            commonPaths.add("/opt/homebrew/bin"); // Homebrew
             var userHome = System.getProperty("user.home");
             if (userHome != null) {
                 commonPaths.add(userHome + "/.sdkman/candidates/kotlin/current/bin"); // SDKMAN!
@@ -140,6 +139,8 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
             commonPaths.add("/Applications/IntelliJ IDEA Ultimate.app/Contents/plugins/Kotlin/bin"); //IntelliJ IDEA Ultimate
             commonPaths.add("/Applications/IntelliJ IDEA.app/Contents/plugins/Kotlin/bin"); //IntelliJ IDEA
             commonPaths.add("/Applications/Android Studio.app/Contents/plugins/Kotlin/bin"); //Android Studio
+            commonPaths.add("/usr/local/bin"); // Homebrew
+            commonPaths.add("/opt/homebrew/bin"); // Homebrew
         }
 
         for (var location : commonPaths) {
@@ -181,6 +182,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
      * Determines if the operating system is Linux.
      *
      * @return true if the operating system is Linux, false otherwise.
+     * @since 1.0.5
      */
     public static boolean isLinux() {
         return OS_NAME != null && (OS_NAME.contains("linux") || OS_NAME.contains("unix")); // Consider Unix-like systems as well.
@@ -190,6 +192,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
      * Determines if the current operating system is macOS.
      *
      * @return true if the OS is macOS, false otherwise.
+     * @since 1.0.5
      */
     public static boolean isMacOS() {
         return OS_NAME != null && (OS_NAME.contains("mac") || OS_NAME.contains("darwin"));
@@ -209,6 +212,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
      * Determines if the current operating system is Windows.
      *
      * @return true if the operating system is Windows, false otherwise.
+     * @since 1.0.5
      */
     public static boolean isWindows() {
         return OS_NAME != null && OS_NAME.contains("win");

From b8927615ecfcd8669b9fc22ca169419bbc6ff2f7 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 21 Mar 2025 21:29:04 -0700
Subject: [PATCH 2/2] 1.1.0-SNAPSHOT

---
 examples/lib/bld/bld-wrapper.properties                   | 2 +-
 .../rife/bld/extension/CompileKotlinOperationBuild.java   | 2 +-
 .../java/rife/bld/extension/CompileKotlinOperation.java   | 8 ++++----
 src/main/java/rife/bld/extension/kotlin/JvmOptions.java   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties
index 29786b7..1f1009d 100644
--- a/examples/lib/bld/bld-wrapper.properties
+++ b/examples/lib/bld/bld-wrapper.properties
@@ -1,7 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.downloadLocation=
-bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.5-SNAPSHOT
+bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.1.0-SNAPSHOT
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.sourceDirectories=
 bld.version=2.2.1
diff --git a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java
index 749beb1..a3adce1 100644
--- a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java
+++ b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java
@@ -33,7 +33,7 @@ public class CompileKotlinOperationBuild extends Project {
     public CompileKotlinOperationBuild() {
         pkg = "rife.bld.extension";
         name = "bld-kotlin";
-        version = version(1, 0, 5, "SNAPSHOT");
+        version = version(1, 1, 0, "SNAPSHOT");
 
         javaRelease = 17;
 
diff --git a/src/main/java/rife/bld/extension/CompileKotlinOperation.java b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
index 2fd3e31..e754164 100644
--- a/src/main/java/rife/bld/extension/CompileKotlinOperation.java
+++ b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
@@ -79,7 +79,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
      * Locates the Kotlin compiler (kotlinc) executable.
      *
      * @return The path to the kotlinc executable, or {@code kotlinc}/{@code kotlinc.bat} if not found.
-     * @since 1.0.5
+     * @since 1.1.0
      */
     public static String findKotlincPath() {
         String kotlincPath;
@@ -182,7 +182,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
      * Determines if the operating system is Linux.
      *
      * @return true if the operating system is Linux, false otherwise.
-     * @since 1.0.5
+     * @since 1.1.0
      */
     public static boolean isLinux() {
         return OS_NAME != null && (OS_NAME.contains("linux") || OS_NAME.contains("unix")); // Consider Unix-like systems as well.
@@ -192,7 +192,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
      * Determines if the current operating system is macOS.
      *
      * @return true if the OS is macOS, false otherwise.
-     * @since 1.0.5
+     * @since 1.1.0
      */
     public static boolean isMacOS() {
         return OS_NAME != null && (OS_NAME.contains("mac") || OS_NAME.contains("darwin"));
@@ -212,7 +212,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
      * Determines if the current operating system is Windows.
      *
      * @return true if the operating system is Windows, false otherwise.
-     * @since 1.0.5
+     * @since 1.1.0
      */
     public static boolean isWindows() {
         return OS_NAME != null && OS_NAME.contains("win");
diff --git a/src/main/java/rife/bld/extension/kotlin/JvmOptions.java b/src/main/java/rife/bld/extension/kotlin/JvmOptions.java
index 926c6e7..7e2ec62 100644
--- a/src/main/java/rife/bld/extension/kotlin/JvmOptions.java
+++ b/src/main/java/rife/bld/extension/kotlin/JvmOptions.java
@@ -27,7 +27,7 @@ import java.util.List;
  * Java Virtual Machine options.
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
- * @since 1.0.5
+ * @since 1.1.0
  */
 @SuppressWarnings("PMD.LooseCoupling")
 public class JvmOptions extends ArrayList<String> {