summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2021-05-05 12:43:01 -0700
committerAurimas Liutikas <aurimas@google.com>2021-05-07 23:00:23 +0000
commitb8ca1157ab6d463a19f6a7bbfeb25d1f9f1be911 (patch)
tree9c0dafc4fee3f99c7236788cd46bb9eb1f366151 /tools
parentb9680bac79d94fb10252fde5aa527e34c6d6e17e (diff)
Fix incompatibilities with Kotlin 1.5.0
Test: make Change-Id: I9bc49c759d0b2527b6419f5d711e394402a7e781
Diffstat (limited to 'tools')
-rw-r--r--tools/codegen/src/com/android/codegen/Utils.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/codegen/src/com/android/codegen/Utils.kt b/tools/codegen/src/com/android/codegen/Utils.kt
index c19ae3b0b11f..a117aa09ab62 100644
--- a/tools/codegen/src/com/android/codegen/Utils.kt
+++ b/tools/codegen/src/com/android/codegen/Utils.kt
@@ -43,8 +43,8 @@ inline infix fun Int.times(action: () -> Unit) {
* cccc dd
*/
fun Iterable<Pair<String, String>>.columnize(separator: String = " | "): String {
- val col1w = map { (a, _) -> a.length }.max()!!
- val col2w = map { (_, b) -> b.length }.max()!!
+ val col1w = map { (a, _) -> a.length }.maxOrNull()!!
+ val col2w = map { (_, b) -> b.length }.maxOrNull()!!
return map { it.first.padEnd(col1w) + separator + it.second.padEnd(col2w) }.joinToString("\n")
}