From 6f2c4a37418166fd4426a086510e35d6febdceb9 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Thu, 2 Jun 2022 15:21:34 -0700
Subject: [PATCH] Fix kotlin deprecation warnings

Test: Presubmit
Change-Id: I3f64f72934e9cdc817a04ad14771478fe5be9664
---
 .../android/processor/staledataclass/StaleDataclassProcessor.kt | 2 +-
 tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt   | 2 +-
 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) {