Merge pull request #129 from SethTisue/scala-3.0.0-M1

bye Dotty, hello Scala 3.0.0-M1

Author: SethTisue

.travis.yml

@@ -6,7 +6,7 @@ language: scala
 
 scala:
   - 2.13.3
-  - 0.27.0-RC1
+  - 3.0.0-M1
 
 env:
   - ADOPTOPENJDK=8

build.sbt

@@ -1,11 +1,6 @@
 Global / cancelable := true
 publish / skip := true // in root
 
-Global / scalacOptions ++= (
-  if (isDotty.value) Seq("-language:implicitConversions")  // TODO check again on 3.0.0-M1
-  else               Seq()
-)
-
 lazy val commonSettings: Seq[Setting[_]] =
   ScalaModulePlugin.scalaModuleSettings ++ Seq(
     Compile / compile / scalacOptions --= (if (isDotty.value) Seq("-Xlint")
@@ -32,21 +27,12 @@ lazy val junit = project.in(file("junit"))
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
     Test / fork := true,
     publish / skip := true,
-    // https://github.com/sbt/sbt/pull/5919 adds this to sbt itself,
-    // so we should revisit once sbt 1.4.1 is available
-    Test / unmanagedSourceDirectories += {
-      val major = CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((0 | 3, _)) => "3"
-        case _ => "2"
-      }
-      baseDirectory.value / "src" / "test" / s"scala-$major"
-    },
   ).dependsOn(testmacros, core)
 
 lazy val scalacheck = project.in(file("scalacheck"))
   .settings(commonSettings)
   .settings(
-    libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.15.0" withDottyCompat(scalaVersion.value),
+    libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.15.0",
     Test / fork := true,
     Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-workers", "1", "-minSize", "0", "-maxSize", "4000", "-minSuccessfulTests", "5"),
     publish / skip := true
@@ -55,15 +41,11 @@ lazy val scalacheck = project.in(file("scalacheck"))
 lazy val testmacros = project.in(file("testmacros"))
   .settings(commonSettings)
   .settings(
-    libraryDependencies += scalaOrganization.value % "scala-compiler" % scalaVersion.value,
+    libraryDependencies += (
+      if (isDotty.value)
+        scalaOrganization.value %% "scala3-compiler" % scalaVersion.value
+      else
+        scalaOrganization.value % "scala-compiler" % scalaVersion.value
+    ),
     publish / skip := true,
-    // https://github.com/sbt/sbt/pull/5919 adds this to sbt itself,
-    // so we should revisit once sbt 1.4.1 is available
-    Compile / unmanagedSourceDirectories += {
-      val major = CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((0 | 3, _)) => "3"
-        case _ => "2"
-      }
-      baseDirectory.value / "src" / "main" / s"scala-$major"
-    },
   )