From 5a3c77a16233ab93a8bc97924ea61badb21eb761 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 28 Mar 2025 07:53:08 -0700
Subject: [PATCH 1/2] Update extensions dependencies

Bump Exec from 1.0.4 to 1.0.5
Bump PMD from 1.2.1 to 1.2.2
---
 lib/bld/bld-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index b23895b..d29a55f 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -3,8 +3,8 @@ bld.downloadExtensionSources=true
 bld.downloadLocation=
 bld.javaOptions=
 bld.javacOptions=
-bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.4
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.1
+bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.5
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.2
 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.sourceDirectories=
 bld.version=2.2.1

From 2a406feb15782c0079c56b157a9e67fac1d06284 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 28 Mar 2025 15:44:49 -0700
Subject: [PATCH 2/2] Add snap locations to common paths

---
 .../bld/extension/CompileKotlinOperation.java | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/main/java/rife/bld/extension/CompileKotlinOperation.java b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
index a45ef0c..f54e68b 100644
--- a/src/main/java/rife/bld/extension/CompileKotlinOperation.java
+++ b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
@@ -122,12 +122,21 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
         }
 
         // Common installation paths (e.g., SDKMAN!, IntelliJ IDEA, etc.)
-        var commonPaths = new HashMap<String, String>(); //NOPMD no concurrent access
+        var commonPaths = new LinkedHashMap<String, String>(); //NOPMD no concurrent access
 
         if (isLinux()) {
             var userHome = System.getProperty("user.home");
             if (userHome != null) {
-                commonPaths.put(userHome + "/.sdkman/candidates/kotlin/current/bin", "SDKMAN");
+                commonPaths.put(userHome + "/.sdkman/candidates/kotlin/current/bin", "SDKMAN!");
+            }
+            commonPaths.put("/snap/bin", "Kotlin (Snap)");
+            commonPaths.put("/usr/bin", null);
+            commonPaths.put("/usr/share", null);
+            commonPaths.put("/usr/local/bin", null);
+            commonPaths.put("/usr/local/kotlin/bin", null);
+            commonPaths.put("/usr/share/kotlin/bin/", null);
+            commonPaths.put("/opt/kotlin/bin", null);
+            if (userHome != null) {
                 commonPaths.put(userHome + "/.local/share/JetBrains/Toolbox/apps/intellij-idea-ultimate/plugins/Kotlin/kotlinc/bin",
                         "IntelliJ IDEA Ultimate");
                 commonPaths.put(userHome + "/.local/share/JetBrains/Toolbox/apps/intellij-idea-community-edition/plugins/Kotlin/kotlinc/bin",
@@ -135,14 +144,14 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
                 commonPaths.put(userHome + "/.local/share/JetBrains/Toolbox/apps/android-studio/plugins/Kotlin/kotlinc/bin",
                         "Android Studio");
             }
-            commonPaths.put("/usr/bin", null);
-            commonPaths.put("/usr/share", null);
-            commonPaths.put("/usr/local/bin", null);
-            commonPaths.put("/usr/local/kotlin/bin", null);
-            commonPaths.put("/usr/share/kotlin/bin/", null);
-            commonPaths.put("/opt/kotlin/bin", null);
+            commonPaths.put("/snap/intellij-idea-ultimate/current/commons/plugins/Kotlin/kotlinc/bin",
+                    "IntelliJ IDEA Ultimate (Snap)");
+            commonPaths.put("/snap/intellij-idea-community/current/commons/plugins/Kotlin/kotlinc/bin",
+                    "IntelliJ IDEA Community Edition (Snap)");
+            commonPaths.put("/snap/android-studio/current/android-studio/commons/plugins/Kotlin/kotlinc/bin",
+                    "Android Studio (Snap)");
         } else if (isWindows()) {
-            commonPaths.put("C:\\tools\\kotlinc", null);
+            commonPaths.put("C:\\tools\\kotlinc\\bin", null);
             var localAppData = System.getenv("LOCALAPPDATA");
             if (localAppData != null) {
                 commonPaths.put(localAppData + "\\Programs\\IntelliJ IDEA Ultimate\\plugins\\Kotlin\\kotlinc\\bin",
@@ -154,21 +163,21 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
             }
             var programFiles = System.getenv("ProgramFiles");
             if (programFiles != null) {
-                commonPaths.put(programFiles + File.separator + "Kotlin", "null");
+                commonPaths.put(programFiles + "\\Kotlin\\bin", null);
             }
         } else if (isMacOS()) {
             var userHome = System.getProperty("user.home");
             if (userHome != null) {
                 commonPaths.put(userHome + "/.sdkman/candidates/kotlin/current/bin", "SDKMAN!");
             }
+            commonPaths.put("/opt/homebrew/bin", "Homebrew");
+            commonPaths.put("/usr/local/bin", null);
             commonPaths.put("/Applications/IntelliJ IDEA.app/Contents/plugins/Kotlin/kotlinc/bin/",
                     "IntelliJ IDEA");
             commonPaths.put("/Applications/IntelliJ IDEA Community Edition.app/Contents/plugins/Kotlin/kotlinc/bin/",
                     "IntelliJ IDEA Community Edition");
             commonPaths.put("/Applications/Android Studio.app/Contents/plugins/Kotlin/kotlinc/bin",
                     "Android Studio");
-            commonPaths.put("/usr/local/bin", null);
-            commonPaths.put("/opt/homebrew/bin", "Homebrew");
         }
 
         for (var path : commonPaths.keySet()) {
@@ -178,9 +187,6 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
                 return kotlincPath;
             }
         }
-        commonPaths.forEach((path, where) -> {
-
-        });
 
         // Try 'which' or 'where' commands (less reliable but sometimes works)
         try {