Merge branch 'dotty-adjustments-190326' of https://github.com/cheeseng/scalatest into cheeseng-dotty-adjustments-190326

Author: bvenners

project/GenScalaTestDotty.scala

@@ -178,7 +178,9 @@ object GenScalaTestDotty {
   def genTest(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     copyFiles("scalatest-test/src/test/scala/org/scalatest", "org/scalatest", targetDir,
       List(
-        "AssertionsSpec.scala"
+        "AssertionsSpec.scala", 
+        "ShouldCompileSpec.scala", 
+        "ShouldNotCompileSpec.scala"
       )
     ) /*++
       copyDir("scalatest-test/src/test/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,

project/GenScalacticDotty.scala

@@ -149,13 +149,12 @@ object GenScalacticDotty {
   def genTest(targetDir: File, version: String, scalaVersion: String): Seq[File] =
     copyDir("scalactic-test/src/test/scala/org/scalactic", "org/scalactic", targetDir,
       List(
-        "AccumulationSpec.scala",  // ClassFormatError: Illegal field modifiers in class org/scalatest/prop/Tables: 0x9
         "CanEqualSpec.scala",  // NotImplementedError
-        "ChainSpec.scala",  // Hang the compiler
+        "ChainSpec.scala",  // Compilation error to be investigated further
         "DecidersSpec.scala",  // Compilation error to be investigated further
-        "DifferSpec.scala",  // macro expansion error: invalid prefix NoType
+        "DifferSpec.scala",  // Test failed when run to be investigate further.
         "DirectRequirementsSpec.scala",  // macro expansion error: invalid prefix NoType
-        "EverySpec.scala",  // This hangs dotty
+        "EverySpec.scala",  // Compilation error to be investigated further
         "FutureSugarSpec.scala",   // Implementation missing
         "NormalizationSpec.scala",  // Compilation error to be investigated further.
         "NormMethodsSpec.scala",  // Compilation error to be investigated further.

project/scalatest.scala

@@ -1036,7 +1036,7 @@ object ScalatestBuild {
       projectTitle := "ScalaTest Test",
       organization := "org.scalatest",
       libraryDependencies ++= scalatestLibraryDependencies,
-      libraryDependencies ++= scalatestTestLibraryDependencies(scalaVersion.value),
+      //libraryDependencies ++= scalatestTestLibraryDependencies(scalaVersion.value),
       testOptions in Test := scalatestTestOptions,
       logBuffered in Test := false,
       //fork in Test := true,

scalactic.dotty/src/main/scala/org/scalactic/source/Position.scala

@@ -71,7 +71,7 @@ object Position {
     import refl._
 
     val file = refl.rootPosition.sourceFile
-    val fileName: String = file.getFileName.toString
+    val fileName: String = file.jpath.getFileName.toString
     val filePath: String = if (showScalacticFillFilePathnames) file.toString else Resources.pleaseDefineScalacticFillFilePathnameEnvVar()
     val lineNo: Int = refl.rootPosition.startLine
     '{ Position(${fileName.toExpr}, ${filePath.toExpr}, ${lineNo.toExpr}) }