From 3f682be6091ba04f11fb35f3b47ae848f4e18585 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 15 Jun 2026 11:29:34 -0400 Subject: [PATCH] Upgrade AGP to 9.2.1 --- app/lint-baseline.xml | 12 + gradle/libs.versions.toml | 6 +- gradle/lint-libs.versions.toml | 2 +- gradle/verification-metadata.xml | 521 +++++++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- reproducible-builds/Dockerfile | 2 +- 6 files changed, 539 insertions(+), 6 deletions(-) diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml index 1d9c766d4c..109903019a 100644 --- a/app/lint-baseline.xml +++ b/app/lint-baseline.xml @@ -37438,4 +37438,16 @@ column="25"/> + + + + + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a51f034ecf..14ec6db923 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,15 +4,15 @@ [versions] # SDK & Build Versions buildTools = "36.0.0" -compileSdk = "android-36" +compileSdk = "android-36.1" targetSdk = "35" minSdk = "23" ndk = "28.0.13004108" javaVersion = "17" kotlinJvmTarget = "17" -gradle = "9.1.1" +gradle = "9.2.1" kotlin = "2.2.20" -android-gradle-plugin = "9.1.1" +android-gradle-plugin = "9.2.1" # Other versions androidx-appcompat = "1.7.1" diff --git a/gradle/lint-libs.versions.toml b/gradle/lint-libs.versions.toml index 92c827640a..0b0cbdaacd 100644 --- a/gradle/lint-libs.versions.toml +++ b/gradle/lint-libs.versions.toml @@ -2,7 +2,7 @@ # ./gradlew --write-verification-metadata sha256 qa --rerun-tasks [versions] -lint = "32.1.1" +lint = "32.2.1" [libraries] lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "lint" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 949104e59f..30ed976603 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -5076,6 +5076,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5108,6 +5113,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -5152,6 +5162,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -9901,6 +9919,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -9933,6 +9956,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -9994,6 +10022,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10038,6 +10071,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10082,6 +10120,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10145,6 +10188,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10182,6 +10230,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10221,6 +10274,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10260,6 +10318,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10299,6 +10362,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10331,6 +10399,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10370,6 +10443,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10409,6 +10487,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10448,6 +10531,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10508,6 +10596,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10574,6 +10667,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -10628,6 +10729,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -10660,6 +10769,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10692,6 +10806,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -10746,6 +10865,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -10812,6 +10939,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -10866,6 +11001,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -10947,6 +11090,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -11001,6 +11152,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -11025,6 +11184,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -11079,6 +11246,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -11143,6 +11318,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -11213,6 +11396,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11240,6 +11428,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11277,6 +11470,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11314,6 +11512,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11351,6 +11554,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11390,6 +11598,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11427,6 +11640,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11464,6 +11682,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11501,6 +11724,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11526,6 +11754,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11565,6 +11798,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11587,6 +11825,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11619,6 +11862,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11663,6 +11911,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -11695,6 +11951,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11826,6 +12087,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -11858,6 +12127,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11902,6 +12176,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -11934,6 +12216,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -11978,6 +12265,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -12010,6 +12305,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -12054,6 +12354,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -12081,6 +12389,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -12125,6 +12438,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -12157,6 +12478,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -12201,6 +12527,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -12233,6 +12567,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -12295,6 +12634,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -12327,6 +12674,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -12343,6 +12695,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -12359,6 +12719,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -12392,6 +12760,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -15123,6 +15499,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + @@ -17173,6 +17552,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -17585,6 +17972,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -17639,6 +18031,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -17685,6 +18085,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -17731,6 +18139,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -17765,6 +18178,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -17866,6 +18284,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -17917,6 +18340,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -18038,6 +18466,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -18067,6 +18503,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -18142,6 +18583,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -18190,6 +18639,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -18219,6 +18676,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -18306,6 +18768,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -18335,6 +18802,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -18393,6 +18865,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -18525,6 +19002,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -18561,6 +19043,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -18981,6 +19471,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + @@ -19349,6 +19850,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -19378,6 +19884,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -19407,6 +19918,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -19424,6 +19940,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c65c65438..daee2e0ed7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile index 7541bf57ed..6772a04010 100644 --- a/reproducible-builds/Dockerfile +++ b/reproducible-builds/Dockerfile @@ -16,7 +16,7 @@ RUN apt install -y git openjdk-17-jdk unzip wget ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME=commandlinetools-linux-10406996_latest.zip ENV ANDROID_COMMAND_LINE_TOOLS_SHA256=8919e8752979db73d8321e9babe2caedcc393750817c1a5f56c128ec442fb540 -ENV ANDROID_API_LEVELS=android-36 +ENV ANDROID_API_LEVELS=android-36.1 ENV ANDROID_BUILD_TOOLS_VERSION=36.0.0 ENV ANDROID_HOME=/usr/local/android-sdk-linux