diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2023-05-17 13:40:25 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2023-05-26 16:19:52 +0200 |
| commit | 2abd426cdc8a88b13c410f1e1793e9dad86b9180 (patch) | |
| tree | be49d6e779e94a9f1e4aa9ffefd5cabc9721c747 | |
| parent | gradle: bump to agp 8.1.0-beta03 (diff) | |
| download | wireguard-android-2abd426cdc8a88b13c410f1e1793e9dad86b9180.tar.xz wireguard-android-2abd426cdc8a88b13c410f1e1793e9dad86b9180.zip | |
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>
| -rw-r--r-- | gradle/libs.versions.toml | 2 | ||||
| -rw-r--r-- | ui/build.gradle.kts | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 21adde36..6277dd69 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.1.0-beta03" +agp = "8.2.0-alpha05" kotlin = "1.8.21" [libraries] diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index 136c636a..3672c1ee 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -4,9 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile 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() plugins { @@ -95,12 +92,3 @@ tasks.withType<JavaCompile>().configureEach { tasks.withType<KotlinCompile>().configureEach { 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")) - } -}
\ No newline at end of file |