From 04eef619344ac13e13bec77c0ad5a2b30b314a20 Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Mon, 5 Aug 2019 19:02:00 +0300 Subject: Fix nested annotation and perPackageOptions bugs --- core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt | 2 +- .../org/jetbrains/dokka/gradle/configurationImplementations.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt index 2eaf4af2..3b368329 100644 --- a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt +++ b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt @@ -316,7 +316,7 @@ class JavaPsiDocumentationBuilder : JavaDocumentationBuilder { val existing = refGraph.lookup(getSignature(psiClass)!!) if (existing != null) return existing val new = psiClass.build() - val packageNode = findOrCreatePackageNode(null, (psiClass.parent as PsiJavaFile).packageName, emptyMap(), refGraph) + val packageNode = findOrCreatePackageNode(null, (psiClass.containingFile as PsiJavaFile).packageName, emptyMap(), refGraph) packageNode.append(new, RefKind.Member) return new } diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt index 2c071bf8..fd5ea151 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt @@ -126,10 +126,10 @@ class GradleDokkaConfigurationImpl: DokkaConfiguration { class GradlePackageOptionsImpl: PackageOptions, Serializable { override var prefix: String = "" - override val includeNonPublic: Boolean = false - override val reportUndocumented: Boolean = true - override val skipDeprecated: Boolean = true - override val suppress: Boolean = false + override var includeNonPublic: Boolean = false + override var reportUndocumented: Boolean = true + override var skipDeprecated: Boolean = true + override var suppress: Boolean = false } fun GradlePassConfigurationImpl.copy(): GradlePassConfigurationImpl { -- cgit