From ef6e0087e97311dcdc9873f5ac562dc6ad835977 Mon Sep 17 00:00:00 2001 From: Ben Bader Date: Sun, 3 Nov 2024 17:01:37 -0700 Subject: [PATCH] Test with AGP 8.7.2 (#518) --- gradle/libs.versions.toml | 6 +++--- .../dexcount/IntegrationSpec.groovy | 20 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 880fe35..9c244c1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,12 +5,12 @@ thrifty = "3.1.0" [libraries] # Build + runtime dependencies -androidTools-agp = "com.android.tools.build:gradle:8.3.0-alpha07" # Note that updates here usually require updates to androidTools-repository +androidTools-agp = "com.android.tools.build:gradle:8.7.2" # Note that updates here usually require updates to androidTools-repository androidTools-r8 = "com.android.tools:r8:8.1.56" -androidTools-repository = "com.android.tools:repository:31.3.0-alpha07" +androidTools-repository = "com.android.tools:repository:31.7.2" autoValue-processor = { module = "com.google.auto.value:auto-value", version.ref = "autoValue" } autoValue-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "autoValue" } -commons-io = "commons-io:commons-io:2.10.0" +commons-io = "commons-io:commons-io:2.14.0" gson = "com.google.code.gson:gson:2.10.1" javassist = "org.javassist:javassist:3.29.2-GA" thriftyRuntime = { module = "com.microsoft.thrifty:thrifty-runtime-jvm", version.ref = "thrifty" } diff --git a/src/integrationTest/groovy/com/getkeepsafe/dexcount/IntegrationSpec.groovy b/src/integrationTest/groovy/com/getkeepsafe/dexcount/IntegrationSpec.groovy index 17c9452..9e29242 100644 --- a/src/integrationTest/groovy/com/getkeepsafe/dexcount/IntegrationSpec.groovy +++ b/src/integrationTest/groovy/com/getkeepsafe/dexcount/IntegrationSpec.groovy @@ -31,8 +31,9 @@ class IntegrationSpec extends Specification { where: agpVersion | gradleVersion || numMethods | numClasses | numFields - "8.3.0-alpha07" | "8.4" || 6932 | 1023 | 2528 - "8.2.0-beta06" | "8.4" || 6932 | 1023 | 2528 + "8.7.2" | "8.10.2" || 6934 | 1023 | 2528 + "8.3.0" | "8.4" || 6932 | 1023 | 2528 + "8.2.0" | "8.4" || 6932 | 1023 | 2528 "8.1.2" | "8.4" || 6932 | 1023 | 2528 "8.0.0" | "8.4" || 6929 | 1020 | 2528 "7.4.1" | "7.6" || 7273 | 1065 | 2657 @@ -63,8 +64,9 @@ class IntegrationSpec extends Specification { where: agpVersion | gradleVersion || numMethods | numClasses | numFields - "8.3.0-alpha07" | "8.4" || 4 | 3 | 0 - "8.2.0-beta06" | "8.4" || 4 | 3 | 0 + "8.7.2" | "8.10.2" || 4 | 3 | 0 + "8.3.0" | "8.4" || 4 | 3 | 0 + "8.2.0" | "8.4" || 4 | 3 | 0 "8.1.2" | "8.4" || 4 | 3 | 0 "8.0.0" | "8.4" || 4 | 3 | 0 "7.4.1" | "7.6" || 7 | 5 | 3 @@ -95,8 +97,9 @@ class IntegrationSpec extends Specification { where: agpVersion | gradleVersion || numMethods | numClasses | numFields - "8.3.0-alpha07" | "8.4" || 4240 | 725 | 1265 - "8.2.0-beta06" | "8.4" || 4240 | 725 | 1265 + "8.7.2" | "8.10.2" || 4243 | 725 | 1265 + "8.3.0" | "8.4" || 4240 | 725 | 1265 + "8.2.0" | "8.4" || 4240 | 725 | 1265 "8.1.2" | "8.4" || 4240 | 725 | 1265 "8.0.0" | "8.4" || 4240 | 725 | 1265 "7.4.1" | "7.6" || 4242 | 726 | 1268 @@ -127,8 +130,9 @@ class IntegrationSpec extends Specification { where: agpVersion | gradleVersion || numMethods | numClasses | numFields - "8.3.0-alpha07" | "8.4" || 6932 | 1023 | 2528 - "8.2.0-beta06" | "8.4" || 6932 | 1023 | 2528 + "8.7.2" | "8.10.2" || 6934 | 1023 | 2528 + "8.3.0" | "8.4" || 6932 | 1023 | 2528 + "8.2.0" | "8.4" || 6932 | 1023 | 2528 "8.1.2" | "8.4" || 6932 | 1023 | 2528 "8.0.0" | "8.4" || 6929 | 1020 | 2528 "7.4.1" | "7.6" || 7273 | 1065 | 2657