Merge pull request #46 from Atry/scalatest-3.1.0

Migrate to ScalaTest 3.1.0

Author: Atry

.gitignore

@@ -1,3 +1,5 @@
 target/
 local.sbt
 secret/
+.metals/
+.bloop/

.gitpod.yml

@@ -0,0 +1,5 @@
+image: igeolise/scalajs-test-runner:latest
+vscode:
+  extensions:
+    - [email protected]:wQBBM+lKILHBqOqlqW60xA==
+    - [email protected]:pVVu91DEAijx+sPKu8fgHA==

.scalafmt.conf

@@ -1,2 +1,2 @@
-version = "1.5.1"
+version = "2.2.2"
 maxColumn = 120

.travis.yml

@@ -29,7 +29,7 @@ before_deploy:
 
 deploy:
   - provider: script
-    script: sbt ++$TRAVIS_SCALA_VERSION "sonatypeOpen \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\"" publishSigned sonatypeRelease
+    script: sbt ++$TRAVIS_SCALA_VERSION "set every Seq(sonatypeSessionName := \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease
     skip_cleanup: true
     on:
       all_branches: true

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.4
+sbt.version=1.3.4

project/plugins.sbt

@@ -1,6 +1,6 @@
 addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
 
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
 

src/main/scala/com/thoughtworks/Example.scala

@@ -46,7 +46,7 @@ import scala.reflect.NameTransformer
   * Code blocks before any Scaladoc tag are shared by all test cases. For example:
   *
   * {{{
-  * import org.scalatest.FreeSpec
+  * import org.scalatest.freespec.AnyFreeSpec
   * }}}
   *
   * Then the name `FreeSpec` will be available for all test cases.
@@ -74,10 +74,10 @@ import scala.reflect.NameTransformer
   *          }}}
   * @example A code block under a Scaladoc tag is a test case.
   *
-  *          The test case is inside an [[org.scalatest.FreeSpec]]
+  *          The test case is inside an [[org.scalatest.freespec.AnyFreeSpec]]
   *
   *          {{{
-  *            this should be(a[FreeSpec])
+  *            this should be(an[AnyFreeSpec])
   *          }}}
   * @author 杨博 (Yang Bo) <[email protected]>
   * @see [[https://github.com/ThoughtWorksInc/sbt-example sbt-example on Github]]
@@ -262,16 +262,16 @@ object Example extends AutoPlugin {
     /** Super types of the generated unit test suite class for examples in Scaladoc.
       *
       * @example The default value of this [[exampleSuperTypes]] settings are
-      *          [[org.scalatest.FreeSpec]] and [[org.scalatest.Matchers]].
+      *          [[org.scalatest.freespec.AnyFreeSpec]] and [[org.scalatest.matchers.should.Matchers]].
       *
-      *          You may want to replace [[org.scalatest.FreeSpec]] to [[org.scalatest.AsyncFreeSpec]]
+      *          You may want to replace [[org.scalatest.freespec.AnyFreeSpec]] to [[org.scalatest.freespec.AsyncFreeSpec]]
       *          for asynchronous tests:
       *
       *          {{{
       *          import scala.meta._
       *          exampleSuperTypes := exampleSuperTypes.value.map {
-      *            case ctor"_root_.org.scalatest.FreeSpec" =>
-      *              ctor"_root_.org.scalatest.AsyncFreeSpec"
+      *            case ctor"_root_.org.scalatest.freespec.AnyFreeSpec" =>
+      *              ctor"_root_.org.scalatest.freespec.AsyncFreeSpec"
       *            case otherTrait =>
       *              otherTrait
       *          }
@@ -325,7 +325,7 @@ object Example extends AutoPlugin {
   import autoImport._
 
   override def globalSettings: Seq[Def.Setting[_]] = Seq(
-    exampleSuperTypes := List(ctor"_root_.org.scalatest.FreeSpec", ctor"_root_.org.scalatest.Matchers")
+    exampleSuperTypes := List(ctor"_root_.org.scalatest.freespec.AnyFreeSpec", ctor"_root_.org.scalatest.matchers.should.Matchers")
   )
 
   override def projectSettings: Seq[Def.Setting[_]] = Seq(