re-enable tests

Author: bishabosha

build.sbt

@@ -798,7 +798,7 @@ lazy val tastytest = configureAsSubproject(project)
   .settings(
     name := "scala-tastytest",
     description := "Scala TASTy Integration Testing Tool",
-    libraryDependencies ++= List(/*testInterfaceDep,*/ diffUtilsDep, DottySupport.dottyCompiler),
+    libraryDependencies ++= List(/*testInterfaceDep,*/ diffUtilsDep, TastySupport.dottyCompiler),
     pomDependencyExclusions ++= List((organization.value, "scala-repl-frontend"), (organization.value, "scala-compiler-doc")),
     fixPom(
       "/project/name" -> <name>Scala TASTyTest</name>,
@@ -807,17 +807,6 @@ lazy val tastytest = configureAsSubproject(project)
     )
   )
 
-// ??? TODO [tasty]: WTF is this?
-lazy val scalacheckLib = project.in(file("src") / "scalacheck")
-  .dependsOn(library)
-  .settings(commonSettings)
-  .settings(disableDocs)
-  .settings(skip in publish := true)
-  .settings(
-    name := "scalacheck-lib",
-    libraryDependencies += testInterfaceDep
-  )
-
 // An instrumented version of BoxesRunTime and ScalaRunTime for partest's "specialized" test category
 lazy val specLib = project.in(file("test") / "instrumented")
   .dependsOn(library, reflect, compiler)
@@ -1222,29 +1211,29 @@ lazy val root: Project = (project in file("."))
 
     testAll := {
       val results = ScriptCommands.sequence[(Result[Unit], String)](List(
+        SavedLogs.clearSavedLogs.result map (_ -> "clearSavedLogs"),
+        (testOnly in Test in junit).toTask(" -- +v").result map (_ -> "junit/test"),
+        (Keys.test in Test in scalacheck).result map (_ -> "scalacheck/test"),
+        partestDesc("run"),
+        partestDesc("pos neg jvm"),
+        partestDesc("res scalap specialized"),
+        partestDesc("instrumented presentation"),
+        partestDesc("--srcpath scaladoc"),
+        partestDesc("--srcpath macro-annot"),
         (Keys.test in Test in tasty).result map (_ -> "tasty/test"),
-        // SavedLogs.clearSavedLogs.result map (_ -> "clearSavedLogs"),
-        // (testOnly in Test in junit).toTask(" -- +v").result map (_ -> "junit/test"),
-        // (Keys.test in Test in scalacheck).result map (_ -> "scalacheck/test"),
-        // partestDesc("run"),
-        // partestDesc("pos neg jvm"),
-        // partestDesc("res scalap specialized"),
-        // partestDesc("instrumented presentation"),
-        // partestDesc("--srcpath scaladoc"),
-        // partestDesc("--srcpath macro-annot"),
-        // (Keys.test in Test in osgiTestFelix).result map (_ -> "osgiTestFelix/test"),
-        // (Keys.test in Test in osgiTestEclipse).result map (_ -> "osgiTestEclipse/test"),
-        // (mimaReportBinaryIssues in library).result map (_ -> "library/mimaReportBinaryIssues"),
-        // (mimaReportBinaryIssues in reflect).result map (_ -> "reflect/mimaReportBinaryIssues"),
-        // testJDeps.result map (_ -> "testJDeps"),
-        // testJarSize.result map (_ -> "testJarSize"),
-        // (compile in Compile in bench).map(_ => ()).result map (_ -> "bench/compile"),
-        // Def.task(()).dependsOn( // Run these in parallel:
-        //   doc in Compile in library,
-        //   doc in Compile in reflect,
-        //   doc in Compile in compiler,
-        //   doc in Compile in scalap
-        // ).result map (_ -> "doc")
+        (Keys.test in Test in osgiTestFelix).result map (_ -> "osgiTestFelix/test"),
+        (Keys.test in Test in osgiTestEclipse).result map (_ -> "osgiTestEclipse/test"),
+        (mimaReportBinaryIssues in library).result map (_ -> "library/mimaReportBinaryIssues"),
+        (mimaReportBinaryIssues in reflect).result map (_ -> "reflect/mimaReportBinaryIssues"),
+        testJDeps.result map (_ -> "testJDeps"),
+        testJarSize.result map (_ -> "testJarSize"),
+        (compile in Compile in bench).map(_ => ()).result map (_ -> "bench/compile"),
+        Def.task(()).dependsOn( // Run these in parallel:
+          doc in Compile in library,
+          doc in Compile in reflect,
+          doc in Compile in compiler,
+          doc in Compile in scalap
+        ).result map (_ -> "doc")
       )).value
       val log = streams.value.log
       val failed = results.collect { case (Inc(i), d) => (i, d) }

project/DottySupport.scala

@@ -8,16 +8,21 @@ import sbt.librarymanagement.{
   ivy, DependencyResolution, ScalaModuleInfo, UpdateConfiguration, UnresolvedWarningConfiguration
 }
 
+/**
+  * Settings to support validation of TastyUnpickler against the release of dotty with the matching TASTy version
+  */
+object TastySupport {
+  val supportedTASTyRelease = "0.23.0-RC1" // TASTy version 20
+  val dottyCompiler = "ch.epfl.lamp" % "dotty-compiler_0.23" % supportedTASTyRelease
+}
+
 /** Settings needed to compile with Dotty,
  *  Only active when sbt is started with `sbt -Dscala.build.compileWithDotty=true`
  *  This is currently only used to check that the standard library compiles with
  *  Dotty in .travis.yml.
  */
 object DottySupport {
   val dottyVersion = "0.23.0-RC1"
-  val currentDottyRelease = "0.23.0-RC1" // TASTy version 20
-  val dottyLibrary = "ch.epfl.lamp" % "dotty-library_0.23" % currentDottyRelease
-  val dottyCompiler = "ch.epfl.lamp" % "dotty-compiler_0.23" % currentDottyRelease
   val compileWithDotty: Boolean =
     Option(System.getProperty("scala.build.compileWithDotty")).map(_.toBoolean).getOrElse(false)
   lazy val commonSettings = Seq(