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

Fixed Dokka source links

Browse source
This commit is contained in:
Erik C. Thauvin 2023-11-11 19:36:47 -08:00
parent 02f56a8373
commit 8597447422
9 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,8 @@ public class CompileKotlinOperation extends AbstractOperation<CompileKotlinOpera
var files = directory.listFiles();
if (files != null) {
for (var f : files) {
if (!f.getName().contains("-sources") && f.getName().matches(regex)) {
if (!f.getName().endsWith("-sources.jar") && (!f.getName().endsWith("-javadoc.jar")) &&
f.getName().matches(regex)) {
jars.add(f.getAbsolutePath());
}
}

2
src/main/java/rife/bld/extension/dokka/DokkaOperation.java
View file

@ -142,7 +142,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
args.add("-globalLinks");
var links = new ArrayList<String>();
globalLinks_.forEach((k, v) ->
links.add(String.format("{%s}^{%s}", k, v)));
links.add(String.format("%s^%s", k, v)));
args.add(String.join("^^", links));
}

14
src/main/java/rife/bld/extension/dokka/SourceSet.java
View file

@ -123,7 +123,7 @@ public class SourceSet {
if (!externalDocumentationLinks_.isEmpty()) {
args.add("-externalDocumentationLinks");
var links = new ArrayList<String>();
externalDocumentationLinks_.forEach((k, v) -> links.add(String.format("{%s}^{%s}", k, v)));
externalDocumentationLinks_.forEach((k, v) -> links.add(String.format("%s^%s", k, v)));
args.add(String.join("^^", links));
}
@ -193,11 +193,11 @@ public class SourceSet {
args.add(String.join(SEMICOLON, src_));
}
// -srcLinks
// -srcLink
if (!srcLinks_.isEmpty()) {
args.add("-srcLinks");
args.add("-srcLink");
var links = new ArrayList<String>();
srcLinks_.forEach((k, v) -> links.add(String.format("{%s}={%s}", k, v)));
srcLinks_.forEach((k, v) -> links.add(String.format("%s=%s", k, v)));
args.add(String.join(SEMICOLON, links));
}
@ -501,15 +501,15 @@ public class SourceSet {
}
/**
* Sets the mpping between a source directory and a Web service for browsing the code.
* Sets the mapping between a source directory and a Web service for browsing the code.
*
* @param srcPath the source path
* @param remotePath the remote path
* @param lineSuffix the line suffix
* @return this operation instance
*/
public SourceSet srcLinks(String srcPath, String remotePath, String lineSuffix) {
srcLinks_.put(srcPath, remotePath + '#' + lineSuffix);
public SourceSet srcLink(String srcPath, String remotePath, String lineSuffix) {
srcLinks_.put(srcPath, remotePath + lineSuffix);
return this;
}