feat: support framework 2.4

Signed-off-by: Joke de Buhr <[email protected]>
joke · Mar 12, 2024 · d08a363 · d08a363
1 parent 00b52fb
commit d08a363
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 3 deletions.
diff --git a/README.adoc b/README.adoc
@@ -19,7 +19,7 @@ which has been superseed by the `OutputCaptureExtension` that on the other hand
 ** `@Share @OutputCapture globalLogs`
 * Captures logs per Test
 ** `@OutputCapture localLogs`
-* Working with Spock Framework 2.0, 2.1, 2.2 and 2.3
+* Working with Spock Framework 2.0, 2.1, 2.2, 2.3 and 2.4-M2
 
 == Dependency setup
 

diff --git a/examples/slf4j/build.gradle b/examples/slf4j/build.gradle
@@ -7,7 +7,8 @@ def versions = [
         'spock20groovy25', 'spock20groovy30',
         'spock21groovy25', 'spock21groovy30',
         'spock22groovy25', 'spock22groovy30', 'spock22groovy40',
-        'spock23groovy25', 'spock23groovy30', 'spock23groovy40'
+        'spock23groovy25', 'spock23groovy30', 'spock23groovy40',
+        'spock24groovy25', 'spock24groovy30', 'spock24groovy40'
 ]
 
 versions.forEach {
@@ -97,6 +98,27 @@ dependencies {
     spock23groovy40Implementation project(':spock-outputcapture')
     spock23groovy40Implementation 'org.slf4j:slf4j-simple'
     spock23groovy40Implementation 'org.spockframework:spock-core'
+
+    spock24groovy25Implementation platform(project(':dependencies'))
+    spock24groovy25Implementation platform('org.codehaus.groovy:groovy-bom:2.5.23')
+    spock24groovy25Implementation platform('org.spockframework:spock-bom:2.4-M2-groovy-2.5')
+    spock24groovy25Implementation project(':spock-outputcapture')
+    spock24groovy25Implementation 'org.slf4j:slf4j-simple'
+    spock24groovy25Implementation 'org.spockframework:spock-core'
+
+    spock24groovy30Implementation platform(project(':dependencies'))
+    spock24groovy30Implementation platform('org.codehaus.groovy:groovy-bom:3.0.21')
+    spock24groovy30Implementation platform('org.spockframework:spock-bom:2.4-M2-groovy-3.0')
+    spock24groovy30Implementation project(':spock-outputcapture')
+    spock24groovy30Implementation 'org.slf4j:slf4j-simple'
+    spock24groovy30Implementation 'org.spockframework:spock-core'
+
+    spock24groovy40Implementation platform(project(':dependencies'))
+    spock24groovy40Implementation platform('org.apache.groovy:groovy-bom:4.0.19')
+    spock24groovy40Implementation platform('org.spockframework:spock-bom:2.4-M2-groovy-4.0')
+    spock24groovy40Implementation project(':spock-outputcapture')
+    spock24groovy40Implementation 'org.slf4j:slf4j-simple'
+    spock24groovy40Implementation 'org.spockframework:spock-core'
 }
 
 versions.forEach { source ->

diff --git a/examples/springboot/build.gradle b/examples/springboot/build.gradle
@@ -7,7 +7,8 @@ def versions = [
         'spock20groovy25', 'spock20groovy30',
         'spock21groovy25', 'spock21groovy30',
         'spock22groovy25', 'spock22groovy30', 'spock22groovy40',
-        'spock23groovy25', 'spock23groovy30', 'spock23groovy40'
+        'spock23groovy25', 'spock23groovy30', 'spock23groovy40',
+        'spock24groovy25', 'spock24groovy30', 'spock24groovy40'
 ]
 
 versions.forEach {
@@ -112,6 +113,29 @@ dependencies {
     spock23groovy40Implementation project(':spock-outputcapture')
     spock23groovy40Implementation 'org.spockframework:spock-spring'
     spock23groovy40Implementation 'org.springframework.boot:spring-boot-starter-test'
+
+    spock24groovy25Implementation(platform('org.springframework.boot:spring-boot-dependencies:3.2.3')) {
+        exclude group: 'org.codehaus.groovy', module: '*'
+    }
+    spock24groovy25Implementation platform('org.codehaus.groovy:groovy-bom:2.5.23')
+    spock24groovy25Implementation platform('org.spockframework:spock-bom:2.4-M2-groovy-2.5')
+    spock24groovy25Implementation project(':spock-outputcapture')
+    spock24groovy25Implementation 'org.spockframework:spock-spring'
+    spock24groovy25Implementation 'org.springframework.boot:spring-boot-starter-test'
+
+    spock24groovy30Implementation platform('org.springframework.boot:spring-boot-dependencies:3.2.3')
+    spock24groovy30Implementation platform('org.codehaus.groovy:groovy-bom:3.0.21')
+    spock24groovy30Implementation platform('org.spockframework:spock-bom:2.4-M2-groovy-3.0')
+    spock24groovy30Implementation project(':spock-outputcapture')
+    spock24groovy30Implementation 'org.spockframework:spock-spring'
+    spock24groovy30Implementation 'org.springframework.boot:spring-boot-starter-test'
+
+    spock24groovy40Implementation platform('org.springframework.boot:spring-boot-dependencies:3.2.3')
+    spock24groovy40Implementation platform('org.apache.groovy:groovy-bom:4.0.19')
+    spock24groovy40Implementation platform('org.spockframework:spock-bom:2.4-M2-groovy-4.0')
+    spock24groovy40Implementation project(':spock-outputcapture')
+    spock24groovy40Implementation 'org.spockframework:spock-spring'
+    spock24groovy40Implementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
 versions.forEach { source ->