gradle: bump to agp 8.2.0-alpha05

I wanted to stay on 8.1 in hopes of landing on a stable channel, but
Google won't backport the RB fix, so we have to bump to 8.2 alphas.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2023-05-17 13:40:25 +02:00
parent c536f5cc7f
commit 2abd426cdc
2 changed files with 1 additions and 13 deletions

View File

@ -1,5 +1,5 @@
[versions] [versions]
agp = "8.1.0-beta03" agp = "8.2.0-alpha05"
kotlin = "1.8.21" kotlin = "1.8.21"
[libraries] [libraries]

View File

@ -4,9 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import com.android.build.gradle.tasks.ExtractSupportedLocalesTask import com.android.build.gradle.tasks.ExtractSupportedLocalesTask
// Grotesque workaround for https://issuetracker.google.com/issues/279780940
System.setProperty("com.android.tools.r8.disableApiModeling", "1")
val pkg: String = providers.gradleProperty("wireguardPackageName").get() val pkg: String = providers.gradleProperty("wireguardPackageName").get()
plugins { plugins {
@ -95,12 +92,3 @@ tasks.withType<JavaCompile>().configureEach {
tasks.withType<KotlinCompile>().configureEach { tasks.withType<KotlinCompile>().configureEach {
compilerOptions.jvmTarget.set(JvmTarget.JVM_17) compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
} }
// Grotesque workaround for https://issuetracker.google.com/issues/281825213
tasks.withType<ExtractSupportedLocalesTask>().configureEach {
doLast {
val file = localeList.asFile.get()
val lines = file.readLines()
file.writeText((listOf(lines[0]) + lines.subList(1, lines.size).sorted()).joinToString(separator = "\n"))
}
}