diff options
| author | Colin Cross <ccross@android.com> | 2023-07-19 14:22:38 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2023-07-19 14:22:38 -0700 |
| commit | 7b150bbe96dcadbd05de199f8bbaaa96db6b4247 (patch) | |
| tree | 4058cd853f36166d424eee7e69e95ad3125d1189 | |
| parent | cc64ac551970d09a71cf0efbd75fdc5b21bcd373 (diff) | |
| download | dokka-7b150bbe96dcadbd05de199f8bbaaa96db6b4247.tar.gz | |
Remove -language-version flags from dokkaandroidx-platform-release
-language-version 1.3 is no longer supported by kotlinc 1.9.0. Remove
the flags and fix a compile error.
Bug: 291335478
Test: dokka -J--add-opens=java.base/java.lang=ALL-UNNAMED
Change-Id: I7e25b3b68cd75be802a3d92034f22e24cf800396
| -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 ?: "" |