diff options
| author | Colin Cross <ccross@android.com> | 2023-07-20 03:21:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-20 03:21:50 +0000 |
| commit | 8541ac1c032c1641578d2964553222f01a265f2d (patch) | |
| tree | 4058cd853f36166d424eee7e69e95ad3125d1189 | |
| parent | 2cb80150c4bcdcd31dc10a82ef5a17f7a73a0ee5 (diff) | |
| parent | feffc8dfad06be566dec47c260fdbb092ff93d41 (diff) | |
| download | dokka-8541ac1c032c1641578d2964553222f01a265f2d.tar.gz | |
Remove -language-version flags from dokka am: 7b150bbe96 am: 77665b0384 am: f3d7b224f7 am: 836038d406 am: feffc8dfadstudio-2023.3.1-canary8studio-2023.3.1-canary03studio-2023.2.1-rc1studio-2023.2.1-canary05studio-2023.2.1-beta02android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/2666058
Change-Id: Ib87eea64e60c8fcf31930fb9500396ed61aae5b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index ba7933be7..dbfdb5030 100644 --- a/Android.bp +++ b/Android.bp @@ -50,7 +50,6 @@ 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 38921608b..59d898a2a 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 == NodeKind.Field && it.constantValue() != null + it.kind == 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 ?: ""
\ No newline at end of file + details(NodeKind.Modifier).firstOrNull { it.name in visibilityNames }?.name ?: "" |