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

Log the Kotlin compiler location when found

Browse source
This commit is contained in:
Erik C. Thauvin 2025-03-21 23:15:20 -07:00
parent b8927615ec
commit a21938f7b5
Signed by: erik
GPG key ID: 776702A6A2DA330E
1 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,6 +82,17 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
* @since 1.1.0
*/
public static String findKotlincPath() {
return findKotlincPath(false);
}
/**
* Locates the Kotlin compiler (kotlinc) executable.
*
* @param isSilent do not log the path to the kotlinc executable, if {@code true}
* @return The path to the kotlinc executable, or {@code kotlinc}/{@code kotlinc.bat} if not found.
* @since 1.1.0
*/
public static String findKotlincPath(boolean isSilent) {
String kotlincPath;
// Check KOTLIN_HOME environment variable first
@ -89,7 +100,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
if (kotlinHome != null && !kotlinHome.isEmpty()) {
kotlincPath = findKotlincInDir(kotlinHome);
if (kotlincPath != null) {
return kotlincPath;
return logKotlincPath(kotlincPath, isSilent);
}
}
@ -100,7 +111,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
for (var dir : pathDirs) {
kotlincPath = findKotlincInDir(dir);
if (kotlincPath != null) {
return kotlincPath;
return logKotlincPath(kotlincPath, isSilent);
}
}
}
@ -146,7 +157,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
for (var location : commonPaths) {
kotlincPath = findKotlincInDir(location);
if (kotlincPath != null) {
return kotlincPath;
return logKotlincPath(kotlincPath, isSilent);
}
}
@ -163,7 +174,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
if (scanner.hasNextLine()) {
kotlincPath = scanner.nextLine().trim();
if (isExecutable(new File(kotlincPath))) {
return kotlincPath;
return logKotlincPath(kotlincPath, isSilent);
}
}
}
@ -218,6 +229,13 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
return OS_NAME != null && OS_NAME.contains("win");
}
private static String logKotlincPath(String kotlincPath, boolean isSilent) {
if (LOGGER.isLoggable(Level.INFO) && !isSilent) {
LOGGER.info("Using Kotlin compiler found at: " + kotlincPath);
}
return kotlincPath;
}
/**
* Provides the main build destination directory.
*
@ -458,7 +476,7 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
args.add(Objects.requireNonNullElseGet(findKotlincInDir(kotlinHome_.getAbsolutePath()),
CompileKotlinOperation::findKotlincPath));
} else {
args.add(findKotlincPath());
args.add(findKotlincPath(silent()));
}
// classpath