ITV · davesmith00000 · Aug 12, 2022 · Aug 12, 2022 · Aug 12, 2022 · Aug 12, 2022
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
-lazy val scalaVersion212: String = "2.12.14"
-lazy val scalaVersion213: String = "2.13.6"
-lazy val scalaVersion3: String   = "3.0.1"
+lazy val scalaVersion212: String = "2.12.16"
+lazy val scalaVersion213: String = "2.13.8"
+lazy val scalaVersion3: String   = "3.1.3"
 lazy val supportedScalaVersions  = List(scalaVersion212, scalaVersion213)
 
 ThisBuild / scalaVersion := scalaVersion212

diff --git a/example/consumer/.scalafmt.conf b/example/consumer/.scalafmt.conf
@@ -1,4 +1,5 @@
+version = 2.7.5
 style = defaultWithAlign
 maxColumn = 120
 rewrite.rules = [RedundantBraces,RedundantParens,PreferCurlyFors]
-danglingParentheses = true
+danglingParentheses = true
diff --git a/example/consumer/build.sbt b/example/consumer/build.sbt
@@ -6,7 +6,7 @@ name := "consumer"
 
 organization := "com.example"
 
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.8"
 
 enablePlugins(ScalaPactPlugin)
 

diff --git a/example/consumer/project/build.properties b/example/consumer/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.5.5
+sbt.version = 1.7.1
diff --git a/example/deliver.sh b/example/deliver.sh
@@ -8,7 +8,7 @@ PACT_FILE="consumer/target/pacts/$PACT_NAME"
 if [ ! -f $PACT_FILE ]
   then
     echo "Expected pact file did not exist: $PACT_FILE"
-    echo "Have you run 'sbt pact-test' in the consumer project?"
+    echo "Have you run 'sbt pactTest' in the consumer project?"
     exit 1
 fi
 

diff --git a/example/provider/.scalafmt.conf b/example/provider/.scalafmt.conf
@@ -1,4 +1,5 @@
+version = 2.7.5
 style = defaultWithAlign
 maxColumn = 120
 rewrite.rules = [RedundantBraces,RedundantParens,PreferCurlyFors]
-danglingParentheses = true
+danglingParentheses = true
diff --git a/example/provider/build.sbt b/example/provider/build.sbt
@@ -4,7 +4,7 @@ name := "provider"
 
 version := "0.0.1"
 
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.8"
 
 libraryDependencies ++= Seq(
   "org.http4s" %% "http4s-blaze-server" % "0.23.4",

diff --git a/example/provider/delivered_pacts/scala-pact-consumer_scala-pact-provider.json b/example/provider/delivered_pacts/scala-pact-consumer_scala-pact-provider.json
@@ -6,6 +6,28 @@
     "name" : "scala-pact-consumer"
   },
   "interactions" : [
+    {
+      "providerState" : "Results: Bob, Fred, Harry",
+      "description" : "Fetching results",
+      "request" : {
+        "method" : "GET",
+        "path" : "/results"
+      },
+      "response" : {
+        "status" : 200,
+        "headers" : {
+          "Pact" : "modifiedRequest"
+        },
+        "body" : {
+          "count" : 3,
+          "results" : [
+            "Bob",
+            "Fred",
+            "Harry"
+          ]
+        }
+      }
+    },
     {
       "description" : "Fetching least secure auth token ever",
       "request" : {
@@ -91,36 +113,14 @@
           }
         }
       }
-    },
-    {
-      "providerState" : "Results: Bob, Fred, Harry",
-      "description" : "Fetching results",
-      "request" : {
-        "method" : "GET",
-        "path" : "/results"
-      },
-      "response" : {
-        "status" : 200,
-        "headers" : {
-          "Pact" : "modifiedRequest"
-        },
-        "body" : {
-          "count" : 3,
-          "results" : [
-            "Bob",
-            "Fred",
-            "Harry"
-          ]
-        }
-      }
     }
   ],
   "metadata" : {
     "pactSpecification" : {
       "version" : "2.0.0"
     },
     "scala-pact" : {
-      "version" : "4.2.0"
+      "version" : "4.4.1-SNAPSHOT"
     }
   }
 }
diff --git a/example/provider/project/build.properties b/example/provider/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.5.5
+sbt.version = 1.7.1
diff --git a/example/provider_pact-for-verification/.scalafmt.conf b/example/provider_pact-for-verification/.scalafmt.conf
@@ -1,4 +1,5 @@
+version = 2.7.5
 style = defaultWithAlign
 maxColumn = 120
 rewrite.rules = [RedundantBraces,RedundantParens,PreferCurlyFors]
-danglingParentheses = true
+danglingParentheses = true
diff --git a/example/provider_pact-for-verification/build.sbt b/example/provider_pact-for-verification/build.sbt
@@ -4,7 +4,7 @@ organization := "com.example"
 
 name := "provider_pacts-for-verification"
 
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.8"
 
 enablePlugins(ScalaPactPlugin)
 

diff --git a/example/provider_pact-for-verification/project/build.properties b/example/provider_pact-for-verification/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.5.5
+sbt.version = 1.7.1
diff --git a/example/provider_tests/.scalafmt.conf b/example/provider_tests/.scalafmt.conf
@@ -1,4 +1,5 @@
+version = 2.7.5
 style = defaultWithAlign
 maxColumn = 120
 rewrite.rules = [RedundantBraces,RedundantParens,PreferCurlyFors]
-danglingParentheses = true
+danglingParentheses = true
diff --git a/example/provider_tests/build.sbt b/example/provider_tests/build.sbt
@@ -4,7 +4,7 @@ organization := "com.example"
 
 name := "provider_tests"
 
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.8"
 
 lazy val pactVersionFile: SettingKey[File] = settingKey[File]("location of scala-pact version for examples")
 pactVersionFile := baseDirectory.value.getParentFile.getParentFile / "version.sbt"

diff --git a/example/provider_tests/delivered_pacts/scala-pact-consumer_scala-pact-provider.json b/example/provider_tests/delivered_pacts/scala-pact-consumer_scala-pact-provider.json
@@ -6,6 +6,28 @@
     "name" : "scala-pact-consumer"
   },
   "interactions" : [
+    {
+      "providerState" : "Results: Bob, Fred, Harry",
+      "description" : "Fetching results",
+      "request" : {
+        "method" : "GET",
+        "path" : "/results"
+      },
+      "response" : {
+        "status" : 200,
+        "headers" : {
+          "Pact" : "modifiedRequest"
+        },
+        "body" : {
+          "count" : 3,
+          "results" : [
+            "Bob",
+            "Fred",
+            "Harry"
+          ]
+        }
+      }
+    },
     {
       "description" : "Fetching least secure auth token ever",
       "request" : {
@@ -91,36 +113,14 @@
           }
         }
       }
-    },
-    {
-      "providerState" : "Results: Bob, Fred, Harry",
-      "description" : "Fetching results",
-      "request" : {
-        "method" : "GET",
-        "path" : "/results"
-      },
-      "response" : {
-        "status" : 200,
-        "headers" : {
-          "Pact" : "modifiedRequest"
-        },
-        "body" : {
-          "count" : 3,
-          "results" : [
-            "Bob",
-            "Fred",
-            "Harry"
-          ]
-        }
-      }
     }
   ],
   "metadata" : {
     "pactSpecification" : {
       "version" : "2.0.0"
     },
     "scala-pact" : {
-      "version" : "4.2.0"
+      "version" : "4.4.1-SNAPSHOT"
     }
   }
 }
diff --git a/example/provider_tests/project/build.properties b/example/provider_tests/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.3.2
+sbt.version = 1.7.1
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.5.5
+sbt.version = 1.7.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -20,7 +20,7 @@ addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.2.0")
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
 
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20")
-addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix" % "0.9.30")
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.3.1")
+addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix" % "0.10.1")