diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 142e058..51b54ec 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.1 +bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.2 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= bld.sourceDirectories= diff --git a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java index 89cfc4a..a659dce 100644 --- a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java +++ b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java @@ -33,14 +33,14 @@ public class CompileKotlinOperationBuild extends Project { public CompileKotlinOperationBuild() { pkg = "rife.bld.extension"; name = "bld-kotlin"; - version = version(0, 9, 1); + version = version(0, 9, 2); javaRelease = 17; downloadSources = true; autoDownloadPurge = true; repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES); - var dokka = version(1, 9, 10); + var dokka = version(1, 9, 20); var kotlin = version(1, 9, 22); scope(compile) .include(dependency("org.jetbrains.kotlin", "kotlin-compiler", kotlin)) diff --git a/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java b/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java index 637b1f2..fbdac6d 100644 --- a/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java +++ b/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java @@ -58,13 +58,14 @@ class DokkaOperationTest { .executeConstructProcessCommandList(); var path = examples.getAbsolutePath(); + var dokkaJar = "1.9.20.jar"; var matches = List.of("java", - "-jar", path + "/lib/bld/dokka-cli-1.9.10.jar", - "-pluginsClasspath", path + "/lib/bld/dokka-base-1.9.10.jar;" + - path + "/lib/bld/analysis-kotlin-descriptors-1.9.10.jar;" + - path + "/lib/bld/javadoc-plugin-1.9.10.jar;" + - path + "/lib/bld/korte-jvm-2.7.0.jar;" + - path + "/lib/bld/kotlin-as-java-plugin-1.9.10.jar;path1;path2;path3;path4", + "-jar", path + "/lib/bld/dokka-cli-" + dokkaJar, + "-pluginsClasspath", path + "/lib/bld/dokka-base-" + dokkaJar + ';' + + path + "/lib/bld/analysis-kotlin-descriptors-" + dokkaJar + ';' + + path + "/lib/bld/javadoc-plugin-" + dokkaJar + ';' + + path + "/lib/bld/korte-jvm-4.0.10.jar;" + + path + "/lib/bld/kotlin-as-java-plugin-" + dokkaJar + ";path1;path2;path3;path4", "-sourceSet", "-src " + path + "/src/main/kotlin", "-outputDir", path + "/build", "-delayTemplateSubstitution", "true",