Merge branch '3.1.x' of git://github.com/scalatest/scalatest into experiment-scala-native-0.3.8

Author: cheeseng

.travis.yml

@@ -2,17 +2,11 @@ language: scala
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.6
-#  - 2.13.0-M2
-addons:
-  apt:
-    packages:
-      - openjdk-6-jdk
+  - 2.12.8
+  - 2.13.0
 
 jdk:
-  - openjdk6
   - oraclejdk8
-  - oraclejdk9
 
 dist: trusty
 sudo: true
@@ -51,23 +45,6 @@ env:
     - MODE=examples
     - MODE=examplesJS
 
-matrix:
-  exclude:
-    - scala: "2.13.0-M2"
-      jdk: openjdk6
-    - scala: "2.13.0-M2"
-      jdk: oraclejdk9
-    - scala: "2.12.6"
-      jdk: openjdk6
-    - scala: "2.11.12"
-      jdk: oraclejdk8
-    - scala: "2.11.12"
-      jdk: oraclejdk9
-    - scala: "2.10.7"
-      jdk: oraclejdk8
-    - scala: "2.10.7"
-      jdk: oraclejdk9
-
 branches:
   only:
     - 3.0.x

README.md

@@ -13,7 +13,7 @@ Using ScalaTest
 
 ### Setup
 
-Please visit [Download and Setup](http://www.scalatest.org/download) for download and setup instructions.
+Please visit [Download and Setup](https://www.scala-sbt.org/1.x/docs/Setup.html) for download and setup instructions.
 
 ### Quick Start
 
@@ -27,14 +27,10 @@ Building ScalaTest
 
 The followings are needed for building ScalaTest:
 
-*   JDK 6, 7, 8 or 9
-*   [SBT 0.13.2](http://www.scala-sbt.org/0.13.2/docs/Getting-Started/Setup.html)
+*   JDK 8
+*   [SBT 1.2.8](https://www.scala-sbt.org/1.x/docs/Setup.html)
 
-for JDK 6 or 7, use the following options in your SBT launch file:
-
-    SBT_OPTS="-server -Xms512M -Xmx3000M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:NewRatio=8 -XX:MaxPermSize=512M"
-
-for JDK 8 or 9, use the following SBT options instead:
+use the following SBT options instead:
 
     SBT_OPTS="-server -Xms512M -Xmx3000M -Xss1M  -XX:+UseConcMarkSweepGC -XX:NewRatio=8"
 
@@ -90,7 +86,7 @@ $ sbt -Dscalatest.skip.jdk.check=true ++2.11.12 scalatestTestNative/test:compile
 $ sbt -Dscalatest.skip.jdk.check=true ++2.11.12 scalatestTestNative/test
 ```
 
-### Building Exmaples
+### Building Examples
 
 You can build examples project using this command: 
 
@@ -137,7 +133,7 @@ If you would like to export a particular private key into a separate GPG file, y
 
 With Sonatype credentials and GPG file in place, you can now publish to Sonatype.
 
-Before publishing any patch release, binary compatibility with previous version should be checked, using Java 6 (for Scala 2.10 and 2.11):
+Before publishing any patch release, binary compatibility with previous version should be checked:
 
     $ sbt ++2.11.12 scalactic/package scalactic/mimaReportBinaryIssues
     $ sbt ++2.11.12 scalatest/package scalatest/mimaReportBinaryIssues
@@ -149,34 +145,26 @@ Before publishing any patch release, binary compatibility with previous version
     $ sbt ++2.10.7 scalacticJS/package scalacticJS/mimaReportBinaryIssues
     $ sbt ++2.10.7 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
-and using Java 8 (for Scala 2.12 and 2.13): 
+    $ sbt ++2.12.8 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.12.8 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.12.8 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.12.8 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
-    $ sbt ++2.12.6 scalactic/package scalactic/mimaReportBinaryIssues
-    $ sbt ++2.12.6 scalatest/package scalatest/mimaReportBinaryIssues
-    $ sbt ++2.12.6 scalacticJS/package scalacticJS/mimaReportBinaryIssues
-    $ sbt ++2.12.6 scalatestJS/package scalatestJS/mimaReportBinaryIssues
+    $ sbt ++2.13.0 scalactic/package scalactic/mimaReportBinaryIssues
+    $ sbt ++2.13.0 scalatest/package scalatest/mimaReportBinaryIssues
+    $ sbt ++2.13.0 scalacticJS/package scalacticJS/mimaReportBinaryIssues
+    $ sbt ++2.13.0 scalatestJS/package scalatestJS/mimaReportBinaryIssues
 
-    $ sbt ++2.13.0-M5 scalactic/package scalactic/mimaReportBinaryIssues
-    $ sbt ++2.13.0-M5 scalatest/package scalatest/mimaReportBinaryIssues
-    $ sbt ++2.13.0-M5 scalacticJS/package scalacticJS/mimaReportBinaryIssues
-    $ sbt ++2.13.0-M5 scalatestJS/package scalatestJS/mimaReportBinaryIssues
+To publish scalactic, scalatest and scalatest-app use the following command:
 
-To publish scalactic, scalatest and scalatest-app (for Scala and Scala-js, version 2.11 and 2.10, and make sure you're on Java 6) to Sonatype, use the following command:
-
-    $ export SCALAJS_VERSION=0.6.25
-    $ sbt ++2.10.7 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned
+    $ export SCALAJS_VERSION=0.6.28
+    $ sbt ++2.10.7 clean publishSigned "project scalatestAppJS" clean publishSigned
     $ sbt ++2.11.12 clean publishSigned "project scalatestAppJS" clean publishSigned
+    $ sbt ++2.12.8 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned
+    $ sbt ++2.13.0 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned    
+    $ sbt ++2.11.12 "project scalatestAppNative" clean publishSigned
     $ export SCALAJS_VERSION=1.0.0-M3
     $ sbt ++2.11.12 "project scalatestAppJS" clean publishSigned
-  
-To publish scalactic, scalatest and scalatest-app (for Scala and Scala-js, version 2.12 and 2.13, and make sure you're on Java 8) to Sonatype, use the following command:
-
-    $ export SCALAJS_VERSION=0.6.25
-    $ sbt ++2.12.7 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned
-    $ sbt ++2.13.0-M5 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned
-    $ export SCALAJS_VERSION=1.0.0-M3
     $ sbt ++2.12.6 "project scalatestAppJS" clean publishSigned
-
-To publish scalactic, scalatest and scalatest-app (for Scala-native version 2.11, and make sure you're on Java 8) to Sonatype, use the following command: 
-
-  `$ sbt -Dscalatest.skip.jdk.check=true ++2.11.12 "project scalatestAppNative" clean publishSigned`
+    $ export SCALAJS_VERSION=1.0.0-M8
+    $ sbt ++2.13.0 "project scalatestAppJS" clean publishSigned

build.sbt

@@ -0,0 +1,49 @@
+lazy val commonTest = ScalatestBuild.commonTest
+lazy val commonTestJS = ScalatestBuild.commonTestJS
+lazy val commonTestNative = ScalatestBuild.commonTestNative
+lazy val commonTestDotty = ScalatestBuild.commonTestDotty
+lazy val scalacticMacro = ScalatestBuild.scalacticMacro
+lazy val scalacticMacroJS = ScalatestBuild.scalacticMacroJS
+lazy val scalacticMacroNative = ScalatestBuild.scalacticMacroNative
+lazy val scalactic = ScalatestBuild.scalactic
+lazy val scalacticJS = ScalatestBuild.scalacticJS
+lazy val scalacticNative = ScalatestBuild.scalacticNative
+lazy val scalacticDotty = ScalatestBuild.scalacticDotty
+lazy val scalacticTest = ScalatestBuild.scalacticTest
+lazy val scalacticTestJS = ScalatestBuild.scalacticTestJS
+lazy val scalacticTestNative = ScalatestBuild.scalacticTestNative
+lazy val scalacticTestDotty = ScalatestBuild.scalacticTestDotty
+lazy val scalatest = ScalatestBuild.scalatest
+lazy val scalatestTest = ScalatestBuild.scalatestTest
+lazy val scalatestJS = ScalatestBuild.scalatestJS
+lazy val scalatestNative = ScalatestBuild.scalatestNative
+lazy val scalatestDotty = ScalatestBuild.scalatestDotty
+lazy val scalatestTestJS = ScalatestBuild.scalatestTestJS
+lazy val scalatestTestNative = ScalatestBuild.scalatestTestNative
+lazy val scalatestTestDotty = ScalatestBuild.scalatestTestDotty
+lazy val scalatestApp = ScalatestBuild.scalatestApp
+lazy val scalatestAppJS = ScalatestBuild.scalatestAppJS
+lazy val scalatestAppNative = ScalatestBuild.scalatestAppNative
+lazy val genRegularTests1 = ScalatestBuild.genRegularTests1
+lazy val genRegularTests2 = ScalatestBuild.genRegularTests2
+lazy val genRegularTests3 = ScalatestBuild.genRegularTests3
+lazy val genRegularTests4 = ScalatestBuild.genRegularTests4
+lazy val genRegularTests5 = ScalatestBuild.genRegularTests5
+lazy val genMustMatchersTests1 = ScalatestBuild.genMustMatchersTests1
+lazy val genMustMatchersTests2 = ScalatestBuild.genMustMatchersTests2
+lazy val genMustMatchersTests3 = ScalatestBuild.genMustMatchersTests3
+lazy val genMustMatchersTests4 = ScalatestBuild.genMustMatchersTests4
+lazy val genGenTests = ScalatestBuild.genGenTests
+lazy val genTablesTests = ScalatestBuild.genTablesTests
+lazy val genInspectorsTests = ScalatestBuild.genInspectorsTests
+lazy val genInspectorsShorthandsTests1 = ScalatestBuild.genInspectorsShorthandsTests1
+lazy val genInspectorsShorthandsTests2 = ScalatestBuild.genInspectorsShorthandsTests2
+lazy val genTheyTests = ScalatestBuild.genTheyTests
+lazy val genContainTests1 = ScalatestBuild.genContainTests1
+lazy val genContainTests2 = ScalatestBuild.genContainTests2
+lazy val genSortedTests = ScalatestBuild.genSortedTests
+lazy val genLoneElementTests = ScalatestBuild.genLoneElementTests
+lazy val genEmptyTests = ScalatestBuild.genEmptyTests
+lazy val gentests = ScalatestBuild.gentests
+lazy val examples = ScalatestBuild.examples
+lazy val examplesJS = ScalatestBuild.examplesJS

common-test.dotty/src/main/scala/org/scalatest/LineNumberHelper.scala

@@ -0,0 +1,15 @@
+package org.scalatest
+
+import scala.quoted._
+import scala.tasty._
+
+private[scalatest] trait LineNumberHelper {
+  inline def thisLineNumber = ${ LineNumberMacro.thisLineNumberImpl }
+}
+
+object LineNumberMacro {
+  def thisLineNumberImpl(implicit qctx: QuoteContext): Expr[Int] = {
+    import qctx.tasty._
+    rootPosition.startLine.toExpr
+  }
+}