Bumped Dokka to version 1.9.20

This commit is contained in:
Erik C. Thauvin 2024-03-04 13:10:37 -08:00
parent 771b8bd464
commit b1592bc7c7
Signed by: erik
GPG key ID: 776702A6A2DA330E
3 changed files with 10 additions and 9 deletions

View file

@ -1,6 +1,6 @@
bld.downloadExtensionJavadoc=false bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true 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.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.downloadLocation= bld.downloadLocation=
bld.sourceDirectories= bld.sourceDirectories=

View file

@ -33,14 +33,14 @@ public class CompileKotlinOperationBuild extends Project {
public CompileKotlinOperationBuild() { public CompileKotlinOperationBuild() {
pkg = "rife.bld.extension"; pkg = "rife.bld.extension";
name = "bld-kotlin"; name = "bld-kotlin";
version = version(0, 9, 1); version = version(0, 9, 2);
javaRelease = 17; javaRelease = 17;
downloadSources = true; downloadSources = true;
autoDownloadPurge = true; autoDownloadPurge = true;
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES); 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); var kotlin = version(1, 9, 22);
scope(compile) scope(compile)
.include(dependency("org.jetbrains.kotlin", "kotlin-compiler", kotlin)) .include(dependency("org.jetbrains.kotlin", "kotlin-compiler", kotlin))

View file

@ -58,13 +58,14 @@ class DokkaOperationTest {
.executeConstructProcessCommandList(); .executeConstructProcessCommandList();
var path = examples.getAbsolutePath(); var path = examples.getAbsolutePath();
var dokkaJar = "1.9.20.jar";
var matches = List.of("java", var matches = List.of("java",
"-jar", path + "/lib/bld/dokka-cli-1.9.10.jar", "-jar", path + "/lib/bld/dokka-cli-" + dokkaJar,
"-pluginsClasspath", path + "/lib/bld/dokka-base-1.9.10.jar;" + "-pluginsClasspath", path + "/lib/bld/dokka-base-" + dokkaJar + ';' +
path + "/lib/bld/analysis-kotlin-descriptors-1.9.10.jar;" + path + "/lib/bld/analysis-kotlin-descriptors-" + dokkaJar + ';' +
path + "/lib/bld/javadoc-plugin-1.9.10.jar;" + path + "/lib/bld/javadoc-plugin-" + dokkaJar + ';' +
path + "/lib/bld/korte-jvm-2.7.0.jar;" + path + "/lib/bld/korte-jvm-4.0.10.jar;" +
path + "/lib/bld/kotlin-as-java-plugin-1.9.10.jar;path1;path2;path3;path4", path + "/lib/bld/kotlin-as-java-plugin-" + dokkaJar + ";path1;path2;path3;path4",
"-sourceSet", "-src " + path + "/src/main/kotlin", "-sourceSet", "-src " + path + "/src/main/kotlin",
"-outputDir", path + "/build", "-outputDir", path + "/build",
"-delayTemplateSubstitution", "true", "-delayTemplateSubstitution", "true",