Update Gradle, Spock, and Groovy (#2416)

dondonz · web-flow · commit e65342c808e0 · 2021-07-05T17:17:20.000+10:00
* Upgrade Gradle to 7.1

* Upgrade Spock and Groovy

* Remove groovy-json
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,6 @@ import java.text.SimpleDateFormat
 plugins {
     id 'java'
     id 'java-library'
-    id 'maven'
     id 'maven-publish'
     id 'antlr'
     id 'signing'
@@ -94,8 +93,8 @@ dependencies {
     antlr "org.antlr:antlr4:4.8"
     implementation 'com.google.guava:guava:30.0-jre'
     testImplementation group: 'junit', name: 'junit', version: '4.12'
-    testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5'
-    testImplementation('org.codehaus.groovy:groovy:2.5.13')
+    testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
+    testImplementation 'org.codehaus.groovy:groovy:3.0.8'
     testImplementation 'cglib:cglib-nodep:3.3.0'
     testImplementation 'org.objenesis:objenesis:2.1'
     testImplementation 'com.google.code.gson:gson:2.8.0'
@@ -299,9 +298,6 @@ tasks.withType(PublishToMavenRepository) {
     dependsOn build
 }
 
-
-task myWrapper(type: Wrapper) {
-    gradleVersion = '6.6.1'
-    distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
-}
-
+test {
+    useJUnitPlatform()
+}
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-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
