From 75044b13bf204e75f99f0090fa25232bcb12a7de Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Sat, 9 Apr 2022 08:37:49 +0900
Subject: [PATCH] Android: Upgrade Kotlin to 1.6.20

---
 .../app/src/main/java/io/github/kichikuou/system3/Launcher.kt  | 2 +-
 android/build.gradle                                           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/java/io/github/kichikuou/system3/Launcher.kt b/android/app/src/main/java/io/github/kichikuou/system3/Launcher.kt
index 81bf63b..633c191 100644
--- a/android/app/src/main/java/io/github/kichikuou/system3/Launcher.kt
+++ b/android/app/src/main/java/io/github/kichikuou/system3/Launcher.kt
@@ -234,7 +234,7 @@ class Launcher private constructor(private val rootDir: File) {
         fun maybeAdd(path: String) {
             val name = File(path).name
 
-            if (name.toLowerCase(Locale.US) == "adisk.dat") {
+            if (name.lowercase(Locale.US) == "adisk.dat") {
                 hasAdisk = true
             }
             audioRegex.matchEntire(name)?.let {
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"