From b300f223baf9edeb2bda489f5ef9f902abcd92b9 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 31 Mar 2023 14:05:25 -0400 Subject: [PATCH] Update AGP to 7.4.2 --- build-logic/build.gradle.kts | 12 + build-logic/tools/build.gradle.kts | 2 +- build.gradle | 2 +- dependencies.gradle | 2 +- gradle/verification-metadata.xml | 343 +++++++++++++++++++++++++++++ 5 files changed, 358 insertions(+), 3 deletions(-) create mode 100644 build-logic/build.gradle.kts diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts new file mode 100644 index 00000000000..744f29a7743 --- /dev/null +++ b/build-logic/build.gradle.kts @@ -0,0 +1,12 @@ +buildscript { + val kotlinVersion by extra("1.7.20") + + repositories { + google() + mavenCentral() + } + + dependencies { + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + } +} diff --git a/build-logic/tools/build.gradle.kts b/build-logic/tools/build.gradle.kts index 508049dc96d..c7e995c9e54 100644 --- a/build-logic/tools/build.gradle.kts +++ b/build-logic/tools/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.jetbrains.kotlin.jvm") version "1.6.21" + id("org.jetbrains.kotlin.jvm") id("java-library") id("org.jlleitschuh.gradle.ktlint") version "11.1.0" } diff --git a/build.gradle b/build.gradle index 424def252f9..e0df44805c8 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { } dependencies { classpath 'com.android.tools:r8:3.3.75' - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/dependencies.gradle b/dependencies.gradle index 2eec6b3ee89..ffde7f78c5c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -12,7 +12,7 @@ dependencyResolutionManagement { version('androidx-window', '1.0.0') version('exoplayer', '2.18.1') version('glide', '4.13.2') - version('kotlin', '1.6.21') + version('kotlin', '1.7.20') version('libsignal-client', '0.22.0') version('mp4parser', '1.9.39') version('android-gradle-plugin', '7.4.1') diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index d390be4179e..b737247bf42 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -582,6 +582,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -592,6 +597,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -600,6 +610,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1419,6 +1437,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1429,6 +1452,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1439,6 +1467,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1454,6 +1487,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1469,6 +1507,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1494,11 +1537,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -1519,6 +1572,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1534,6 +1592,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1549,6 +1612,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1559,6 +1627,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1574,6 +1647,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1589,6 +1667,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1604,6 +1687,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1615,6 +1703,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1639,6 +1732,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1655,6 +1756,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1665,6 +1774,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1675,6 +1789,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1691,6 +1810,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1715,6 +1842,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1731,6 +1866,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1752,6 +1895,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1768,6 +1919,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1784,6 +1943,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1808,6 +1975,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1844,11 +2019,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -1859,6 +2044,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1869,6 +2059,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1879,6 +2074,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1894,6 +2094,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1904,6 +2109,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1914,6 +2124,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1924,11 +2139,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -1944,6 +2169,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1959,6 +2189,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1967,6 +2202,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1977,6 +2220,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1985,6 +2233,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1995,6 +2251,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2003,6 +2264,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2013,6 +2282,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2021,6 +2295,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2031,6 +2313,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2039,11 +2326,25 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + @@ -2052,6 +2353,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2060,6 +2369,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2070,6 +2387,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2078,6 +2400,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -2088,6 +2418,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -4083,6 +4418,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + +