Support 7.2.0-alpha06 and 7.1.0-beta05 (#424)

KeepSafe · Dec 16, 2021 · c69d3e1 · c69d3e1
1 parent ac76bd8
commit c69d3e1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -57,7 +57,7 @@ repositories {
     google()
 }
 
-def agpVersion = "7.2.0-alpha05"
+def agpVersion = "7.2.0-alpha06"
 def autoValueVersion = "1.8.1"
 def gsonVersion = "2.8.6"
 def javassistVersion = "3.27.0-GA"
@@ -76,12 +76,12 @@ dependencies {
 
     compileOnly "com.android.tools.build:gradle:$agpVersion"
     compileOnly "com.android.tools:r8:2.2.64"
-    compileOnly "com.android.tools:repository:30.2.0-alpha05"
+    compileOnly "com.android.tools:repository:30.2.0-alpha06"
 
     testImplementation "com.android.tools.build:gradle:$agpVersion"
     testImplementation "com.google.code.gson:gson:${gsonVersion}"
     testImplementation "com.microsoft.thrifty:thrifty-runtime:${thriftyVersion}"
-    testImplementation "org.codehaus.groovy:groovy-all:3.0.8"
+    testImplementation "org.codehaus.groovy:groovy-all:3.0.9"
     testImplementation "org.javassist:javassist:${javassistVersion}"
     testImplementation dependencies.create("org.spockframework:spock-core:2.0-groovy-3.0") {
         exclude module: "groovy-all"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/integrationTest/groovy/com/getkeepsafe/dexcount/IntegrationSpec.groovy b/src/integrationTest/groovy/com/getkeepsafe/dexcount/IntegrationSpec.groovy
@@ -31,8 +31,8 @@ class IntegrationSpec extends Specification {
 
         where:
         agpVersion      | gradleVersion || numMethods | numClasses | numFields
-        "7.2.0-alpha05" | "7.3-rc-1"    || 7421       | 926        | 2676
-        "7.1.0-beta04"  | "7.2"         || 7421       | 926        | 2676
+        "7.2.0-alpha06" | "7.3"         || 7410       | 925        | 2666
+        "7.1.0-beta05"  | "7.2"         || 7421       | 926        | 2676
         "7.0.0"         | "7.1.1"       || 7355       | 926        | 2592
         "4.2.0"         | "6.8.1"       || 7422       | 926        | 2677
         "4.1.0"         | "6.7.1"       || 7356       | 926        | 2597
@@ -84,8 +84,8 @@ class IntegrationSpec extends Specification {
 
         where:
         agpVersion      | gradleVersion || numMethods | numClasses | numFields
-        "7.2.0-alpha05" | "7.3-rc-1"    || 7          | 5          | 3
-        "7.1.0-beta04"  | "7.2"         || 7          | 5          | 3
+        "7.2.0-alpha06" | "7.3"         || 7          | 5          | 3
+        "7.1.0-beta05"  | "7.2"         || 7          | 5          | 3
         "7.0.0"         | "7.1.1"       || 7          | 5          | 3
         "4.2.0"         | "6.8.1"       || 7          | 5          | 3
         "4.1.0"         | "6.7.1"       || 7          | 5          | 3
@@ -115,8 +115,8 @@ class IntegrationSpec extends Specification {
 
         where:
         agpVersion         | gradleVersion || numMethods | numClasses | numFields
-        "7.2.0-alpha05"    | "7.3-rc-1"    || 4266       | 723        | 1268
-        "7.1.0-beta04"     | "7.2"         || 4266       | 723        | 1268
+        "7.2.0-alpha06"    | "7.3"         || 4266       | 723        | 1268
+        "7.1.0-beta05"     | "7.2"         || 4266       | 723        | 1268
         "7.0.0"            | "7.1.1"       || 4266       | 723        | 1268
         "4.2.0"            | "6.8.1"       || 4266       | 723        | 1268
         "4.1.0"            | "6.7.1"       || 4266       | 723        | 1268
@@ -146,8 +146,8 @@ class IntegrationSpec extends Specification {
 
         where:
         agpVersion      | gradleVersion || numMethods | numClasses | numFields
-        "7.2.0-alpha05" | "7.3-rc-1"    || 7421       | 926        | 2676
-        "7.1.0-beta04"  | "7.2"         || 7421       | 926        | 2676
+        "7.2.0-alpha06" | "7.3"         || 7410       | 925        | 2666
+        "7.1.0-beta05"  | "7.2"         || 7421       | 926        | 2676
         "7.0.0"         | "7.1.1"       || 7355       | 926        | 2592
         "4.2.0"         | "6.8.1"       || 7422       | 926        | 2677
         "4.1.0"         | "6.7.1"       || 7356       | 926        | 2597

diff --git a/src/main/java/com/getkeepsafe/dexcount/plugin/FourTwoApplicator.java b/src/main/java/com/getkeepsafe/dexcount/plugin/FourTwoApplicator.java
@@ -69,7 +69,6 @@ public TaskApplicator create(Project project, DexCountExtension ext) {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public void apply() {
         if (!getExt().getEnabled().get()) {
             return;