diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-23 22:39:21 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-23 22:39:21 +0000 |
commit | 99a9feff9db938e68a7ec7664972df6805543818 (patch) | |
tree | bcf74e351e509e16d04c9161307f9944ebc11be1 | |
parent | 92be6365e21c1634a51235443c3f49091e700104 (diff) | |
parent | b3269255adcd5e68b4de96e0f1f202107afc7796 (diff) | |
download | dokka-99a9feff9db938e68a7ec7664972df6805543818.tar.gz |
Snap for 9668463 from b3269255adcd5e68b4de96e0f1f202107afc7796 to androidx-profileinstaller-releaseandroidx-profileinstaller-release
Change-Id: I8fcdfe8d9337f5e8e4c3b356b85c3ede95ab32b5
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index dbfdb5030..ba7933be7 100644 --- a/Android.bp +++ b/Android.bp @@ -50,6 +50,7 @@ java_binary_host { // (it references packages under com.sun.tools.doclets which are not // exported from the jdk.javadoc module) (see b/140097603): java_version: "1.8", + kotlincflags: ["-language-version 1.3 -api-version 1.3 -jvm-target 1.8"], use_tools_jar: true, java_resource_dirs: ["core/src/main/resources"], } diff --git a/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt b/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt index 59d898a2a..38921608b 100644 --- a/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt +++ b/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt @@ -1068,7 +1068,7 @@ open class JavaLayoutHtmlFormatOutputBuilder( val inheritedFieldsByReceiver = allInheritedMembers.filter { - it.kind == NodeKind.Field && it.constantValue() != null + it == NodeKind.Field && it.constantValue() != null }.groupBy { it.owner!! } val originalExtensions = if (!isCompanion) node.extensions else node.owner!!.extensions @@ -1168,4 +1168,4 @@ fun DocumentationNode.constantValue(): String? = private val visibilityNames = setOf("public", "protected", "internal", "package-local", "private") fun DocumentationNode.visibility(): String = - details(NodeKind.Modifier).firstOrNull { it.name in visibilityNames }?.name ?: "" + details(NodeKind.Modifier).firstOrNull { it.name in visibilityNames }?.name ?: ""
\ No newline at end of file |