From 59433b9097ee2a737b9e3b99fe337a8d87501e25 Mon Sep 17 00:00:00 2001
From: devatherock <devatherock@gmail.com>
Date: Sun, 4 Jun 2023 11:14:02 -0500
Subject: [PATCH] fix: Upgraded gradle to 7, spock to 2.3, to fix test failures
 in Java 17

---
 CHANGELOG.md                             | 1 +
 build.gradle                             | 3 ++-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2632c59d..87e4a3fa 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 ### Changed
 - Updated dockerhub readme in CI pipeline
 - [#7](https://github.com/devatherock/minify-js/issues/7): Built a multi-arch docker image
+- Upgraded gradle to 7 and spock to 2.3, to fix test failures in Java 17
 
 ## [1.0.3] - 2021-10-27
 ### Added
diff --git a/build.gradle b/build.gradle
index c01c9647..115b7b6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,10 +7,11 @@ repositories {
 }
 
 dependencies {
-    testImplementation group: 'org.spockframework', name: 'spock-core', version: '1.3-groovy-2.5'
+    testImplementation group: 'org.spockframework', name: 'spock-core', version: '2.3-groovy-3.0'
 }
 
 test {
+    useJUnitPlatform()
     testLogging {
         events 'passed', 'failed'
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2a563242..774fae87 100644
--- 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.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists