Merge branch 'cheeseng-funspec-module' into 3.1.x

Author: bvenners

project/GenScalaTestJS.scala

@@ -210,6 +210,7 @@ object GenScalaTestJS {
     ) ++
     copyDir("scalatest/src/main/scala/org/scalatest/enablers", "org/scalatest/enablers", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/funsuite", "org/scalatest/funsuite", targetDir, List.empty) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/funspec", "org/scalatest/funspec", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/check", "org/scalatest/check", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,

project/GenScalaTestNative.scala

@@ -205,6 +205,9 @@ object GenScalaTestNative {
     copyDir("scalatest/src/main/scala/org/scalatest/funsuite", "org/scalatest/funsuite", targetDir,
       asyncs("scalatest/src/main/scala/org/scalatest/funsuite")
     ) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/funspec", "org/scalatest/funspec", targetDir,
+      asyncs("scalatest/src/main/scala/org/scalatest/funspec")
+    ) ++
     copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/check", "org/scalatest/check", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,

project/scalatest.scala

@@ -703,6 +703,7 @@ object ScalatestBuild extends Build {
         "org.scalatest.exceptions",
         "org.scalatest.fixture",
         "org.scalatest.funsuite",
+        "org.scalatest.funspec",
         "org.scalatest.jmock",
         "org.scalatest.junit",
         "org.scalatest.matchers",
@@ -814,6 +815,7 @@ object ScalatestBuild extends Build {
         "org.scalatest.exceptions",
         "org.scalatest.fixture",
         "org.scalatest.funsuite",
+        "org.scalatest.funspec",
         "org.scalatest.matchers",
         "org.scalatest.path",
         "org.scalatest.prop",
@@ -933,6 +935,7 @@ object ScalatestBuild extends Build {
       "org.scalatest.exceptions",
       "org.scalatest.fixture",
       "org.scalatest.funsuite",
+      "org.scalatest.funspec",
       "org.scalatest.matchers",
       "org.scalatest.path",
       "org.scalatest.prop",
@@ -1037,6 +1040,7 @@ object ScalatestBuild extends Build {
         "org.scalatest.exceptions",
         "org.scalatest.fixture",
         "org.scalatest.funsuite",
+        "org.scalatest.funspec",
         "org.scalatest.jmock",
         "org.scalatest.junit",
         "org.scalatest.matchers",
@@ -1111,6 +1115,7 @@ object ScalatestBuild extends Build {
         "org.scalatest.exceptions",
         "org.scalatest.fixture",
         "org.scalatest.funsuite",
+        "org.scalatest.funspec",
         "org.scalatest.matchers",
         "org.scalatest.path",
         "org.scalatest.prop",
@@ -1176,6 +1181,7 @@ object ScalatestBuild extends Build {
           "org.scalatest.exceptions",
           "org.scalatest.fixture",
           "org.scalatest.funsuite",
+          "org.scalatest.funspec",
           "org.scalatest.matchers",
           "org.scalatest.path",
           "org.scalatest.prop",