Snap for 10791035 from 7b150bbe96dcadbd05de199f8bbaaa96db6b4247 to androidx-activity-release
Change-Id: I4574860ebb5c52a19f9f85942b41ebf3867c0650
diff --git a/Android.bp b/Android.bp
index ba7933b..dbfdb50 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,7 +50,6 @@
// (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 3892160..59d898a 100644
--- a/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt
+++ b/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt
@@ -1068,7 +1068,7 @@
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 @@
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 ?: ""
