chore: Upgrade dependencies (groovy)

pact-foundation · Apr 22, 2024 · 2dc16e3 · 2dc16e3
1 parent f308749
commit 2dc16e3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle b/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle
@@ -45,18 +45,18 @@ dependencies {
         implementation 'io.ktor:ktor-server-netty:1.6.8'
         implementation 'io.ktor:ktor-network-tls-certificates:1.6.8'
         implementation 'io.ktor:ktor-server-call-logging:1.6.8'
-        implementation 'io.netty:netty-handler:4.1.104.Final'
-        implementation 'org.apache.groovy:groovy:4.0.11'
-        implementation 'org.apache.groovy:groovy-json:4.0.11'
-        implementation 'org.apache.groovy:groovy-xml:4.0.11'
+        implementation 'io.netty:netty-handler:4.1.107.Final'
+        implementation 'org.apache.groovy:groovy:4.0.18'
+        implementation 'org.apache.groovy:groovy-json:4.0.18'
+        implementation 'org.apache.groovy:groovy-xml:4.0.18'
         implementation 'io.pact.plugin.driver:core:0.4.2'
         implementation 'commons-codec:commons-codec:1.15'
 
-        testImplementation 'org.apache.groovy:groovy:4.0.11'
-        testImplementation 'org.apache.groovy:groovy-json:4.0.11'
-        testImplementation 'org.apache.groovy:groovy-datetime:4.0.11'
-        testImplementation 'org.apache.groovy:groovy-xml:4.0.11'
-        testImplementation 'org.apache.groovy:groovy-nio:4.0.11'
+        testImplementation 'org.apache.groovy:groovy:4.0.18'
+        testImplementation 'org.apache.groovy:groovy-json:4.0.18'
+        testImplementation 'org.apache.groovy:groovy-datetime:4.0.18'
+        testImplementation 'org.apache.groovy:groovy-xml:4.0.18'
+        testImplementation 'org.apache.groovy:groovy-nio:4.0.18'
         testImplementation 'org.hamcrest:hamcrest:2.2'
         testImplementation 'junit:junit:4.13.2'
         testImplementation 'ch.qos.logback:logback-classic:1.4.4'

diff --git a/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/PactBuilder.groovy b/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/PactBuilder.groovy
@@ -8,6 +8,7 @@ import au.com.dius.pact.consumer.model.MockProviderConfig
 import au.com.dius.pact.consumer.model.MockServerImplementation
 import au.com.dius.pact.core.model.BasePact
 import au.com.dius.pact.core.model.Consumer
+import au.com.dius.pact.core.model.Interaction
 import au.com.dius.pact.core.model.OptionalBody
 import au.com.dius.pact.core.model.PactSpecVersion
 import au.com.dius.pact.core.model.Provider
@@ -42,7 +43,7 @@ class PactBuilder extends GroovyBuilder {
   BasePact pact = new RequestResponsePact(new Provider(), new Consumer())
   Integer port = 0
   SynchronousRequestResponse currentInteraction
-  List interactions = []
+  List<Interaction> interactions = []
   List<ProviderState> providerStates = []
   boolean requestState