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

Compare commits

base: rife2:852e24bc18f08f4079a7b51a1981d2bff963dc98
Branches Tags
rife2:main
rife2:1.0.4
rife2:1.0.3
rife2:1.0.2
rife2:1.0.1
rife2:1.0.0
rife2:0.9.8
rife2:0.9.7
rife2:0.9.6
rife2:0.9.5
rife2:0.9.4
rife2:0.9.3
rife2:0.9.2
rife2:0.9.1
rife2:0.9.0
...
compare: rife2:2a406feb15782c0079c56b157a9e67fac1d06284
Branches Tags
rife2:main
rife2:1.0.4
rife2:1.0.3
rife2:1.0.2
rife2:1.0.1
rife2:1.0.0
rife2:0.9.8
rife2:0.9.7
rife2:0.9.6
rife2:0.9.5
rife2:0.9.4
rife2:0.9.3
rife2:0.9.2
rife2:0.9.1
rife2:0.9.0

2 commits
852e24bc18 ... 2a406feb15

Author SHA1 Message Date
Erik C. Thauvin
2a406feb15
Add snap locations to common paths 2025-03-30 14:30:10 -07:00
Erik C. Thauvin
5a3c77a162
Update extensions dependencies 
Bump Exec from 1.0.4 to 1.0.5
Bump PMD from 1.2.1 to 1.2.2
 2025-03-28 07:53:08 -07:00
2 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/bld/bld-wrapper.properties
View file

@ -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

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

@ -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 {