From c72b5dab616d4f1fc47fb11bc5c8f9baa01240c6 Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Thu, 16 Apr 2020 14:13:29 +0200 Subject: Change '<>' to '[]' in default package name as Windows prohibits filenames with '<>' --- .../out/html/navigation.html | 6 +-- .../out/html/root//generic.html | 33 ---------------- .../out/html/root//index.html | 46 ---------------------- .../out/html/root/[jvm root]/generic.html | 33 ++++++++++++++++ .../out/html/root/[jvm root]/index.html | 46 ++++++++++++++++++++++ .../out/html/root/index.html | 2 +- .../out/html/root/package-list | 4 +- .../out/html/scripts/pages.js | 4 +- 8 files changed, 87 insertions(+), 87 deletions(-) delete mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//generic.html delete mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//index.html create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html (limited to 'plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html') diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html index 86a7862e..006a9e3e 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html @@ -1,9 +1,9 @@

diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//generic.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//generic.html deleted file mode 100644 index 0c00617f..00000000 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//generic.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - generic - - - - - - -

- - -

generic

final fun <T : R, R : Any> generic()

Description

generic function

- - - diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//index.html deleted file mode 100644 index a59f1ad7..00000000 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//index.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - <jvm root> - - - - - - -

- - -

//root/<jvm root>

Package <jvm root>

Functions

- - - - - - - - - -

generic	- final fun <T : R, R : Any> generic() - -	- JVM -

- - - diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html new file mode 100644 index 00000000..360045a2 --- /dev/null +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html @@ -0,0 +1,33 @@ + + + + generic + + + + + + +

+ + +

//root/[jvm root]/generic

generic

final fun <T : R, R : Any> generic()

Description

generic function

+ + + diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html new file mode 100644 index 00000000..bc4888ba --- /dev/null +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html @@ -0,0 +1,46 @@ + + + + [jvm root] + + + + + + +

+ + +

//root/[jvm root]

Package [jvm root]

Functions

+ + + + + + + + + +

generic	+ final fun <T : R, R : Any> generic() + +	+ JVM +

+ + + diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html index a3211166..440758c2 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html @@ -27,7 +27,7 @@ - <jvm root> + [jvm root]

JVM

diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list index 30905d0f..468c6cb4 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list @@ -1,5 +1,5 @@ $dokka.format:html $dokka.linkExtension:html -$dokka.location://generic/#//root//generic.html - +$dokka.location://generic/#//root/[jvm root]/generic.html +[jvm root] diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js index b8b18755..ee6a2f7a 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ { "name": "root", "location": "root/index.html" }, -{ "name": "", "location": "root//index.html" }, -{ "name": "generic", "location": "root//generic.html" } +{ "name": "[jvm root]", "location": "root/[jvm root]/index.html" }, +{ "name": "generic", "location": "root/[jvm root]/generic.html" } ] -- cgit