Fix travis build for cross compilation.

Author: orium

.travis.yml

@@ -1,11 +1,11 @@
 language: scala
 
 scala:
-  - 2.12.10
+  # We just keep the latest version here.  All scripts do their own cross-building (because they are supposed to do
+  # that locally.)
   - 2.13.1
 
 script:
-  - alias sbt='sbt ++$TRAVIS_SCALA_VERSION -jvm-opts .jvmopts'
   - bash ./scripts/local-build-test.sh
 
 after_success:

build.sbt

@@ -69,11 +69,11 @@ def compilerOptionsVersion(scalaVersion: String) =
     case _               => Nil
   })
 
-lazy val scalaVersion212: String       = "2.12.10"
-lazy val scalaVersion213: String       = "2.13.1"
+lazy val scalaVersion212: String = "2.12.10"
+lazy val scalaVersion213: String = "2.13.1"
 lazy val supportedScalaVersions = List(scalaVersion212, scalaVersion213)
 
-ThisBuild / scalaVersion := scalaVersion213
+ThisBuild / scalaVersion := scalaVersion212
 
 lazy val commonSettings = Seq(
   version := "2.3.12",
@@ -458,13 +458,13 @@ lazy val docs =
     .enablePlugins(ParadoxSitePlugin)
     .enablePlugins(GhpagesPlugin)
     .settings(
-      scalaVersion := scalaVersion212, // WIP!
       paradoxTheme := Some(builtinParadoxTheme("generic")),
       name := "scalapact-docs",
       git.remoteRepo := "[email protected]:ITV/scala-pact.git",
       sourceDirectory in Paradox := sourceDirectory.value / "main" / "paradox",
       skip in publish := true
     )
+    .settings(scala212OnlySettings)
 
 lazy val scalaPactProject =
   (project in file("."))

example/provider/delivered_pacts/Consumer_Provider.json

@@ -3,28 +3,6 @@
     "name" : "Provider"
   },
   "interactions" : [
-    {
-      "request" : {
-        "method" : "GET",
-        "path" : "/results"
-      },
-      "description" : "Fetching results",
-      "response" : {
-        "status" : 200,
-        "headers" : {
-          "Pact" : "modifiedRequest"
-        },
-        "body" : {
-          "count" : 3,
-          "results" : [
-            "Bob",
-            "Fred",
-            "Harry"
-          ]
-        }
-      },
-      "providerState" : "Results: Bob, Fred, Harry"
-    },
     {
       "request" : {
         "method" : "GET",
@@ -56,6 +34,28 @@
           }
         }
       }
+    },
+    {
+      "request" : {
+        "method" : "GET",
+        "path" : "/results"
+      },
+      "description" : "Fetching results",
+      "response" : {
+        "status" : 200,
+        "headers" : {
+          "Pact" : "modifiedRequest"
+        },
+        "body" : {
+          "count" : 3,
+          "results" : [
+            "Bob",
+            "Fred",
+            "Harry"
+          ]
+        }
+      },
+      "providerState" : "Results: Bob, Fred, Harry"
     }
   ],
   "consumer" : {

example/provider_tests/delivered_pacts/Consumer_Provider.json

@@ -3,28 +3,6 @@
     "name" : "Provider"
   },
   "interactions" : [
-    {
-      "request" : {
-        "method" : "GET",
-        "path" : "/results"
-      },
-      "description" : "Fetching results",
-      "response" : {
-        "status" : 200,
-        "headers" : {
-          "Pact" : "modifiedRequest"
-        },
-        "body" : {
-          "count" : 3,
-          "results" : [
-            "Bob",
-            "Fred",
-            "Harry"
-          ]
-        }
-      },
-      "providerState" : "Results: Bob, Fred, Harry"
-    },
     {
       "request" : {
         "method" : "GET",
@@ -56,6 +34,28 @@
           }
         }
       }
+    },
+    {
+      "request" : {
+        "method" : "GET",
+        "path" : "/results"
+      },
+      "description" : "Fetching results",
+      "response" : {
+        "status" : 200,
+        "headers" : {
+          "Pact" : "modifiedRequest"
+        },
+        "body" : {
+          "count" : 3,
+          "results" : [
+            "Bob",
+            "Fred",
+            "Harry"
+          ]
+        }
+      },
+      "providerState" : "Results: Bob, Fred, Harry"
     }
   ],
   "consumer" : {

scripts/localpublish.sh

@@ -9,5 +9,4 @@ set -e
 echo "Locally published Scala-Pact"
 echo "****************************"
 
-sbt localPublishScalaPact
-
+sbt +localPublishScalaPact

scripts/publish-docs.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-sbt docs/clean docs/paradox docs/makeSite docs/ghpagesPushSite
+sbt +docs/clean +docs/paradox +docs/makeSite +docs/ghpagesPushSite

scripts/release.sh

@@ -27,7 +27,7 @@ fi
 echo ""
 echo "Preparing Scala-Pact for publishing"
 
-sbt prepareScalaPactPublish
+sbt +prepareScalaPactPublish
 
 echo ""
 echo -e "Preparation complete, release to Sonatype? [y/n] \c"
@@ -40,4 +40,4 @@ else
   echo "Publishing now.."
 fi
 
-sbt sonatypeBundleRelease
+sbt +sonatypeBundleRelease

scripts/spec-tests.sh

@@ -7,6 +7,6 @@ echo "**********************"
 
 # At this point, all the local publishing (therefore: clean update compile test publishLocal) should be done.
 
-sbt test:compile
-sbt pactSpec/test
-sbt testsWithDeps/test
+sbt +test:compile
+sbt +pactSpec/test
+sbt +testsWithDeps/test

scripts/test-examples.sh

@@ -8,26 +8,26 @@ echo "***********************"
 echo ""
 echo "> Consumer tests"
 cd example/consumer
-sbt clean update compile pactTest
+sbt +clean +update +compile +pactTest
 cd ..
 bash deliver.sh
 
 echo ""
 echo "> Provider verification by test suite"
 cd provider_tests
-sbt clean update compile test
+sbt +clean +update +compile +test
 cd ..
 
 echo ""
 echo "> Provider verification by external testing"
 cd provider
-sbt run &
+sbt +run &
 
 echo "..wait a bit for the service to start"
 simple_countdown 30
 
-sbt "pactVerify --source delivered_pacts/ --host localhost --port 8080 --clientTimeout 2"
+sbt "+pactVerify --source delivered_pacts/ --host localhost --port 8080 --clientTimeout 2"
 
 cd ../..
 
-pkill -1 -f sbt-launch.jar
+pkill -1 -f sbt-launch.jar

scripts/test-verifier.sh

@@ -52,4 +52,4 @@ sbt "testsWithDeps/pactVerify --source target/pacts --clientTimeout 10"
 pkill -1 -f sbt-launch.jar
 
 remove_plugin_file
-remove_config_file
+remove_config_file