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/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 f1c912b..e754164 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 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 AbstractOperationErik C. Thauvin - * @since 1.0.5 + * @since 1.1.0 */ @SuppressWarnings("PMD.LooseCoupling") public class JvmOptions extends ArrayList {