Adopt Gradle 8 (#322)

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.0
 jobs:
     build:
         docker:
-            - image: circleci/openjdk:8-jdk
+            - image: cimg/openjdk:17.0
         working_directory: ~/repo
         environment:
             JVM_OPTS: -Xmx4096m
@@ -23,10 +23,10 @@ jobs:
                 key: v1-dependencies-{{ checksum "build.gradle" }}
             - run:
                 name: Run tests
-                command: GRADLE_OPTS="-Xms256m -Xmx2048m" ./gradlew build --no-daemon --scan
+                command: GRADLE_OPTS="-Xms256m -Xmx2048m" ./gradlew build --no-daemon
             - run:
                 name: Code coverage
-                command: GRADLE_OPTS="-Xms256m -Xmx1024m" ./gradlew jacocoTestReport coveralls --no-daemon --scan
+                command: GRADLE_OPTS="-Xms256m -Xmx1024m" ./gradlew jacocoTestReport coveralls --no-daemon
             - run:
                 name: Save reports
                 command: |
@@ -47,7 +47,7 @@ jobs:
 
     publish:
         docker:
-            - image: circleci/openjdk:8-jdk
+            - image: cimg/openjdk:17.0
         working_directory: ~/repo
         environment:
             JVM_OPTS: -Xmx3200m
@@ -68,7 +68,7 @@ jobs:
             - run:
                 name: Publish plugin
                 command:
-                    GRADLE_OPTS="-Xms256m -Xmx1024m" ./gradlew clean publishPlugins --no-daemon --scan
+                    GRADLE_OPTS="-Xms256m -Xmx1024m" ./gradlew clean publishPlugins --no-daemon
                     -Pgradle.publish.key=${GRADLE_PUBLISH_KEY}
                     -Pgradle.publish.secret=${GRADLE_PUBLISH_SECRET}
 

.gitattributes

@@ -0,0 +1,4 @@
+* text=auto eol=lf
+
+*.bat text eol=crlf
+*.jar binary

build.gradle

@@ -11,8 +11,8 @@ plugins {
     id 'maven-publish'
     id 'idea'
     id 'jacoco'
-    id 'com.gradle.plugin-publish' version '1.0.0'
-    id 'com.github.kt3k.coveralls' version '2.12.0'
+    id 'com.gradle.plugin-publish' version '1.2.1'
+    id 'com.github.kt3k.coveralls' version '2.12.2'
 }
 
 def thisPlugin =
@@ -23,10 +23,6 @@ apply from: 'gradle/publishing.gradle'
 apply from: 'gradle/coverage.gradle'
 apply plugin: thisPlugin
 
-repositories {
-    mavenCentral()
-}
-
 sourceSets {
     functionalTest {
         groovy {
@@ -38,20 +34,23 @@ sourceSets {
 }
 
 dependencies {
-    implementation gradleApi()
-    implementation localGroovy()
+    compileOnly gradleApi()
+    compileOnly localGroovy()
     implementation 'org.fusesource.jansi:jansi:2.4.0'
 
     testImplementation gradleTestKit()
     testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
-    testImplementation 'net.bytebuddy:byte-buddy:1.12.18'
+    testImplementation 'net.bytebuddy:byte-buddy:1.14.9'
     testImplementation 'org.objenesis:objenesis:3.3'
-    testImplementation 'commons-io:commons-io:2.11.0'
+    testImplementation 'commons-io:commons-io:2.14.0'
 
-    functionalTestImplementation localGroovy()
     functionalTestImplementation gradleTestKit()
     functionalTestImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
-    functionalTestImplementation 'commons-io:commons-io:2.11.0'
+    functionalTestImplementation 'commons-io:commons-io:2.14.0'
+}
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(8)
 }
 
 gradlePlugin {
@@ -69,7 +68,7 @@ idea {
     }
 }
 
-test {
+tasks.named("test") {
     useJUnitPlatform()
 
     testClassesDirs += sourceSets.functionalTest.output.classesDirs
@@ -83,7 +82,9 @@ test {
     exclude 'com/adarshr/gradle/testlogger/functional/**'
 }
 
-task functionalTest(type: Test) {
+tasks.register("functionalTest", Test) {
+    dependsOn 'pluginUnderTestMetadata', 'testClasses'
+
     useJUnitPlatform()
 
     inputs.dir "$projectDir/src/test-functional/resources"
@@ -101,6 +102,6 @@ task functionalTest(type: Test) {
     include 'com/adarshr/gradle/testlogger/functional/**'
 }
 
-tasks.check.dependsOn 'functionalTest'
-tasks.functionalTest.dependsOn 'pluginUnderTestMetadata', 'testClasses'
-tasks.functionalTest.mustRunAfter 'test'
+tasks.named("check") {
+    dependsOn("functionalTest")
+}

gradle.properties

@@ -1,5 +1,6 @@
 version=3.2.0
 group=com.adarshr
-org.gradle.daemon=true
+
+org.gradle.jvmargs=-Dfile.encoding=UTF-8
 org.gradle.caching=false
 org.gradle.parallel=true

gradle/coverage.gradle

@@ -1,9 +1,9 @@
 jacoco {
-    toolVersion '0.8.5'
+    toolVersion '0.8.10'
 }
 
 jacocoTestReport {
-    executionData "${project.buildDir}/jacoco/test.exec", "${project.buildDir}/jacoco/functionalTest.exec"
+    executionData layout.buildDirectory.file("jacoco/test.exec").get().asFile, layout.buildDirectory.file("jacoco/functionalTest.exec").get().asFile
 
     reports {
         xml.required = true

gradle/publishing.gradle

@@ -1,17 +1,15 @@
-pluginBundle {
+gradlePlugin {
     website = 'https://github.com/radarsh/gradle-test-logger-plugin'
     vcsUrl = 'https://github.com/radarsh/gradle-test-logger-plugin'
-    description = 'A Gradle plugin for printing beautiful logs on the console while running tests'
-    tags = ['test', 'logging', 'console', 'terminal', 'groovy']
-}
 
-gradlePlugin {
     plugins {
         testLoggerPlugin {
             id = 'com.adarshr.test-logger'
             displayName = 'Gradle Test Logger Plugin'
             description = 'A Gradle plugin for printing beautiful logs on the console while running tests'
             implementationClass = 'com.adarshr.gradle.testlogger.TestLoggerPlugin'
+            description = 'A Gradle plugin for printing beautiful logs on the console while running tests'
+            tags = ['test', 'logging', 'console', 'terminal', 'groovy']
         }
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

renovate.json

@@ -0,0 +1,14 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+        "config:base"
+    ],
+    "packageRules": [
+        {
+            "groupName": "Spek2",
+            "matchPackagePrefixes": [
+                "org.spekframework.spek2"
+            ]
+        }
+    ]
+}

settings.gradle

@@ -1,11 +1,27 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+}
+
 plugins {
-    id 'com.gradle.enterprise' version '3.11.2'
+    id 'com.gradle.enterprise' version '3.15.1'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }
 
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+    }
+}
+
+def isCiBuild = providers.environmentVariable("CI").isPresent()
+
 gradleEnterprise {
     buildScan {
         termsOfServiceUrl = 'https://gradle.com/terms-of-service'
         termsOfServiceAgree = 'yes'
+        publishAlwaysIf(isCiBuild)
     }
 }