Merge branch 'cheeseng-feature-style-trait-refactoring-march-19' into 3.1.x

Author: bvenners

project/GenScalaTestDotty.scala

@@ -151,6 +151,8 @@ object GenScalaTestDotty {
     copyDir("scalatest/src/main/scala/org/scalatest/featurespec", "org/scalatest/featurespec", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/funspec", "org/scalatest/funspec", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/funsuite", "org/scalatest/funsuite", targetDir, List.empty) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/freespec", "org/scalatest/freespec", targetDir, List.empty) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/matchers", "org/scalatest/matchers", targetDir,
       List(
         "Matcher.scala",           // Re-implemented with new macro

project/GenScalaTestJS.scala

@@ -218,6 +218,8 @@ object GenScalaTestJS {
     copyDir("scalatest/src/main/scala/org/scalatest/funsuite", "org/scalatest/funsuite", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/featurespec", "org/scalatest/featurespec", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/funspec", "org/scalatest/funspec", targetDir, List.empty) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/freespec", "org/scalatest/freespec", targetDir, List.empty) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
       List(

project/GenScalaTestNative.scala

@@ -211,6 +211,12 @@ object GenScalaTestNative {
     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/freespec", "org/scalatest/freespec", targetDir,
+      asyncs("scalatest/src/main/scala/org/scalatest/freespec")
+    ) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir,
+      asyncs("scalatest/src/main/scala/org/scalatest/flatspec")
+    ) ++
     copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
       List(

project/scalatest.scala

@@ -797,6 +797,8 @@ object ScalatestBuild {
         "org.scalatest.funsuite",
         "org.scalatest.featurespec",
         "org.scalatest.funspec",
+        "org.scalatest.freespec",
+        "org.scalatest.flatpec",
         "org.scalatest.matchers",
         "org.scalatest.path",
         "org.scalatest.prop",
@@ -903,6 +905,8 @@ object ScalatestBuild {
         "org.scalatest.funsuite",
         "org.scalatest.featurespec",
         "org.scalatest.funspec",
+        "org.scalatest.freespec",
+        "org.scalatest.flatspec",
         "org.scalatest.matchers",
         "org.scalatest.path",
         "org.scalatest.prop",
@@ -995,6 +999,8 @@ object ScalatestBuild {
       "org.scalatest.funsuite",
       "org.scalatest.featurespec",
       "org.scalatest.funspec",
+      "org.scalatest.freespec",
+      "org.scalatest.flatspec",
       "org.scalatest.matchers",
       "org.scalatest.path",
       "org.scalatest.prop",
@@ -1247,6 +1253,8 @@ object ScalatestBuild {
         "org.scalatest.funsuite",
         "org.scalatest.featurespec",
         "org.scalatest.funspec",
+        "org.scalatest.freespec",
+        "org.scalatest.flatspec",
         "org.scalatest.matchers",
         "org.scalatest.path",
         "org.scalatest.prop",
@@ -1317,6 +1325,8 @@ object ScalatestBuild {
         "org.scalatest.funsuite",
         "org.scalatest.featurespec",
         "org.scalatest.funspec",
+        "org.scalatest.freespec",
+        "org.scalatest.flatspec",
         "org.scalatest.matchers",
         "org.scalatest.path",
         "org.scalatest.prop",
@@ -1385,6 +1395,8 @@ object ScalatestBuild {
           "org.scalatest.funsuite",
           "org.scalatest.featurespec",
           "org.scalatest.funspec",
+          "org.scalatest.freespec",
+          "org.scalatest.flatspec",
           "org.scalatest.matchers",
           "org.scalatest.path",
           "org.scalatest.prop",