Skip to content

#12144 Compile Spock extension statically to support Groovy 6 #12145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
winfriedgerlach wants to merge 2 commits into
base: main
Choose a base branch
from
Open

#12144 Compile Spock extension statically to support Groovy 6 #12145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be8a566
#12144 Compile Spock extension statically to support Groovy 6
winfriedgerlach Oct 30, 2026
4d10505
from CodeRabbit review: make ErrorListener package private
winfriedgerlach Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/spock/src/main/groovy/org/testcontainers/spock/DockerAvailableDetector.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package org.testcontainers.spock

import groovy.transform.CompileStatic
import org.testcontainers.DockerClientFactory

@CompileStatic
class DockerAvailableDetector {

boolean isDockerAvailable() {
Expand Down
2 changes: 2 additions & 0 deletions modules/spock/src/main/groovy/org/testcontainers/spock/SpockTestDescription.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.testcontainers.spock

import groovy.transform.CompileStatic
import groovy.transform.PackageScope
import org.spockframework.runtime.extension.IMethodInvocation
import org.testcontainers.lifecycle.TestDescription
Expand All @@ -10,6 +11,7 @@ import org.testcontainers.lifecycle.TestDescription
* Filesystem friendly name is based on Specification and Feature.
*/
@PackageScope
@CompileStatic
class SpockTestDescription implements TestDescription {

String specName
Expand Down
4 changes: 3 additions & 1 deletion modules/spock/src/main/groovy/org/testcontainers/spock/TestcontainersExtension.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package org.testcontainers.spock

import groovy.transform.CompileStatic
import org.spockframework.runtime.AbstractRunListener
import org.spockframework.runtime.extension.AbstractAnnotationDrivenExtension
import org.spockframework.runtime.model.ErrorInfo
import org.spockframework.runtime.model.SpecInfo

@CompileStatic
class TestcontainersExtension extends AbstractAnnotationDrivenExtension<Testcontainers> {

private final DockerAvailableDetector dockerDetector
Expand Down Expand Up @@ -34,7 +36,7 @@ class TestcontainersExtension extends AbstractAnnotationDrivenExtension<Testcont
spec.addListener(listener)
}

private class ErrorListener extends AbstractRunListener {
class ErrorListener extends AbstractRunListener {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
List<ErrorInfo> errors = []

@Override
Expand Down
2 changes: 2 additions & 0 deletions ...les/spock/src/main/groovy/org/testcontainers/spock/TestcontainersMethodInterceptor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.testcontainers.spock

import groovy.transform.CompileStatic
import org.spockframework.runtime.extension.AbstractMethodInterceptor
import org.spockframework.runtime.extension.IMethodInvocation
import org.spockframework.runtime.model.FieldInfo
Expand All @@ -10,6 +11,7 @@ import org.testcontainers.containers.GenericContainer
import org.testcontainers.lifecycle.TestLifecycleAware
import org.testcontainers.spock.TestcontainersExtension.ErrorListener

@CompileStatic
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
class TestcontainersMethodInterceptor extends AbstractMethodInterceptor {

private final SpecInfo spec
Expand Down
Loading