Upgrade Gradle and frameworks

Author: aplotnikov

build.gradle

@@ -15,8 +15,7 @@ plugins {
     id 'build-dashboard'
 
     id 'pmd'
-    id 'findbugs'
-    id 'checkstyle'
+//    id 'checkstyle'
     id 'codenarc'
 }
 
@@ -27,41 +26,41 @@ repositories {
     mavenCentral()
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_11
 
-jar {
-    baseName = 'junit_5_vs_spock'
-    group = 'io.github.aplotnikov'
-    version = '0.0.1-SNAPSHOT'
-}
+group = 'io.github.aplotnikov'
+version = '0.0.1-SNAPSHOT'
 
-ext.junitVersion = '5.3.1'
+ext.junitVersion = '5.9.3'
 
 dependencies {
-    compile 'io.vavr:vavr:0.9.2'
+    implementation('io.vavr:vavr:0.10.4')
 
-    testCompile 'nl.jqno.equalsverifier:equalsverifier:2.5.2'
+    testImplementation('nl.jqno.equalsverifier:equalsverifier:2.5.2')
 
     // Spock + Groovy dependency
-    testCompile 'org.codehaus.groovy:groovy-all:2.5.2',
-            'org.spockframework:spock-core:1.2-groovy-2.5'
-    // Needs for launching Spock test into JUnit 5 platform
-    testRuntime "org.junit.vintage:junit-vintage-engine:${junitVersion}"
+    testImplementation(
+        'org.codehaus.groovy:groovy:3.0.17',
+        'org.spockframework:spock-core:2.3-groovy-3.0',
+    )
 
     // JUnit 5 dependency
-    testCompile "org.junit.jupiter:junit-jupiter-api:${junitVersion}",
-            "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
-    testRuntime "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
-    // To avoid compiler warnings about @API annotations in JUnit code
-    testCompileOnly 'org.apiguardian:apiguardian-api:1.0.0'
+    testImplementation(
+        "org.junit.jupiter:junit-jupiter-api:${junitVersion}",
+        "org.junit.jupiter:junit-jupiter-params:${junitVersion}",
+        "org.junit.jupiter:junit-jupiter-engine:${junitVersion}",
+    )
 
     // JUnit 5 utilities
-    testCompile 'org.assertj:assertj-core:3.11.1',
-            'org.awaitility:awaitility:3.1.2',
-            'org.mockito:mockito-core:2.22.0',
-            // add missing functionality into mockito - MockitoExtension
-            'name.falgout.jeffrey.testing.junit5:mockito-extension:1.0.2'
+    testImplementation(
+        'org.assertj:assertj-core:3.11.1',
+        'org.awaitility:awaitility:4.2.0',
+        'org.mockito:mockito-junit-jupiter:5.3.1',
+    )
+}
+
+test {
+    useJUnitPlatform()
 }
 
 junitPlatform {

config/codenarc/codenarc.groovy

@@ -2,7 +2,9 @@ ruleset {
     ruleset('rulesets/basic.xml')
     ruleset('rulesets/braces.xml')
     ruleset('rulesets/concurrency.xml')
-    ruleset('rulesets/convention.xml')
+    ruleset('rulesets/convention.xml') {
+        CompileStatic(enabled: false)
+    }
     ruleset('rulesets/design.xml')
     ruleset('rulesets/dry.xml') {
         DuplicateStringLiteral(enabled: false)
@@ -11,7 +13,6 @@ ruleset {
     }
     ruleset('rulesets/enhanced.xml')
     ruleset('rulesets/formatting.xml') {
-        ClassJavadoc(enabled: false)
         SpaceAroundMapEntryColon(enabled: false)
         LineLength(enabled: false)
         Indentation(enabled: false)

config/static-code-analyze.gradle

@@ -1,65 +1,21 @@
-ext {
-    reportDirectory = "$project.buildDir/reports"
-}
-
-test {
-    reports {
-        junitXml.enabled = false
-        html.enabled = true
-    }
-}
-
 pmd {
-    toolVersion = '6.7.0'
     sourceSets = [sourceSets.main]
     ruleSets = [
-            'java-basic',
-            'java-braces',
-            'java-clone',
-            'java-codesize',
-            'java-empty',
-            'java-finalizers',
-            'java-strictexception',
-            'java-strings',
-            'java-sunsecure',
-            'java-typeresolution',
-            'java-unnecessary'
+        'java-basic',
+        'java-braces',
+        'java-clone',
+        'java-codesize',
+        'java-empty',
+        'java-finalizers',
+        'java-strictexception',
+        'java-strings',
+        'java-sunsecure',
+        'java-typeresolution',
+        'java-unnecessary'
     ]
 }
 
-tasks.withType(Pmd) {
-    reports {
-        xml.enabled false
-        html.enabled true
-    }
-}
-
-findbugs {
-    sourceSets = [sourceSets.main]
-    effort = 'max'
-    reportLevel = 'low'
-}
-
-tasks.withType(FindBugs) {
-    reports {
-        xml.enabled = false
-        html.enabled = true
-    }
-}
-
-checkstyle {
-    toolVersion = '8.12'
-}
-
-tasks.withType(Checkstyle) {
-    reports {
-        xml.enabled false
-        html.enabled true
-    }
-}
-
 codenarc {
-    toolVersion = '1.2.1'
     sourceSets = [sourceSets.test]
     configFile = rootProject.file 'config/codenarc/codenarc.groovy'
-}
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists