From 3d439ae6a13adc64890896357d6e3cff5577e0e3 Mon Sep 17 00:00:00 2001 From: Carter Jernigan Date: Fri, 9 Jun 2023 09:19:09 -0400 Subject: [PATCH] [#751] AGP 8.0.2 * [#751] AGP 7.4.2 * [#874][#758][#751] Gradle 8.1.1 + AGP 8.0.2 - Dependency locks update - And the related changes the versions bump brings done as well - Dep issue template changed as appropriate now * [#875] Emulator.wtf 0.12.2 * Minor fixing changes after Gradle bump * Fix deprecated Runtime.exec() * Fix running screenshot tests We use the same pattern now as in the other pure test modules. * Fix jvm versions compatibility 'compileJava' task (current target is 1.8) and 'compileKotlin' task (current target is 17) jvm target compatibility should be set to the same Java version. --------- Co-authored-by: Honza --- .github/ISSUE_TEMPLATE/dependency.md | 1 - .github/workflows/pull-request.yml | 2 +- app/build.gradle.kts | 6 +- app/src/androidTest/AndroidManifest.xml | 4 +- app/src/main/AndroidManifest.xml | 2 + .../buildscript-gradle.lockfile | 69 +++---- build-conventions-secant/gradle.lockfile | 182 +++++++++--------- ...ecant.android-build-conventions.gradle.kts | 2 +- .../secant.rosetta-conventions.gradle.kts | 10 +- build.gradle.kts | 6 +- buildSrc/build.gradle.kts | 8 - buildSrc/buildscript-gradle.lockfile | 69 +++---- buildSrc/gradle.lockfile | 62 +++--- buildscript-gradle.lockfile | 148 +++++++------- .../build.gradle.kts | 4 + gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 62076 bytes gradle/wrapper/gradle-wrapper.properties | 5 +- gradlew | 11 +- ui-lib/build.gradle.kts | 1 + ui-screenshot-test/build.gradle.kts | 4 +- ui-screenshot-test/proguard-consumer.txt | 7 - .../src/main/AndroidManifest.xml | 11 +- 23 files changed, 308 insertions(+), 310 deletions(-) delete mode 100644 ui-screenshot-test/proguard-consumer.txt diff --git a/.github/ISSUE_TEMPLATE/dependency.md b/.github/ISSUE_TEMPLATE/dependency.md index 7672ec1d..4abac482 100644 --- a/.github/ISSUE_TEMPLATE/dependency.md +++ b/.github/ISSUE_TEMPLATE/dependency.md @@ -20,5 +20,4 @@ For Gradle itself: 1. Update the [Gradle SHA](https://gradle.org/release-checksums/) in `gradle/wrapper/gradle-wrapper.properties` 1. Update the Gradle wrapper by running `./gradlew wrapper --write-locks` 1. Verify no unexpected entries appear in the lockfiles. _A supply chain attack could occur during this stage. The lockfile narrows the supply chain attack window to this very moment (as opposed to every time a build occurs)_ -1. Re-add the [Gradle SHA](https://gradle.org/release-checksums/) to `gradle/wrapper/gradle-wrapper.properties` 1. Are there any new APIs or possible migrations? diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 712248ea..be40297f 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -572,7 +572,7 @@ jobs: with: name: Binaries - name: Robo test - timeout-minutes: 20 + timeout-minutes: 25 env: # Path depends on `release_build` job, plus path of `Download a single artifact` step BINARIES_ZIP_PATH: binaries.zip diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4206d77f..af96f997 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -249,7 +249,7 @@ androidComponents { ".readme", )) - if (variant.name.toLowerCase(Locale.US).contains("release")) { + if (variant.name.lowercase(Locale.US).contains("release")) { variant.packaging.resources.excludes.addAll(listOf( "**/*.kotlin_metadata", "DebugProbesKt.bin", @@ -299,10 +299,10 @@ if (googlePlayServiceKeyFilePath.isNotEmpty()) { fladle { // Firebase Test Lab has min and max values that might differ from our project's // These are determined by `gcloud firebase test android models list` - @Suppress("MagicNumber", "PropertyName", "VariableNaming") + @Suppress("MagicNumber", "VariableNaming") val FIREBASE_TEST_LAB_MIN_SDK = 27 // Minimum for Pixel2.arm device - @Suppress("MagicNumber", "PropertyName", "VariableNaming") + @Suppress("MagicNumber", "VariableNaming") val FIREBASE_TEST_LAB_MAX_SDK = 33 val minSdkVersion = run { diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml index 2adb9f36..8d449106 100644 --- a/app/src/androidTest/AndroidManifest.xml +++ b/app/src/androidTest/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 820912b5..49ef3fbc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,8 @@ + android:maxSdkVersion="29" + tools:ignore="ScopedStorage" /> + android:roundIcon="@mipmap/ic_launcher_round" /> - - - \ No newline at end of file