From 4b7f41660fdd717aa2312c476f0ab90a70f9fcb0 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 21 Mar 2025 23:36:28 -0700 Subject: [PATCH] Bump Kotlin extension to version 1.1.0-SNAPSHOT --- lib/bld/bld-wrapper.properties | 2 +- src/bld/java/net/thauvin/erik/MobibotBuild.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index c1b1941..4986847 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -4,7 +4,7 @@ bld.downloadLocation= bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.9 bld.extension-gv=com.uwyn.rife2:bld-generated-version:1.0.0 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.9 -bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.4 +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/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index 65e7e0c..42436b7 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -39,6 +39,7 @@ import rife.bld.extension.DetektOperation; import rife.bld.extension.GeneratedVersionOperation; import rife.bld.extension.JacocoReportOperation; import rife.bld.extension.kotlin.CompileOptions; +import rife.bld.extension.kotlin.JvmOptions; import rife.bld.operations.exceptions.ExitStatusException; import rife.bld.publish.PomBuilder; import rife.tools.FileUtils; @@ -154,12 +155,12 @@ public class MobibotBuild extends Project { @Override public void compile() throws Exception { releaseInfo(); - var options = new CompileOptions().verbose(true).jvmOptions("--enable-native-access=ALL-UNNAMED"); - var op = new CompileKotlinOperation() - .kotlinHome("/opt/kotlinc/") + var options = new CompileOptions().verbose(true); + options.jvmOptions().enableNativeAccess(JvmOptions.ALL_UNNAMED); + new CompileKotlinOperation() .compileOptions(options) - .fromProject(this); - op.execute(); + .fromProject(this) + .execute(); } @Override