aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Aman <marcin.aman@gmail.com>2021-01-07 19:19:09 +0100
committerMarcin Aman <marcin.aman@gmail.com>2021-01-07 19:19:09 +0100
commitafb1f44a76558c6997558b64a766e2f7bc2a9d36 (patch)
tree1213b98dc80da5926c8d8fd038c46bf437b062ba
parent1618e552c136e25d86bf0708e0d760841c77c139 (diff)
downloaddokka-afb1f44a76558c6997558b64a766e2f7bc2a9d36.tar.gz
dokka-afb1f44a76558c6997558b64a766e2f7bc2a9d36.tar.bz2
dokka-afb1f44a76558c6997558b64a766e2f7bc2a9d36.zip
Change logging level for conflicting documentation and remove unused ant file
-rw-r--r--build-docs.xml20
-rw-r--r--plugins/base/src/main/kotlin/translators/psi/parsers/PsiCommentsUtils.kt2
2 files changed, 1 insertions, 21 deletions
diff --git a/build-docs.xml b/build-docs.xml
deleted file mode 100644
index b46353b0..00000000
--- a/build-docs.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<project name="Dokka" default="document">
- <!-- Demonstrates the usage of the Dokka Ant task. Assumes Dokka has already been compiled -->
-
- <typedef resource="dokka-antlib.xml">
- <classpath>
- <fileset dir="runners/fatjar/build/libs" includes="dokka-fatjar-*.jar"/>
- </classpath>
- </typedef>
-
- <path id="dokka.source.path">
- <pathelement location="core/src/main/kotlin"/>
- <fileset dir="runners" includes="*/src/main/kotlin/**" />
- </path>
-
- <target name="document">
- <dokka srcref="dokka.source.path" outputdir="doc" modulename="dokka">
- <sourcelink path="." url="https://github.com/kotlin/dokka/blob/master" linesuffix="#L"/>
- </dokka>
- </target>
-</project>
diff --git a/plugins/base/src/main/kotlin/translators/psi/parsers/PsiCommentsUtils.kt b/plugins/base/src/main/kotlin/translators/psi/parsers/PsiCommentsUtils.kt
index 80b37052..798b01db 100644
--- a/plugins/base/src/main/kotlin/translators/psi/parsers/PsiCommentsUtils.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/parsers/PsiCommentsUtils.kt
@@ -36,7 +36,7 @@ internal fun findClosestDocComment(element: PsiNamedElement, logger: DokkaLogger
return superMethodDocumentation.single()
}
- logger.warn(
+ logger.debug(
"Conflicting documentation for ${DRI.from(element)}" +
"${superMethods.map { DRI.from(it) }}"
)