Consumer versions selectors v2

build.sbt

@@ -48,9 +48,7 @@ lazy val shared =
     .settings(
       name := "pact4s-core",
       libraryDependencies ++= Dependencies.shared,
-      scalacOptions ++= {
-        if (scalaVersion.value.startsWith("3")) Seq("-Wconf:cat=deprecation:i") else Nil
-      }
+      scalacOptions += "-Wconf:cat=deprecation:i"
     )
 
 lazy val circe =
@@ -150,6 +148,7 @@ addCommandAlias(
     "scalafmtCheck",
     "headerCheck",
     "+compile:doc",
+    "+test:compile",
     "deletePactFiles",
     "project munit",
     "+test",
@@ -160,7 +159,8 @@ addCommandAlias(
     "project circe",
     "+test",
     "project playJson",
-    "+test"
+    "+test",
+    "project /"
   )
     .mkString(";", ";", "")
 )
@@ -173,6 +173,7 @@ addCommandAlias(
     "scalafmtCheck",
     "headerCheck",
     "compile:doc",
+    "test:compile",
     "deletePactFiles",
     "project munit",
     "test",
@@ -183,7 +184,8 @@ addCommandAlias(
     "project circe",
     "test",
     "project playJson",
-    "test"
+    "test",
+    "project /"
   )
     .mkString(";", ";", "")
 )

munit-cats-effect-pact/src/test/scala/pact4s/munit/requestresponse/PactForgerSuite.scala

@@ -37,7 +37,7 @@ class PactForgerSuite extends RequestResponsePactForger {
       .method("GET")
       .willRespondWith()
       .status(204)
-      .`given`("bob exists")
+      .`given`("bob exists", Map("foo" -> "bar"))
       .uponReceiving("a request to find a friend")
       .path("/anyone-there")
       .method("GET")

munit-cats-effect-pact/src/test/scala/pact4s/munit/requestresponse/PactVerifierBrokerFeatureBranchSuite.scala

@@ -4,13 +4,13 @@ import cats.effect.IO
 import munit.CatsEffectSuite
 import pact4s.MockProviderServer
 import pact4s.munit.PactVerifier
-import pact4s.provider.{Branch, ConsumerVersionSelector, ProviderInfoBuilder, PublishVerificationResults}
+import pact4s.provider.{Branch, ConsumerVersionSelectors, ProviderInfoBuilder}
 
 class PactVerifierBrokerFeatureBranchSuite extends CatsEffectSuite with PactVerifier {
   val mock = new MockProviderServer(49164, hasFeatureX = true)
 
   override val provider: ProviderInfoBuilder =
-    mock.brokerProviderInfo("Pact4sProvider", consumerVersionSelector = ConsumerVersionSelector().withBranch("feat/x"))
+    mock.brokerProviderInfo("Pact4sProvider", consumerVersionSelector = ConsumerVersionSelectors.branch("feat/x"))
 
   override val munitFixtures: Seq[Fixture[_]] = Seq(
     ResourceSuiteLocalFixture(
@@ -22,11 +22,8 @@ class PactVerifierBrokerFeatureBranchSuite extends CatsEffectSuite with PactVeri
   test("Verify pacts for provider `Pact4sProvider` with a feature branch, munit") {
     IO(
       verifyPacts(
-        publishVerificationResults = Some(
-          PublishVerificationResults(
-            providerVersion = "SNAPSHOT",
-            providerBranch = Branch("feat/x")
-          )
+        Some(
+          Branch("feat/x")
         )
       )
     ) *> mock.featureXState.tryGet.assertEquals(Some(true))

munit-cats-effect-pact/src/test/scala/pact4s/munit/requestresponse/PactVerifierBrokerMatchingBranchSuite.scala

@@ -4,15 +4,15 @@ import cats.effect.IO
 import munit.CatsEffectSuite
 import pact4s.MockProviderServer
 import pact4s.munit.PactVerifier
-import pact4s.provider.{Branch, ConsumerVersionSelector, ProviderInfoBuilder, PublishVerificationResults}
+import pact4s.provider.{Branch, ConsumerVersionSelectors, ProviderInfoBuilder}
 
 class PactVerifierBrokerMatchingBranchSuite extends CatsEffectSuite with PactVerifier {
   val mock = new MockProviderServer(49264, hasFeatureX = true)
 
   override val provider: ProviderInfoBuilder =
     mock.brokerProviderInfo(
       "Pact4sProvider",
-      consumerVersionSelector = ConsumerVersionSelector().withMatchingBranch
+      consumerVersionSelector = ConsumerVersionSelectors.matchingBranch
     )
 
   override val munitFixtures: Seq[Fixture[_]] = Seq(
@@ -25,11 +25,8 @@ class PactVerifierBrokerMatchingBranchSuite extends CatsEffectSuite with PactVer
   test("Verify pacts for provider `Pact4sProvider` with a feature branch and matching branch selector, munit") {
     IO(
       verifyPacts(
-        publishVerificationResults = Some(
-          PublishVerificationResults(
-            providerVersion = "SNAPSHOT",
-            providerBranch = Branch("feat/x")
-          )
+        Some(
+          Branch("feat/x")
         )
       )
     ) *> mock.featureXState.tryGet.assertEquals(Some(true))

munit-cats-effect-pact/src/test/scala/pact4s/munit/requestresponse/PactVerifierBrokerSuite.scala

@@ -4,13 +4,13 @@ import cats.effect.IO
 import munit.CatsEffectSuite
 import pact4s.MockProviderServer
 import pact4s.munit.PactVerifier
-import pact4s.provider.{Branch, ConsumerVersionSelector, ProviderInfoBuilder, PublishVerificationResults}
+import pact4s.provider.{Branch, ConsumerVersionSelectors, ProviderInfoBuilder}
 
 class PactVerifierBrokerSuite extends CatsEffectSuite with PactVerifier {
   val mock = new MockProviderServer(49154)
 
   override val provider: ProviderInfoBuilder =
-    mock.brokerProviderInfo("Pact4sProvider", consumerVersionSelector = ConsumerVersionSelector().withMainBranch)
+    mock.brokerProviderInfo("Pact4sProvider", consumerVersionSelector = ConsumerVersionSelectors.mainBranch)
 
   override val munitFixtures: Seq[Fixture[_]] = Seq(
     ResourceSuiteLocalFixture(
@@ -22,11 +22,8 @@ class PactVerifierBrokerSuite extends CatsEffectSuite with PactVerifier {
   test("Verify pacts for provider `Pact4sProvider`, munit") {
     IO(
       verifyPacts(
-        publishVerificationResults = Some(
-          PublishVerificationResults(
-            providerVersion = "SNAPSHOT",
-            providerBranch = Branch.MAIN
-          )
+        Some(
+          Branch.MAIN
         )
       )
     ) *> mock.featureXState.tryGet.assertEquals(None)

scalatest-pact/src/test/scala/pact4s/scalatest/requestresponse/PactForgerSuite.scala

@@ -41,7 +41,7 @@ class PactForgerSuite extends AnyFlatSpec with Matchers with RequestResponsePact
       .method("GET")
       .willRespondWith()
       .status(204)
-      .`given`("bob exists")
+      .`given`("bob exists", Map("foo" -> "bar"))
       .uponReceiving("a request to find a friend")
       .path("/anyone-there")
       .method("GET")

scalatest-pact/src/test/scala/pact4s/scalatest/requestresponse/PactVerifierBrokerFeatureBranchSuite.scala

@@ -6,7 +6,7 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import pact4s.MockProviderServer
-import pact4s.provider.{Branch, ConsumerVersionSelector, ProviderInfoBuilder, PublishVerificationResults}
+import pact4s.provider.{Branch, ConsumerVersionSelectors, ProviderInfoBuilder}
 import pact4s.scalatest.PactVerifier
 
 import scala.concurrent.duration._
@@ -15,7 +15,7 @@ class PactVerifierBrokerFeatureBranchSuite extends AnyFlatSpec with PactVerifier
   val mock = new MockProviderServer(49200, hasFeatureX = true)
 
   override val provider: ProviderInfoBuilder =
-    mock.brokerProviderInfo("Pact4sProvider", consumerVersionSelector = ConsumerVersionSelector().withBranch("feat/x"))
+    mock.brokerProviderInfo("Pact4sProvider", consumerVersionSelector = ConsumerVersionSelectors.branch("feat/x"))
 
   var cleanUp: IO[Unit] = IO.unit
 
@@ -29,12 +29,7 @@ class PactVerifierBrokerFeatureBranchSuite extends AnyFlatSpec with PactVerifier
 
   it should "Verify pacts for provider `Pact4sProvider` with a feature branch, scalatest" in {
     verifyPacts(
-      publishVerificationResults = Some(
-        PublishVerificationResults(
-          providerVersion = "SNAPSHOT",
-          providerBranch = Branch("feat/x")
-        )
-      )
+      Some(Branch("feat/x"))
     )
     mock.featureXState.get.unsafeRunTimed(10.seconds) shouldBe Some(true)
   }

scalatest-pact/src/test/scala/pact4s/scalatest/requestresponse/PactVerifierBrokerMatchingBranchSuite.scala

@@ -6,7 +6,7 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import pact4s.MockProviderServer
-import pact4s.provider.{Branch, ConsumerVersionSelector, ProviderInfoBuilder, PublishVerificationResults}
+import pact4s.provider.{Branch, ConsumerVersionSelectors, ProviderInfoBuilder}
 import pact4s.scalatest.PactVerifier
 
 import scala.concurrent.duration._
@@ -17,7 +17,7 @@ class PactVerifierBrokerMatchingBranchSuite extends AnyFlatSpec with PactVerifie
   override val provider: ProviderInfoBuilder =
     mock.brokerProviderInfo(
       "Pact4sProvider",
-      consumerVersionSelector = ConsumerVersionSelector().withMatchingBranch
+      consumerVersionSelector = ConsumerVersionSelectors.matchingBranch
     )
 
   var cleanUp: IO[Unit] = IO.unit
@@ -32,12 +32,7 @@ class PactVerifierBrokerMatchingBranchSuite extends AnyFlatSpec with PactVerifie
 
   it should "Verify pacts for provider `Pact4sProvider` with a feature branch and matching branch selector, scalatest" in {
     verifyPacts(
-      publishVerificationResults = Some(
-        PublishVerificationResults(
-          providerVersion = "SNAPSHOT",
-          providerBranch = Branch("feat/x")
-        )
-      )
+      Some(Branch("feat/x"))
     )
     mock.featureXState.get.unsafeRunTimed(10.seconds) shouldBe Some(true)
   }

scalatest-pact/src/test/scala/pact4s/scalatest/requestresponse/PactVerifierBrokerSuite.scala

@@ -6,14 +6,14 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import pact4s.MockProviderServer
-import pact4s.provider.{Branch, ConsumerVersionSelector, ProviderInfoBuilder, PublishVerificationResults}
+import pact4s.provider.{Branch, ConsumerVersionSelectors, ProviderInfoBuilder}
 import pact4s.scalatest.PactVerifier
 
 class PactVerifierBrokerSuite extends AnyFlatSpec with PactVerifier with BeforeAndAfterAll with Matchers {
   val mock = new MockProviderServer(49158)
 
   override val provider: ProviderInfoBuilder =
-    mock.brokerProviderInfo("Pact4sProvider", consumerVersionSelector = ConsumerVersionSelector().withMainBranch)
+    mock.brokerProviderInfo("Pact4sProvider", consumerVersionSelector = ConsumerVersionSelectors.mainBranch)
 
   var cleanUp: IO[Unit] = IO.unit
 
@@ -27,12 +27,7 @@ class PactVerifierBrokerSuite extends AnyFlatSpec with PactVerifier with BeforeA
 
   it should "Verify pacts for provider `Pact4sProvider`, scalatest" in {
     verifyPacts(
-      publishVerificationResults = Some(
-        PublishVerificationResults(
-          providerVersion = "SNAPSHOT",
-          providerBranch = Branch.MAIN
-        )
-      )
+      Some(Branch.MAIN)
     )
     mock.featureXState.tryGet.unsafeRunSync() shouldBe None
   }

scripts/Pact4sConsumer-Pact4sProvider.json

@@ -57,7 +57,7 @@
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.3.7"
+      "version": "4.3.14"
     },
     "pactSpecification": {
       "version": "3.0.0"

scripts/Pact4sMessageConsumer-Pact4sMessageProvider.json

@@ -51,7 +51,7 @@
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.3.7"
+      "version": "4.3.14"
     },
     "pactSpecification": {
       "version": "3.0.0"

scripts/feature/Feature-X-Pact4sConsumer-Pact4sProvider.json

@@ -67,7 +67,7 @@
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.3.5"
+      "version": "4.3.14"
     },
     "pactSpecification": {
       "version": "3.0.0"

scripts/publish_pacts.sh

@@ -16,7 +16,8 @@ docker run --rm \
   publish \
   ${SCRIPT_DIR} \
   --consumer-app-version fake-git-sha-for-demo-$(date +%s) \
-  --branch main
+  --branch main \
+  --tag pact4s-test
 
 docker run --rm \
  -w "${SCRIPT_DIR}/feature" \
@@ -28,4 +29,5 @@ docker run --rm \
   publish \
   "${SCRIPT_DIR}/feature" \
   --consumer-app-version fake-git-sha-for-demo-$(date +%s) \
-  --branch feat/x
+  --branch feat/x \
+  --tag pact4s-test