aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-01-02 17:18:13 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-01-02 17:18:13 +0000
commit42b4abad47193114fe65a31523d6cef1c46bdaed (patch)
tree4058cd853f36166d424eee7e69e95ad3125d1189
parent55df0efb804c2ba1846b0f243c1e4e2cca4ec42f (diff)
parent9eb31ee9b55e9176608077a5d03b73d18410315b (diff)
downloaddokka-androidx-wear-compose-release.tar.gz
Snap for 11241554 from 9eb31ee9b55e9176608077a5d03b73d18410315b to androidx-wear-compose-releaseandroidx-wear-compose-release
Change-Id: Ief6c5452f8016d72a9a2997cd69722ec43d5b7aa
-rw-r--r--Android.bp1
-rw-r--r--core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt4
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 ?: ""