rife2/bld-kotlin
rife2/bld-kotlin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Log where the kotlin compiler was found from/at

Browse source
This commit is contained in:
Erik C. Thauvin 2025-03-26 21:52:12 -07:00
parent 8e2415eda4
commit 852e24bc18
Signed by: erik
GPG key ID: 776702A6A2DA330E
1 changed files with 55 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

90
src/main/java/rife/bld/extension/CompileKotlinOperation.java
View file

@ -103,7 +103,8 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
if (kotlinHome != null && !kotlinHome.isEmpty()) { if (kotlinHome != null && !kotlinHome.isEmpty()) {
kotlincPath = findKotlincInDir(kotlinHome); kotlincPath = findKotlincInDir(kotlinHome);
if (kotlincPath != null) { if (kotlincPath != null) {
return logKotlincPath(kotlincPath, isSilent); logKotlincPath(kotlincPath, isSilent, "KOTLIN_HOME");
return kotlincPath;
} }
} }
@ -114,58 +115,72 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
for (var dir : pathDirs) { for (var dir : pathDirs) {
kotlincPath = findKotlincInDir(dir); kotlincPath = findKotlincInDir(dir);
if (kotlincPath != null) { if (kotlincPath != null) {
return logKotlincPath(kotlincPath, isSilent); logKotlincPath(kotlincPath, isSilent, "PATH");
return kotlincPath;
} }
} }
} }
// Common installation paths (e.g., SDKMAN!, IntelliJ IDEA, etc.) // Common installation paths (e.g., SDKMAN!, IntelliJ IDEA, etc.)
List<String> commonPaths = new ArrayList<>(); var commonPaths = new HashMap<String, String>(); //NOPMD no concurrent access
if (isLinux()) { if (isLinux()) {
var userHome = System.getProperty("user.home"); var userHome = System.getProperty("user.home");
if (userHome != null) { if (userHome != null) {
commonPaths.add(userHome + "/.sdkman/candidates/kotlin/current/bin"); // SDKMAN! commonPaths.put(userHome + "/.sdkman/candidates/kotlin/current/bin", "SDKMAN");
commonPaths.add(userHome + "/.local/share/JetBrains/Toolbox/apps/intellij-idea-ultimate/plugins/Kotlin/kotlinc/bin"); // Toolbox IDEA Ultimate commonPaths.put(userHome + "/.local/share/JetBrains/Toolbox/apps/intellij-idea-ultimate/plugins/Kotlin/kotlinc/bin",
commonPaths.add(userHome + "/.local/share/JetBrains/Toolbox/apps/intellij-idea-community-edition/plugins/Kotlin/kotlinc/bin"); // Toolbox IDEA CE "IntelliJ IDEA Ultimate");
commonPaths.add(userHome + "/.local/share/JetBrains/Toolbox/apps/android-studio/plugins/Kotlin/kotlinc/bin"); // Toolbox Android Studio commonPaths.put(userHome + "/.local/share/JetBrains/Toolbox/apps/intellij-idea-community-edition/plugins/Kotlin/kotlinc/bin",
"IntelliJ IDEA Community Edition");
commonPaths.put(userHome + "/.local/share/JetBrains/Toolbox/apps/android-studio/plugins/Kotlin/kotlinc/bin",
"Android Studio");
} }
commonPaths.add("/usr/bin"); commonPaths.put("/usr/bin", null);
commonPaths.add("/usr/share"); commonPaths.put("/usr/share", null);
commonPaths.add("/usr/local/bin"); commonPaths.put("/usr/local/bin", null);
commonPaths.add("/usr/local/kotlin/bin"); commonPaths.put("/usr/local/kotlin/bin", null);
commonPaths.add("/usr/share/kotlin/bin/"); commonPaths.put("/usr/share/kotlin/bin/", null);
commonPaths.add("/opt/kotlin/bin"); commonPaths.put("/opt/kotlin/bin", null);
} else if (isWindows()) { } else if (isWindows()) {
commonPaths.add("C:\\tools\\kotlinc"); commonPaths.put("C:\\tools\\kotlinc", null);
var localAppData = System.getenv("LOCALAPPDATA"); var localAppData = System.getenv("LOCALAPPDATA");
if (localAppData != null) { if (localAppData != null) {
commonPaths.add(localAppData + "\\Programs\\IntelliJ IDEA Ultimate\\plugins\\Kotlin\\kotlinc\\bin"); // Toolbox IDEA Ultimate commonPaths.put(localAppData + "\\Programs\\IntelliJ IDEA Ultimate\\plugins\\Kotlin\\kotlinc\\bin",
commonPaths.add(localAppData + "\\Programs\\IntelliJ IDEA Community Edition\\plugins\\Kotlin\\kotlinc\\bin"); // Toolbox IDEA CE "IntelliJ IDEA Ultimate");
commonPaths.add(localAppData + "\\Programs\\Android Studio\\plugins\\Kotlin\\kotlinc\\bin"); // Toolbox Android Studio commonPaths.put(localAppData + "\\Programs\\IntelliJ IDEA Community Edition\\plugins\\Kotlin\\kotlinc\\bin",
"IntelliJ IDEA Community Edition");
commonPaths.put(localAppData + "\\Programs\\Android Studio\\plugins\\Kotlin\\kotlinc\\bin",
"Android Studio");
} }
var programFiles = System.getenv("ProgramFiles"); var programFiles = System.getenv("ProgramFiles");
if (programFiles != null) { if (programFiles != null) {
commonPaths.add(programFiles + File.separator + "Kotlin"); commonPaths.put(programFiles + File.separator + "Kotlin", "null");
} }
} else if (isMacOS()) { } else if (isMacOS()) {
var userHome = System.getProperty("user.home"); var userHome = System.getProperty("user.home");
if (userHome != null) { if (userHome != null) {
commonPaths.add(userHome + "/.sdkman/candidates/kotlin/current/bin"); // SDKMAN! commonPaths.put(userHome + "/.sdkman/candidates/kotlin/current/bin", "SDKMAN!");
} }
commonPaths.add("/Applications/IntelliJ IDEA.app/Contents/plugins/Kotlin/kotlinc/bin/"); // IDEA Ultimate commonPaths.put("/Applications/IntelliJ IDEA.app/Contents/plugins/Kotlin/kotlinc/bin/",
commonPaths.add("/Applications/IntelliJ IDEA Community Edition.app/Contents/plugins/Kotlin/kotlinc/bin/"); //IDEA CE "IntelliJ IDEA");
commonPaths.add("/Applications/Android Studio.app/Contents/plugins/Kotlin/kotlinc/bin"); //Android Studio commonPaths.put("/Applications/IntelliJ IDEA Community Edition.app/Contents/plugins/Kotlin/kotlinc/bin/",
commonPaths.add("/usr/local/bin"); // Homebrew "IntelliJ IDEA Community Edition");
commonPaths.add("/opt/homebrew/bin"); // Homebrew 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 location : commonPaths) { for (var path : commonPaths.keySet()) {
kotlincPath = findKotlincInDir(location); kotlincPath = findKotlincInDir(path);
if (kotlincPath != null) { if (kotlincPath != null) {
return logKotlincPath(kotlincPath, isSilent); logKotlincPath(kotlincPath, isSilent, commonPaths.get(path));
return kotlincPath;
} }
} }
commonPaths.forEach((path, where) -> {
});
// Try 'which' or 'where' commands (less reliable but sometimes works) // Try 'which' or 'where' commands (less reliable but sometimes works)
try { try {
@ -180,7 +195,8 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
if (scanner.hasNextLine()) { if (scanner.hasNextLine()) {
kotlincPath = scanner.nextLine().trim(); kotlincPath = scanner.nextLine().trim();
if (isExecutable(new File(kotlincPath))) { if (isExecutable(new File(kotlincPath))) {
return logKotlincPath(kotlincPath, isSilent); logKotlincPath(kotlincPath, isSilent);
return kotlincPath;
} }
} }
} }
@ -235,11 +251,18 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
return OS_NAME != null && OS_NAME.contains("win"); return OS_NAME != null && OS_NAME.contains("win");
} }
private static String logKotlincPath(String kotlincPath, boolean isSilent) { private static void logKotlincPath(String kotlincPath, boolean isSilent) {
if (LOGGER.isLoggable(Level.INFO) && !isSilent) { logKotlincPath(kotlincPath, isSilent, null);
LOGGER.info("Using Kotlin compiler found at: " + kotlincPath); }
private static void logKotlincPath(String kotlincPath, boolean isSilent, String from) {
if (LOGGER.isLoggable(Level.INFO) && !isSilent) {
if (from != null) {
LOGGER.info("Using Kotlin compiler inferred from " + from + ": " + kotlincPath);
} else {
LOGGER.info( "Using Kotlin compiler found at: " + kotlincPath);
}
} }
return kotlincPath;
} }
/** /**
@ -497,8 +520,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
if (kotlinc_ != null) { if (kotlinc_ != null) {
command.add(kotlinc_.getAbsolutePath()); command.add(kotlinc_.getAbsolutePath());
} else if (kotlinHome_ != null) { } else if (kotlinHome_ != null) {
command.add(Objects.requireNonNullElseGet(findKotlincInDir(kotlinHome_.getAbsolutePath()), command.add(kotlinHome_.getAbsolutePath());
CompileKotlinOperation::findKotlincPath));
} else { } else {
command.add(findKotlincPath(silent())); command.add(findKotlincPath(silent()));
} }