summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-06-10 19:00:22 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-06-10 19:00:22 +0000
commitf9bf6544a6c4e31c899c8429de40f24c7d78a6be (patch)
tree81b4077de776dc35002a3c07aad3025ffaa3c13a
parentd36a3f33e2b813c9ff48cffc062c6b875135ec49 (diff)
parent6f2c4a37418166fd4426a086510e35d6febdceb9 (diff)
downloadbase-f9bf6544a6c4e31c899c8429de40f24c7d78a6be.tar.gz
Merge "Fix kotlin deprecation warnings"
-rw-r--r--tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt2
-rw-r--r--tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt b/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt
index 2e60f64b21e8..27a8853a2219 100644
--- a/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt
+++ b/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt
@@ -97,7 +97,7 @@ class StaleDataclassProcessor: AbstractProcessor() {
private fun elemToString(elem: Element): String {
return buildString {
- append(elem.modifiers.joinToString(" ") { it.name.toLowerCase() })
+ append(elem.modifiers.joinToString(" ") { it.name.lowercase() })
append(" ")
append(elem.annotationMirrors.joinToString(" ", transform = { annotationToString(it) }))
append(" ")
diff --git a/tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt b/tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt
index a52c8042582b..451e514b8b33 100644
--- a/tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt
+++ b/tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt
@@ -29,7 +29,7 @@ object CodeUtils {
*/
fun hash(position: String, messageString: String, logLevel: LogLevel, logGroup: LogGroup): Int {
return (position + messageString + logLevel.name + logGroup.name)
- .map { c -> c.toInt() }.reduce { h, c -> h * 31 + c }
+ .map { c -> c.code }.reduce { h, c -> h * 31 + c }
}
fun checkWildcardStaticImported(code: CompilationUnit, className: String, fileName: String) {