From 2dc16e34f2817a24bd27644df3ae1f4e9e2d3339 Mon Sep 17 00:00:00 2001
From: Ronald Holshausen <ronald.holshausen@smartbear.com>
Date: Fri, 16 Feb 2024 16:18:18 +1100
Subject: [PATCH] chore: Upgrade dependencies (groovy)

---
 ....dius.pact.kotlin-common-conventions.gradle | 18 +++++++++---------
 .../pact/consumer/groovy/PactBuilder.groovy    |  3 ++-
 2 files changed, 11 insertions(+), 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
index 45cb68dc0..05147e196 100644
--- 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
index b8115685f..2babe2e8e 100644
--- 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