Android: Upgrade Kotlin to 1.6.20

This commit is contained in:
kichikuou
2022-04-08 21:57:02 +09:00
parent 6184e93965
commit c8f1ef2b9e
2 changed files with 7 additions and 6 deletions
@@ -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)
+2 -1
View File
@@ -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"