From 51c055b9216765f61eeea0e993d0bff64f96bd7d Mon Sep 17 00:00:00 2001 From: Albin Date: Tue, 13 Aug 2024 09:54:44 +0200 Subject: [PATCH 1/3] Bump gradle to 8.9 --- android/gradle/wrapper/gradle-wrapper.properties | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 632105fbcfe7..077616d7cd41 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,11 +1,10 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -# Should match the checksum on: https://gradle.org/release-checksums/ -distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c # Upgrade using gradle and wrapper using: ./gradlew wrapper --gradle-version # Compare wrapper checksum with: -# https://services.gradle.org/distributions/gradle-{gradleVersion}-wrapper.jar.sha256 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +# https://services.gradle.org/distributions/gradle-{gradleVersion}-bin.zip.sha256 +distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From e8f5ed36704941ef96b9c252021faaf2f385f5be Mon Sep 17 00:00:00 2001 From: Albin Date: Tue, 13 Aug 2024 10:33:44 +0200 Subject: [PATCH 2/3] Bump agp to 8.5.2 Also: * Enables gradle plugin lint check. * Documents gradle dependency lint check. * Removes experimental lint configuration. --- android/config/lint.xml | 5 ++--- android/gradle.properties | 1 - android/gradle/libs.versions.toml | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/android/config/lint.xml b/android/config/lint.xml index b885b0b711aa..7e117311654f 100644 --- a/android/config/lint.xml +++ b/android/config/lint.xml @@ -7,9 +7,8 @@ - + - + - diff --git a/android/gradle.properties b/android/gradle.properties index 324e171187d3..74c277e3a155 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -3,4 +3,3 @@ android.nonTransitiveRClass=false android.useAndroidX=true kotlin.code.style=official org.gradle.jvmargs=-Xmx8192M -Dkotlin.daemon.jvm.options\="-Xmx8192M" -android.experimental.lint.version = 8.4.0 diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index f603f7005337..50b1a458d63a 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -3,8 +3,8 @@ # The android-gradle-aapt plugin version must be in sync with the android plugin version. # Required for Gradle metadata verification to work properly, see: # https://github.com/gradle/gradle/issues/19228 -android-gradle-plugin = "8.3.0" -android-gradle-aapt = "10880808" +android-gradle-plugin = "8.5.2" +android-gradle-aapt = "11315950" android-billingclient = "6.2.0" android-volley = "1.2.1" From 3de71ad5f26ad19d5df58fcce14e9386f6bf2f58 Mon Sep 17 00:00:00 2001 From: Albin Date: Thu, 15 Aug 2024 13:52:21 +0200 Subject: [PATCH 3/3] Update gradle lockfile --- android/gradle/verification-metadata.xml | 747 ++++++++++------------- 1 file changed, 314 insertions(+), 433 deletions(-) diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml index 6f05da405939..2184f5b1bf76 100644 --- a/android/gradle/verification-metadata.xml +++ b/android/gradle/verification-metadata.xml @@ -1228,14 +1228,14 @@ - - + + - - - + + + @@ -2289,13 +2289,13 @@ - - + + - - + + @@ -2309,231 +2309,162 @@ - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + + + - - - + + + - - - - - - - + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - - - - - + + - - - - - - - - - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - + + @@ -2557,219 +2488,199 @@ - - - - - - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + - - - - - - - + + - - + + - - - - - - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + @@ -4604,9 +4515,9 @@ - - - + + + @@ -4614,26 +4525,11 @@ - - - - - - - - - - - - - - - @@ -4703,12 +4599,12 @@ - - - + + + - - + + @@ -4770,9 +4666,9 @@ - - - + + + @@ -4780,22 +4676,22 @@ - - - + + + - - + + - - - + + + - - - + + + @@ -4808,9 +4704,9 @@ - - - + + + @@ -4818,9 +4714,9 @@ - - - + + + @@ -4833,11 +4729,6 @@ - - - - - @@ -4848,9 +4739,9 @@ - - - + + + @@ -4863,9 +4754,9 @@ - - - + + + @@ -4878,11 +4769,6 @@ - - - - - @@ -4893,12 +4779,12 @@ - - - + + + - - + + @@ -4909,9 +4795,9 @@ - - - + + + @@ -4919,15 +4805,15 @@ - - - + + + - - + + - - + + @@ -4941,12 +4827,12 @@ - - + + - - + + @@ -4957,9 +4843,9 @@ - - - + + + @@ -4967,12 +4853,12 @@ - - - + + + - - + + @@ -4983,9 +4869,9 @@ - - - + + + @@ -4993,9 +4879,9 @@ - - - + + + @@ -5003,9 +4889,9 @@ - - - + + + @@ -5027,9 +4913,9 @@ - - - + + + @@ -5047,9 +4933,9 @@ - - - + + + @@ -5077,17 +4963,17 @@ - - - + + + - - + + - - - + + + @@ -5095,11 +4981,6 @@ - - - - - @@ -5110,9 +4991,9 @@ - - - + + + @@ -5120,9 +5001,9 @@ - - - + + + @@ -5130,9 +5011,9 @@ - - - + + + @@ -5140,9 +5021,9 @@ - - - + + + @@ -5171,9 +5052,6 @@ - - - @@ -5187,6 +5065,9 @@ + + + @@ -5370,8 +5251,8 @@ - - + + @@ -5380,9 +5261,9 @@ - - - + + + @@ -5390,9 +5271,9 @@ - - - + + +