From a65aec18a453e765392647e460b3589a36c49a45 Mon Sep 17 00:00:00 2001 From: Carter Jernigan Date: Wed, 11 May 2022 16:24:52 -0400 Subject: [PATCH] [#418] Android Gradle Plugin 7.2.0 --- .github/workflows/pull-request.yml | 2 +- build-convention/gradle.lockfile | 95 +++++++++---------- buildscript-gradle.lockfile | 78 +++++++-------- gradle.properties | 2 +- ui-lib/src/androidTest/AndroidManifest.xml | 6 +- .../co/electriccoin/zcash/ui/MainActivity.kt | 3 + 6 files changed, 93 insertions(+), 93 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 4a845de8..d7e3c710 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -231,7 +231,7 @@ jobs: workload_identity_provider: ${{ secrets.FIREBASE_TEST_LAB_WORKLOAD_IDENTITY_PROVIDER }} access_token_lifetime: '1200s' - name: Test - timeout-minutes: 25 + timeout-minutes: 30 env: # This first environment variable is used by Flank, since the temporary token is missing the project name GOOGLE_CLOUD_PROJECT: ${{ secrets.FIREBASE_TEST_LAB_PROJECT }} diff --git a/build-convention/gradle.lockfile b/build-convention/gradle.lockfile index 44a1637e..8a184ea9 100644 --- a/build-convention/gradle.lockfile +++ b/build-convention/gradle.lockfile @@ -1,44 +1,45 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.databinding:databinding-common:7.1.3=runtimeClasspath -androidx.databinding:databinding-compiler-common:7.1.3=runtimeClasspath -com.android.databinding:baseLibrary:7.1.3=runtimeClasspath -com.android.tools.analytics-library:crash:30.1.3=runtimeClasspath -com.android.tools.analytics-library:protos:30.1.3=runtimeClasspath -com.android.tools.analytics-library:shared:30.1.3=runtimeClasspath -com.android.tools.analytics-library:tracker:30.1.3=runtimeClasspath +androidx.databinding:databinding-common:7.2.0=runtimeClasspath +androidx.databinding:databinding-compiler-common:7.2.0=runtimeClasspath +com.android.databinding:baseLibrary:7.2.0=runtimeClasspath +com.android.tools.analytics-library:crash:30.2.0=runtimeClasspath +com.android.tools.analytics-library:protos:30.2.0=runtimeClasspath +com.android.tools.analytics-library:shared:30.2.0=runtimeClasspath +com.android.tools.analytics-library:tracker:30.2.0=runtimeClasspath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=runtimeClasspath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=runtimeClasspath -com.android.tools.build:aapt2-proto:7.1.3-7984345=runtimeClasspath -com.android.tools.build:aaptcompiler:7.1.3=runtimeClasspath -com.android.tools.build:apksig:7.1.3=compileClasspath,runtimeClasspath -com.android.tools.build:apkzlib:7.1.3=compileClasspath,runtimeClasspath -com.android.tools.build:builder-model:7.1.3=compileClasspath,runtimeClasspath -com.android.tools.build:builder-test-api:7.1.3=runtimeClasspath -com.android.tools.build:builder:7.1.3=compileClasspath,runtimeClasspath -com.android.tools.build:bundletool:1.8.0=runtimeClasspath -com.android.tools.build:gradle-api:7.1.3=compileClasspath,runtimeClasspath -com.android.tools.build:gradle:7.1.3=compileClasspath,runtimeClasspath -com.android.tools.build:manifest-merger:30.1.3=compileClasspath,runtimeClasspath +com.android.tools.build:aapt2-proto:7.2.0-7984345=runtimeClasspath +com.android.tools.build:aaptcompiler:7.2.0=runtimeClasspath +com.android.tools.build:apksig:7.2.0=compileClasspath,runtimeClasspath +com.android.tools.build:apkzlib:7.2.0=compileClasspath,runtimeClasspath +com.android.tools.build:builder-model:7.2.0=compileClasspath,runtimeClasspath +com.android.tools.build:builder-test-api:7.2.0=runtimeClasspath +com.android.tools.build:builder:7.2.0=compileClasspath,runtimeClasspath +com.android.tools.build:bundletool:1.8.2=runtimeClasspath +com.android.tools.build:gradle-api:7.2.0=compileClasspath,runtimeClasspath +com.android.tools.build:gradle:7.2.0=compileClasspath,runtimeClasspath +com.android.tools.build:manifest-merger:30.2.0=compileClasspath,runtimeClasspath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=runtimeClasspath -com.android.tools.ddms:ddmlib:30.1.3=runtimeClasspath -com.android.tools.layoutlib:layoutlib-api:30.1.3=runtimeClasspath -com.android.tools.lint:lint-model:30.1.3=runtimeClasspath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.1.3=runtimeClasspath -com.android.tools.utp:android-device-provider-gradle-proto:30.1.3=runtimeClasspath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.1.3=runtimeClasspath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.1.3=runtimeClasspath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.1.3=runtimeClasspath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.1.3=runtimeClasspath -com.android.tools:annotations:30.1.3=runtimeClasspath -com.android.tools:common:30.1.3=runtimeClasspath -com.android.tools:dvlib:30.1.3=runtimeClasspath -com.android.tools:repository:30.1.3=runtimeClasspath -com.android.tools:sdk-common:30.1.3=runtimeClasspath -com.android.tools:sdklib:30.1.3=runtimeClasspath -com.android:signflinger:7.1.3=runtimeClasspath -com.android:zipflinger:7.1.3=compileClasspath,runtimeClasspath +com.android.tools.ddms:ddmlib:30.2.0=runtimeClasspath +com.android.tools.layoutlib:layoutlib-api:30.2.0=runtimeClasspath +com.android.tools.lint:lint-model:30.2.0=runtimeClasspath +com.android.tools.lint:lint-typedef-remover:30.2.0=runtimeClasspath +com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.0=runtimeClasspath +com.android.tools.utp:android-device-provider-gradle-proto:30.2.0=runtimeClasspath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.0=runtimeClasspath +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.0=runtimeClasspath +com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.0=runtimeClasspath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.0=runtimeClasspath +com.android.tools:annotations:30.2.0=runtimeClasspath +com.android.tools:common:30.2.0=runtimeClasspath +com.android.tools:dvlib:30.2.0=runtimeClasspath +com.android.tools:repository:30.2.0=runtimeClasspath +com.android.tools:sdk-common:30.2.0=runtimeClasspath +com.android.tools:sdklib:30.2.0=runtimeClasspath +com.android:signflinger:7.2.0=runtimeClasspath +com.android:zipflinger:7.2.0=compileClasspath,runtimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.1=runtimeClasspath com.fasterxml.jackson.core:jackson-core:2.11.1=runtimeClasspath com.fasterxml.jackson.core:jackson-databind:2.11.1=runtimeClasspath @@ -71,7 +72,7 @@ com.squareup:javawriter:2.5.0=compileClasspath,runtimeClasspath com.sun.activation:javax.activation:1.2.0=runtimeClasspath com.sun.istack:istack-commons-runtime:3.0.8=runtimeClasspath com.sun.xml.fastinfoset:FastInfoset:1.2.16=runtimeClasspath -commons-codec:commons-codec:1.10=runtimeClasspath +commons-codec:commons-codec:1.11=runtimeClasspath commons-io:commons-io:2.4=runtimeClasspath commons-logging:commons-logging:1.2=runtimeClasspath de.undercouch:gradle-download-task:4.1.1=runtimeClasspath @@ -102,10 +103,9 @@ net.java.dev.jna:jna-platform:5.6.0=runtimeClasspath net.java.dev.jna:jna:5.6.0=runtimeClasspath net.sf.jopt-simple:jopt-simple:4.9=runtimeClasspath net.sf.kxml:kxml2:2.3.0=runtimeClasspath -org.antlr:antlr4:4.5.3=runtimeClasspath org.apache.commons:commons-compress:1.20=runtimeClasspath -org.apache.httpcomponents:httpclient:4.5.6=runtimeClasspath -org.apache.httpcomponents:httpcore:4.4.10=runtimeClasspath +org.apache.httpcomponents:httpclient:4.5.9=runtimeClasspath +org.apache.httpcomponents:httpcore:4.4.11=runtimeClasspath org.apache.httpcomponents:httpmime:4.5.6=runtimeClasspath org.bitbucket.b_c:jose4j:0.7.0=runtimeClasspath org.bouncycastle:bcpkix-jdk15on:1.56=runtimeClasspath @@ -138,8 +138,7 @@ org.jetbrains.kotlin:kotlin-native-utils:1.5.31=kotlinCompilerPluginClasspathMai org.jetbrains.kotlin:kotlin-native-utils:1.6.20=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-project-model:1.5.31=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-project-model:1.6.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-reflect:1.4.32=runtimeClasspath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=compileClasspath,kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.5.31=compileClasspath,kotlinCompilerClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-sam-with-receiver:1.5.31=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-script-runtime:1.5.31=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=kotlinCompilerPluginClasspathMain @@ -150,14 +149,12 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=kotlinComp org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20=runtimeClasspath org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.0=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.0=kotlinCompilerPluginClasspathMain,runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=compileClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0=kotlinCompilerPluginClasspathMain,runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=compileClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.5.0=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0=kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.5.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20=runtimeClasspath org.jetbrains.kotlin:kotlin-util-io:1.5.31=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-util-io:1.6.20=compileClasspath,runtimeClasspath diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile index 27339289..79f2f097 100644 --- a/buildscript-gradle.lockfile +++ b/buildscript-gradle.lockfile @@ -1,44 +1,45 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.databinding:databinding-common:7.1.3=classpath -androidx.databinding:databinding-compiler-common:7.1.3=classpath -com.android.databinding:baseLibrary:7.1.3=classpath -com.android.tools.analytics-library:crash:30.1.3=classpath -com.android.tools.analytics-library:protos:30.1.3=classpath -com.android.tools.analytics-library:shared:30.1.3=classpath -com.android.tools.analytics-library:tracker:30.1.3=classpath +androidx.databinding:databinding-common:7.2.0=classpath +androidx.databinding:databinding-compiler-common:7.2.0=classpath +com.android.databinding:baseLibrary:7.2.0=classpath +com.android.tools.analytics-library:crash:30.2.0=classpath +com.android.tools.analytics-library:protos:30.2.0=classpath +com.android.tools.analytics-library:shared:30.2.0=classpath +com.android.tools.analytics-library:tracker:30.2.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath -com.android.tools.build:aapt2-proto:7.1.3-7984345=classpath -com.android.tools.build:aaptcompiler:7.1.3=classpath -com.android.tools.build:apksig:7.1.3=classpath -com.android.tools.build:apkzlib:7.1.3=classpath -com.android.tools.build:builder-model:7.1.3=classpath -com.android.tools.build:builder-test-api:7.1.3=classpath -com.android.tools.build:builder:7.1.3=classpath -com.android.tools.build:bundletool:1.8.0=classpath -com.android.tools.build:gradle-api:7.1.3=classpath -com.android.tools.build:gradle:7.1.3=classpath -com.android.tools.build:manifest-merger:30.1.3=classpath +com.android.tools.build:aapt2-proto:7.2.0-7984345=classpath +com.android.tools.build:aaptcompiler:7.2.0=classpath +com.android.tools.build:apksig:7.2.0=classpath +com.android.tools.build:apkzlib:7.2.0=classpath +com.android.tools.build:builder-model:7.2.0=classpath +com.android.tools.build:builder-test-api:7.2.0=classpath +com.android.tools.build:builder:7.2.0=classpath +com.android.tools.build:bundletool:1.8.2=classpath +com.android.tools.build:gradle-api:7.2.0=classpath +com.android.tools.build:gradle:7.2.0=classpath +com.android.tools.build:manifest-merger:30.2.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.1.3=classpath -com.android.tools.layoutlib:layoutlib-api:30.1.3=classpath -com.android.tools.lint:lint-model:30.1.3=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.1.3=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.1.3=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.1.3=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.1.3=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.1.3=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.1.3=classpath -com.android.tools:annotations:30.1.3=classpath -com.android.tools:common:30.1.3=classpath -com.android.tools:dvlib:30.1.3=classpath -com.android.tools:repository:30.1.3=classpath -com.android.tools:sdk-common:30.1.3=classpath -com.android.tools:sdklib:30.1.3=classpath -com.android:signflinger:7.1.3=classpath -com.android:zipflinger:7.1.3=classpath +com.android.tools.ddms:ddmlib:30.2.0=classpath +com.android.tools.layoutlib:layoutlib-api:30.2.0=classpath +com.android.tools.lint:lint-model:30.2.0=classpath +com.android.tools.lint:lint-typedef-remover:30.2.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:30.2.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.0=classpath +com.android.tools:annotations:30.2.0=classpath +com.android.tools:common:30.2.0=classpath +com.android.tools:dvlib:30.2.0=classpath +com.android.tools:repository:30.2.0=classpath +com.android.tools:sdk-common:30.2.0=classpath +com.android.tools:sdklib:30.2.0=classpath +com.android:signflinger:7.2.0=classpath +com.android:zipflinger:7.2.0=classpath com.fasterxml.jackson.core:jackson-annotations:2.11.1=classpath com.fasterxml.jackson.core:jackson-core:2.11.1=classpath com.fasterxml.jackson.core:jackson-databind:2.11.1=classpath @@ -76,7 +77,7 @@ com.sun.activation:javax.activation:1.2.0=classpath com.sun.istack:istack-commons-runtime:3.0.8=classpath com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath com.thoughtworks.xstream:xstream:1.4.17=classpath -commons-codec:commons-codec:1.10=classpath +commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath @@ -111,10 +112,9 @@ net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.antlr:antlr4:4.5.3=classpath org.apache.commons:commons-compress:1.20=classpath -org.apache.httpcomponents:httpclient:4.5.6=classpath -org.apache.httpcomponents:httpcore:4.4.10=classpath +org.apache.httpcomponents:httpclient:4.5.9=classpath +org.apache.httpcomponents:httpcore:4.4.11=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath org.bouncycastle:bcpkix-jdk15on:1.56=classpath diff --git a/gradle.properties b/gradle.properties index f693f247..6cf2fc72 100644 --- a/gradle.properties +++ b/gradle.properties @@ -62,7 +62,7 @@ ANDROID_COMPILE_SDK_VERSION=31 ANDROID_NDK_VERSION=23.0.7599858 -ANDROID_GRADLE_PLUGIN_VERSION=7.1.3 +ANDROID_GRADLE_PLUGIN_VERSION=7.2.0 DETEKT_VERSION=1.19.0 FLANK_VERSION=21.09.0 FULLADLE_VERSION=0.17.3 diff --git a/ui-lib/src/androidTest/AndroidManifest.xml b/ui-lib/src/androidTest/AndroidManifest.xml index d20f8bb3..9174f6a7 100644 --- a/ui-lib/src/androidTest/AndroidManifest.xml +++ b/ui-lib/src/androidTest/AndroidManifest.xml @@ -1,15 +1,15 @@ + package="co.electriccoin.zcash.ui.test"> diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/MainActivity.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/MainActivity.kt index 82db607c..487b1cee 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/MainActivity.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/MainActivity.kt @@ -1,5 +1,6 @@ package co.electriccoin.zcash.ui +import android.annotation.SuppressLint import android.content.ClipboardManager import android.content.Context import android.content.Intent @@ -229,6 +230,8 @@ class MainActivity : ComponentActivity() { @Composable private fun Navigation() { val navController = rememberNavController().also { + // This suppress is necessary, as this is how we set up the nav controller for tests. + @SuppressLint("RestrictedApi") navControllerForTesting = it }