From c8f1ef2b9eb6bf00cfc2dbb8970d49de23d2ec3c Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Fri, 8 Apr 2022 17:34:05 +0900
Subject: [PATCH] Android: Upgrade Kotlin to 1.6.20

---
 .../java/io/github/kichikuou/xsystem35/Launcher.kt     | 10 +++++-----
 android/build.gradle                                   |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt b/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt
index 05239fb..40615e0 100644
--- a/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt
+++ b/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt
@@ -249,18 +249,18 @@ class Launcher private constructor(private val rootDir: File) {
         fun maybeAdd(path: String) {
             val name = File(path).name
 
-            specialResources[name.toLowerCase(Locale.US)]?.let {
+            specialResources[name.lowercase(Locale.US)]?.let {
                 grb.appendLine("$it $path")
                 return
             }
             aldRegex.matchEntire(name)?.let {
-                val ext = it.groupValues[4].toUpperCase(Locale.US)
+                val ext = it.groupValues[4].uppercase(Locale.US)
                 val type = if (ext == "ALD") {
-                    aldType[it.groupValues[2].toLowerCase(Locale.US)]
+                    aldType[it.groupValues[2].lowercase(Locale.US)]
                 } else {
                     ext
                 }
-                val id = it.groupValues[3].toUpperCase(Locale.US)
+                val id = it.groupValues[3].uppercase(Locale.US)
                 if (type != null) {
                     grb.appendLine("$type$id $path")
                     basename = it.groupValues[1]
@@ -277,7 +277,7 @@ class Launcher private constructor(private val rootDir: File) {
 
         fun write(outDir: File) {
             for (id in 'A' .. 'Z') {
-                grb.appendLine("Save$id ../save/${basename}s${id.toLowerCase()}.asd")
+                grb.appendLine("Save$id ../save/${basename}s${id.lowercase(Locale.US)}.asd")
             }
             val gr = grb.toString()
             Log.i("xsystem35.gr", gr)
diff --git a/android/build.gradle b/android/build.gradle
index 954ff53..ec2933d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.32'
+    ext.kotlin_version = '1.6.20'
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
+        // AGP 7.1.x cannot be used due to https://issuetracker.google.com/issues/206099937
         classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"