diff --git a/build-logic/plugins/src/main/java/UpdateVerificationMetadataTask.kt b/build-logic/plugins/src/main/java/UpdateVerificationMetadataTask.kt index ce6109a40c..bace230147 100644 --- a/build-logic/plugins/src/main/java/UpdateVerificationMetadataTask.kt +++ b/build-logic/plugins/src/main/java/UpdateVerificationMetadataTask.kt @@ -55,10 +55,12 @@ constructor( StandardCharsets.UTF_8 ) - // The qa build resolves everything a clean qa run needs, including tooling that is only pulled while a + // The qaRemote build resolves everything a clean CI run needs, including tooling that is only pulled while a // task executes -- the KSP compiler, the aapt2 executable, and the layoutlib screenshot renderer all come - // in through detached configurations. Finally the cross-platform sync fills in aapt2's other OS variants. - runGradle("--write-verification-metadata", "sha256", "qa") + // in through detached configurations. It has to be qaRemote rather than qa, because screenshot validation + // is wired into the remote tasks only and plain qa never resolves layoutlib-runtime. Finally the + // cross-platform sync fills in aapt2's other OS variants. + runGradle("--write-verification-metadata", "sha256", "qaRemote") // The build-logic precompiled-script-plugin accessors are generated by applying each plugin in throwaway // nested builds, which resolve plugin dependencies (e.g. junit BOMs) that no configuration walk or qa build // ever sees. Forcing a refresh re-downloads them through the verifier so their checksums get written. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index edb1739af5..00876d2e57 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -53,7 +53,7 @@ android-application = { module = "com.android.application:com.android.applicatio androidx-benchmark-gradle-plugin = "androidx.benchmark:benchmark-gradle-plugin:1.4.1" # Compose -androidx-compose-bom = "androidx.compose:compose-bom:2026.06.01" +androidx-compose-bom = "androidx.compose:compose-bom:2026.09.00" androidx-compose-material3 = { module = "androidx.compose.material3:material3" } androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive"} androidx-compose-material-icons-extended = "androidx.compose.material:material-icons-extended:1.7.8" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 8b3bfa87cf..99b062d5ca 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -589,12 +589,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -602,12 +602,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + @@ -618,54 +618,44 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - - - - - - - - - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -678,20 +668,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + - - - + + + - - + + @@ -702,28 +692,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - + - - - + + + - - + + @@ -774,28 +764,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + - - - + + + - + - - + + - - + + @@ -822,76 +812,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -912,12 +854,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -930,12 +872,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + @@ -951,36 +893,36 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + - - - + + + - + - - - + + + - - + + - - - + + + - - + + @@ -996,12 +938,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -1017,28 +959,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + - - - + + + - + - - + + - - + + @@ -1054,9 +996,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -1064,12 +1006,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + @@ -1077,12 +1019,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -1103,11 +1045,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + @@ -1121,20 +1063,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + - - - + + + - - + + @@ -1150,12 +1092,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + @@ -1178,12 +1120,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + @@ -1194,28 +1136,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + - - - + + + - + - - + + - - + + @@ -1226,76 +1168,76 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - - + + @@ -1306,100 +1248,100 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - + - - - + + + - - + + @@ -1410,28 +1352,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + - - - + + + - + - - - + + + - - + + @@ -1442,28 +1384,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - + - - - + + + - + - - + + - - + + @@ -1560,11 +1502,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -3654,14 +3591,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -3718,14 +3647,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -3734,25 +3655,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - + + @@ -3763,6 +3671,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -3771,14 +3687,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -4285,9 +4193,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -4492,36 +4400,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4547,31 +4430,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - @@ -4582,11 +4450,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -4644,11 +4507,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -4762,11 +4620,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -4778,14 +4631,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -4856,71 +4701,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5783,111 +5578,31 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5984,126 +5699,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6128,22 +5723,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - - @@ -6325,14 +5904,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6341,14 +5912,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6367,14 +5930,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6383,14 +5938,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6399,14 +5946,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6415,14 +5954,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6431,14 +5962,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6447,14 +5970,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6463,14 +5978,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6479,14 +5986,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6530,11 +6029,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -6550,11 +6044,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -6570,11 +6059,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -6596,26 +6080,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - @@ -6644,14 +6113,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6728,11 +6189,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -6767,14 +6223,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6783,14 +6231,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6814,11 +6254,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -6834,11 +6269,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -6879,11 +6309,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -6904,11 +6329,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -6950,14 +6370,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -6976,11 +6388,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7013,14 +6420,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -7045,14 +6444,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -7071,11 +6462,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7112,11 +6498,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7132,11 +6513,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7172,11 +6548,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7207,11 +6578,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7227,24 +6593,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - @@ -7336,16 +6689,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - @@ -7414,9 +6757,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - @@ -7424,14 +6764,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -7464,16 +6796,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - @@ -7494,11 +6816,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7519,11 +6836,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7544,11 +6856,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7569,11 +6876,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7589,11 +6891,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7609,11 +6906,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7629,11 +6921,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7662,11 +6949,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - @@ -7683,14 +6965,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -7815,14 +7089,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -8049,9 +7315,9 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + @@ -8064,11 +7330,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - -