From c0a4dd6cb079bce4a79dd9e37b3adcdd8bcf04ba Mon Sep 17 00:00:00 2001 From: Carter Jernigan Date: Thu, 9 Feb 2023 14:43:07 -0500 Subject: [PATCH] [#751] AGP 7.4.2 --- build-conventions-secant/gradle.lockfile | 72 ++++++++++++------------ buildscript-gradle.lockfile | 72 ++++++++++++------------ configuration-api-lib/gradle.lockfile | 37 ++++++++++++ gradle.properties | 2 +- 4 files changed, 110 insertions(+), 73 deletions(-) create mode 100644 configuration-api-lib/gradle.lockfile diff --git a/build-conventions-secant/gradle.lockfile b/build-conventions-secant/gradle.lockfile index bb0014d8..d3a0988f 100644 --- a/build-conventions-secant/gradle.lockfile +++ b/build-conventions-secant/gradle.lockfile @@ -1,46 +1,46 @@ # 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.4.0=runtimeClasspath -androidx.databinding:databinding-compiler-common:7.4.0=runtimeClasspath -com.android.databinding:baseLibrary:7.4.0=runtimeClasspath -com.android.tools.analytics-library:crash:30.4.0=runtimeClasspath -com.android.tools.analytics-library:protos:30.4.0=runtimeClasspath -com.android.tools.analytics-library:shared:30.4.0=runtimeClasspath -com.android.tools.analytics-library:tracker:30.4.0=runtimeClasspath +androidx.databinding:databinding-common:7.4.2=runtimeClasspath +androidx.databinding:databinding-compiler-common:7.4.2=runtimeClasspath +com.android.databinding:baseLibrary:7.4.2=runtimeClasspath +com.android.tools.analytics-library:crash:30.4.2=runtimeClasspath +com.android.tools.analytics-library:protos:30.4.2=runtimeClasspath +com.android.tools.analytics-library:shared:30.4.2=runtimeClasspath +com.android.tools.analytics-library:tracker:30.4.2=runtimeClasspath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=runtimeClasspath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=runtimeClasspath -com.android.tools.build:aapt2-proto:7.4.0-8841542=runtimeClasspath -com.android.tools.build:aaptcompiler:7.4.0=runtimeClasspath -com.android.tools.build:apksig:7.4.0=compileClasspath,runtimeClasspath -com.android.tools.build:apkzlib:7.4.0=compileClasspath,runtimeClasspath -com.android.tools.build:builder-model:7.4.0=compileClasspath,runtimeClasspath -com.android.tools.build:builder-test-api:7.4.0=runtimeClasspath -com.android.tools.build:builder:7.4.0=compileClasspath,runtimeClasspath +com.android.tools.build:aapt2-proto:7.4.2-8841542=runtimeClasspath +com.android.tools.build:aaptcompiler:7.4.2=runtimeClasspath +com.android.tools.build:apksig:7.4.2=compileClasspath,runtimeClasspath +com.android.tools.build:apkzlib:7.4.2=compileClasspath,runtimeClasspath +com.android.tools.build:builder-model:7.4.2=compileClasspath,runtimeClasspath +com.android.tools.build:builder-test-api:7.4.2=runtimeClasspath +com.android.tools.build:builder:7.4.2=compileClasspath,runtimeClasspath com.android.tools.build:bundletool:1.11.4=runtimeClasspath -com.android.tools.build:gradle-api:7.4.0=compileClasspath,runtimeClasspath -com.android.tools.build:gradle-settings-api:7.4.0=runtimeClasspath -com.android.tools.build:gradle:7.4.0=compileClasspath,runtimeClasspath -com.android.tools.build:manifest-merger:30.4.0=compileClasspath,runtimeClasspath +com.android.tools.build:gradle-api:7.4.2=compileClasspath,runtimeClasspath +com.android.tools.build:gradle-settings-api:7.4.2=runtimeClasspath +com.android.tools.build:gradle:7.4.2=compileClasspath,runtimeClasspath +com.android.tools.build:manifest-merger:30.4.2=compileClasspath,runtimeClasspath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=runtimeClasspath -com.android.tools.ddms:ddmlib:30.4.0=runtimeClasspath -com.android.tools.layoutlib:layoutlib-api:30.4.0=runtimeClasspath -com.android.tools.lint:lint-model:30.4.0=runtimeClasspath -com.android.tools.lint:lint-typedef-remover:30.4.0=runtimeClasspath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.0=runtimeClasspath -com.android.tools.utp:android-device-provider-gradle-proto:30.4.0=runtimeClasspath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.0=runtimeClasspath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.0=runtimeClasspath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.0=runtimeClasspath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.0=runtimeClasspath -com.android.tools:annotations:30.4.0=runtimeClasspath -com.android.tools:common:30.4.0=runtimeClasspath -com.android.tools:dvlib:30.4.0=runtimeClasspath -com.android.tools:repository:30.4.0=runtimeClasspath -com.android.tools:sdk-common:30.4.0=runtimeClasspath -com.android.tools:sdklib:30.4.0=runtimeClasspath -com.android:signflinger:7.4.0=runtimeClasspath -com.android:zipflinger:7.4.0=compileClasspath,runtimeClasspath +com.android.tools.ddms:ddmlib:30.4.2=runtimeClasspath +com.android.tools.layoutlib:layoutlib-api:30.4.2=runtimeClasspath +com.android.tools.lint:lint-model:30.4.2=runtimeClasspath +com.android.tools.lint:lint-typedef-remover:30.4.2=runtimeClasspath +com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2=runtimeClasspath +com.android.tools.utp:android-device-provider-gradle-proto:30.4.2=runtimeClasspath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2=runtimeClasspath +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2=runtimeClasspath +com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2=runtimeClasspath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2=runtimeClasspath +com.android.tools:annotations:30.4.2=runtimeClasspath +com.android.tools:common:30.4.2=runtimeClasspath +com.android.tools:dvlib:30.4.2=runtimeClasspath +com.android.tools:repository:30.4.2=runtimeClasspath +com.android.tools:sdk-common:30.4.2=runtimeClasspath +com.android.tools:sdklib:30.4.2=runtimeClasspath +com.android:signflinger:7.4.2=runtimeClasspath +com.android:zipflinger:7.4.2=compileClasspath,runtimeClasspath com.google.android:annotations:4.1.1.4=runtimeClasspath com.google.api.grpc:proto-google-common-protos:2.0.1=runtimeClasspath com.google.auto.value:auto-value-annotations:1.6.2=runtimeClasspath diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile index a61ecb6a..489143e2 100644 --- a/buildscript-gradle.lockfile +++ b/buildscript-gradle.lockfile @@ -1,46 +1,46 @@ # 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.4.0=classpath -androidx.databinding:databinding-compiler-common:7.4.0=classpath -com.android.databinding:baseLibrary:7.4.0=classpath -com.android.tools.analytics-library:crash:30.4.0=classpath -com.android.tools.analytics-library:protos:30.4.0=classpath -com.android.tools.analytics-library:shared:30.4.0=classpath -com.android.tools.analytics-library:tracker:30.4.0=classpath +androidx.databinding:databinding-common:7.4.2=classpath +androidx.databinding:databinding-compiler-common:7.4.2=classpath +com.android.databinding:baseLibrary:7.4.2=classpath +com.android.tools.analytics-library:crash:30.4.2=classpath +com.android.tools.analytics-library:protos:30.4.2=classpath +com.android.tools.analytics-library:shared:30.4.2=classpath +com.android.tools.analytics-library:tracker:30.4.2=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.4.0-8841542=classpath -com.android.tools.build:aaptcompiler:7.4.0=classpath -com.android.tools.build:apksig:7.4.0=classpath -com.android.tools.build:apkzlib:7.4.0=classpath -com.android.tools.build:builder-model:7.4.0=classpath -com.android.tools.build:builder-test-api:7.4.0=classpath -com.android.tools.build:builder:7.4.0=classpath +com.android.tools.build:aapt2-proto:7.4.2-8841542=classpath +com.android.tools.build:aaptcompiler:7.4.2=classpath +com.android.tools.build:apksig:7.4.2=classpath +com.android.tools.build:apkzlib:7.4.2=classpath +com.android.tools.build:builder-model:7.4.2=classpath +com.android.tools.build:builder-test-api:7.4.2=classpath +com.android.tools.build:builder:7.4.2=classpath com.android.tools.build:bundletool:1.11.4=classpath -com.android.tools.build:gradle-api:7.4.0=classpath -com.android.tools.build:gradle-settings-api:7.4.0=classpath -com.android.tools.build:gradle:7.4.0=classpath -com.android.tools.build:manifest-merger:30.4.0=classpath +com.android.tools.build:gradle-api:7.4.2=classpath +com.android.tools.build:gradle-settings-api:7.4.2=classpath +com.android.tools.build:gradle:7.4.2=classpath +com.android.tools.build:manifest-merger:30.4.2=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.4.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.4.0=classpath -com.android.tools.lint:lint-model:30.4.0=classpath -com.android.tools.lint:lint-typedef-remover:30.4.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.4.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.0=classpath -com.android.tools:annotations:30.4.0=classpath -com.android.tools:common:30.4.0=classpath -com.android.tools:dvlib:30.4.0=classpath -com.android.tools:repository:30.4.0=classpath -com.android.tools:sdk-common:30.4.0=classpath -com.android.tools:sdklib:30.4.0=classpath -com.android:signflinger:7.4.0=classpath -com.android:zipflinger:7.4.0=classpath +com.android.tools.ddms:ddmlib:30.4.2=classpath +com.android.tools.layoutlib:layoutlib-api:30.4.2=classpath +com.android.tools.lint:lint-model:30.4.2=classpath +com.android.tools.lint:lint-typedef-remover:30.4.2=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2=classpath +com.android.tools.utp:android-device-provider-gradle-proto:30.4.2=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2=classpath +com.android.tools:annotations:30.4.2=classpath +com.android.tools:common:30.4.2=classpath +com.android.tools:dvlib:30.4.2=classpath +com.android.tools:repository:30.4.2=classpath +com.android.tools:sdk-common:30.4.2=classpath +com.android.tools:sdklib:30.4.2=classpath +com.android:signflinger:7.4.2=classpath +com.android:zipflinger:7.4.2=classpath com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.42.0=classpath,classpathCopy,classpathCopy2 com.github.ben-manes:gradle-versions-plugin:0.42.0=classpath com.google.android.gms:strict-version-matcher-plugin:1.2.4=classpath diff --git a/configuration-api-lib/gradle.lockfile b/configuration-api-lib/gradle.lockfile new file mode 100644 index 00000000..03904863 --- /dev/null +++ b/configuration-api-lib/gradle.lockfile @@ -0,0 +1,37 @@ +# 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. +junit:junit:4.13.2=jvmTestCompileClasspath,jvmTestRuntimeClasspath +net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.hamcrest:hamcrest-core:1.3=jvmTestCompileClasspath,jvmTestRuntimeClasspath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.8.10=kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.8.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain +org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,commonTestImplementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10=jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10=jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.8.10=jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-test-annotations-common:1.8.10=commonTestImplementationDependenciesMetadata +org.jetbrains.kotlin:kotlin-test-common:1.8.10=commonTestImplementationDependenciesMetadata +org.jetbrains.kotlin:kotlin-test-junit:1.8.10=jvmTestCompileClasspath,jvmTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-test:1.8.10=commonTestImplementationDependenciesMetadata,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath +org.jetbrains.kotlinx:atomicfu:0.17.3=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,metadataCommonMainCompileClasspath,metadataCompileClasspath +org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.5=jvmCompileClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4=jvmCompileClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=jvmCompileClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.6.4=jvmTestCompileClasspath,jvmTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4=commonTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.4.0=jvmCompileClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-datetime:0.4.0=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,commonMainApiDependenciesMetadata,commonTestApiDependenciesMetadata,jvmCompileClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.2=allSourceSetsCompileDependenciesMetadata,allSourceSetsRuntimeDependenciesMetadata,metadataCommonMainCompileClasspath,metadataCompileClasspath +org.jetbrains:annotations:13.0=jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestImplementationDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath +empty=archives,commonMainCompileOnlyDependenciesMetadata,commonMainImplementationDependenciesMetadata,commonMainIntransitiveDependenciesMetadata,commonMainRuntimeOnlyDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestIntransitiveDependenciesMetadata,commonTestRuntimeOnlyDependenciesMetadata,default,jvmMainCompileOnlyDependenciesMetadata,jvmMainImplementationDependenciesMetadata,jvmMainIntransitiveDependenciesMetadata,jvmMainRuntimeOnlyDependenciesMetadata,jvmTestApiDependenciesMetadata,jvmTestCompileOnlyDependenciesMetadata,jvmTestIntransitiveDependenciesMetadata,jvmTestRuntimeOnlyDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,testKotlinScriptDef,testKotlinScriptDefExtensions diff --git a/gradle.properties b/gradle.properties index e7a4534b..3fa339a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -100,7 +100,7 @@ ANDROID_COMPILE_SDK_VERSION=33 ANDROID_NDK_VERSION=23.0.7599858 -ANDROID_GRADLE_PLUGIN_VERSION=7.4.0 +ANDROID_GRADLE_PLUGIN_VERSION=7.4.2 DETEKT_VERSION=1.22.0 EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.0.15 FIREBASE_CRASHLYTICS_BUILD_TOOLS_VERSION=2.9.2