Merge pull request #162 from gradle/no/update-gradle-7

Update to Gradle 7.0

Author: ghale

build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'java-gradle-plugin'
     id 'maven-publish'
     id 'codenarc'
-    id "com.gradle.plugin-publish" version "0.12.0"
+    id "com.gradle.plugin-publish" version "0.14.0"
     id "org.gradle.test-retry" version "1.2.0"
 }
 
@@ -19,7 +19,7 @@ def isCI = (System.getenv('CI') ?: 'false').toBoolean()
 def supportedVersions = [
     "7.0.0-alpha12": ["6.8.3", "7.0"],
     "4.2.0-rc01": ["6.8.3", "7.0"],
-    "4.1.2": ["6.5.1", "6.8.3"],
+    "4.1.3": ["6.5.1", "6.8.3"],
     "4.0.2": ["6.1.1", "6.8.3"],
     "3.6.4": ["5.6.4", "6.8.3"],
     "3.5.4": ["5.4.1", "5.6.4", "6.8.3"]
@@ -36,10 +36,11 @@ dependencies {
     implementation gradleApi()
     testImplementation "com.android.tools.build:gradle:$agpVersion"
     testImplementation gradleTestKit()
-    testImplementation "junit:junit:4.12"
-    testImplementation "org.spockframework:spock-core:1.1-groovy-2.4@jar"
-    testRuntime 'cglib:cglib-nodep:3.2.12'
-    testRuntime 'org.objenesis:objenesis:3.1'
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "org.spockframework:spock-core:2.0-M5-groovy-3.0@jar"
+    testImplementation "org.opentest4j:opentest4j:1.2.0"
+    testRuntimeOnly 'cglib:cglib-nodep:3.3.0'
+    testRuntimeOnly 'org.objenesis:objenesis:3.2'
 }
 
 java {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/test/groovy/org/gradle/android/WorkaroundTest.groovy

@@ -14,7 +14,7 @@ class WorkaroundTest extends Specification {
         androidVersion  | expectedWorkarounds
         "7.0.0-alpha12" | ['MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources_7_0']
         "4.2.0-rc01"    | ['MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources_4_2', 'MergeResources']
-        "4.1.2"         | ['MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources_4_0', 'MergeResources']
+        "4.1.3"         | ['MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources_4_0', 'MergeResources']
         "4.0.2"         | ['MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources_4_0', 'MergeResources']
         "3.6.4"         | ['MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs']
         "3.5.4"         | ['MergeJavaResources', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs']