diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
index cf75013..4d09408 100644
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@@ -3,15 +3,18 @@
+
+
+
-
\ No newline at end of file
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 42c6755..6b98b1b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-
diff --git a/examples/.idea/libraries/bld.xml b/examples/.idea/libraries/bld.xml
index cf75013..ca84ff0 100644
--- a/examples/.idea/libraries/bld.xml
+++ b/examples/.idea/libraries/bld.xml
@@ -6,6 +6,7 @@
+
@@ -14,4 +15,4 @@
-
\ No newline at end of file
+
diff --git a/examples/.idea/misc.xml b/examples/.idea/misc.xml
index 35aa0d5..bdb2fea 100644
--- a/examples/.idea/misc.xml
+++ b/examples/.idea/misc.xml
@@ -1,4 +1,3 @@
-
diff --git a/src/main/java/rife/bld/extension/CompileKotlinOperation.java b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
index 3ae02bc..bb30b85 100644
--- a/src/main/java/rife/bld/extension/CompileKotlinOperation.java
+++ b/src/main/java/rife/bld/extension/CompileKotlinOperation.java
@@ -62,7 +62,8 @@ public class CompileKotlinOperation extends AbstractOperation {
args.add("-globalLinks");
var links = new ArrayList();
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));
}
diff --git a/src/main/java/rife/bld/extension/dokka/SourceSet.java b/src/main/java/rife/bld/extension/dokka/SourceSet.java
index f12222d..4e7b7fe 100644
--- a/src/main/java/rife/bld/extension/dokka/SourceSet.java
+++ b/src/main/java/rife/bld/extension/dokka/SourceSet.java
@@ -123,7 +123,7 @@ public class SourceSet {
if (!externalDocumentationLinks_.isEmpty()) {
args.add("-externalDocumentationLinks");
var links = new ArrayList();
- 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();
- 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;
}
diff --git a/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java b/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java
index 3f1a9d3..2e0c0f4 100644
--- a/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java
+++ b/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java
@@ -69,7 +69,7 @@ class DokkaOperationTest {
"-outputDir", path + "/build",
"-delayTemplateSubstitution", "true",
"-failOnWarning", "true",
- "-globalLinks", "{s}^{link}^^{s2}^{link2}",
+ "-globalLinks", "s^link^^s2^link2",
"-globalPackageOptions", "option1;option2;option3;option4",
"-globalSrcLinks_", "link1;link2;link3;link4",
"-includes", "file1;file2",
diff --git a/src/test/java/rife/bld/extension/dokka/SourceSetTest.java b/src/test/java/rife/bld/extension/dokka/SourceSetTest.java
index bed76ec..b5f98cc 100644
--- a/src/test/java/rife/bld/extension/dokka/SourceSetTest.java
+++ b/src/test/java/rife/bld/extension/dokka/SourceSetTest.java
@@ -39,7 +39,7 @@ class SourceSetTest {
var matches = List.of(
"-classpath", "path1;path2",
"-dependentSourceSets", "set1/set2;set3/set4",
- "-externalDocumentationLinks", "{link3}^{link4}^^{link1}^{link2}",
+ "-externalDocumentationLinks", "link3^link4^^link1^link2",
"-perPackageOptions", "option1;option2",
"-samples", "samples1;samples1",
"-suppressedFiles", "sup1;sup2"
@@ -62,8 +62,8 @@ class SourceSetTest {
.includes("includes1", "includes2")
.perPackageOptions("options1", "options2")
.samples("samples1", "sample2")
- .srcLinks("path1", "remote1", "suffix1")
- .srcLinks("path2", "remote2", "suffix2")
+ .srcLink("path1", "remote1", "#suffix1")
+ .srcLink("path2", "remote2", "#suffix2")
.src("src1", "src2")
.suppressedFiles("sup1", "sup2")
.analysisPlatform(AnalysisPlatform.JVM)
@@ -86,7 +86,7 @@ class SourceSetTest {
"-dependentSourceSets", "moduleName/sourceSetName",
"-displayName", "name",
"-documentedVisibilities", "package;private",
- "-externalDocumentationLinks", "{url1}^{packageListUrl1}^^{url2}^{packageListUrl2}",
+ "-externalDocumentationLinks", "url1^packageListUrl1^^url2^packageListUrl2",
"-jdkVersion", "18",
"-includes", "includes1;includes2",
"-languageVersion", "2.0",
@@ -98,7 +98,7 @@ class SourceSetTest {
"-samples", "samples1;sample2",
"-skipDeprecated", "true",
"-src", "src1;src2",
- "-srcLinks", "{path1}={remote1#suffix1};{path2}={remote2#suffix2}",
+ "-srcLink", "path1=remote1#suffix1;path2=remote2#suffix2",
"-sourceSetName", "setName",
"-suppressedFiles", "sup1;sup2");