diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ee3e7edc9..225987832 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { // sbt modules private val ioVersion = nightlyVersion.getOrElse("1.5.0-M1") private val lmVersion = - sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.5.0-M4") + sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.5.0-M5") val zincVersion = nightlyVersion.getOrElse("1.5.0-M3") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion diff --git a/sbt/src/sbt-test/actions/doc-scala3/build.sbt b/sbt/src/sbt-test/actions/doc-scala3/build.sbt new file mode 100644 index 000000000..60e38b5ca --- /dev/null +++ b/sbt/src/sbt-test/actions/doc-scala3/build.sbt @@ -0,0 +1,7 @@ +ThisBuild / scalaVersion := "3.0.0-M4-bin-20210212-0273336-NIGHTLY" +// ThisBuild / scalaVersion := "3.0.0-M3", + +lazy val root = (project in file(".")) + .settings( + resolvers += Resolver.JCenterRepository + ) diff --git a/sbt/src/sbt-test/actions/scala3-doc/src/main/scala/foo/A.scala b/sbt/src/sbt-test/actions/doc-scala3/src/main/scala/foo/A.scala similarity index 100% rename from sbt/src/sbt-test/actions/scala3-doc/src/main/scala/foo/A.scala rename to sbt/src/sbt-test/actions/doc-scala3/src/main/scala/foo/A.scala diff --git a/sbt/src/sbt-test/actions/doc-scala3/test b/sbt/src/sbt-test/actions/doc-scala3/test new file mode 100644 index 000000000..20241bff4 --- /dev/null +++ b/sbt/src/sbt-test/actions/doc-scala3/test @@ -0,0 +1,17 @@ +> doc + +# there shouldn't be two api/ directories +# see https://github.com/lampepfl/dotty/issues/11412 +$ exists target/scala-3.0.0-M4/api/api/index.html +$ exists target/scala-3.0.0-M4/api/api/foo/A$.html +$ exists target/scala-3.0.0-M4/api/api/foo.html + +> ++3.0.0-M3! +> clean +> doc + +# there shouldn't be two api/ directories +# see https://github.com/lampepfl/dotty/issues/11412 +$ exists target/scala-3.0.0-M3/api/index.html +$ exists target/scala-3.0.0-M3/api/api/foo/A$.html +$ exists target/scala-3.0.0-M3/api/api/foo.html diff --git a/sbt/src/sbt-test/actions/scala3-doc/build.sbt b/sbt/src/sbt-test/actions/scala3-doc/build.sbt deleted file mode 100644 index 9718f87b7..000000000 --- a/sbt/src/sbt-test/actions/scala3-doc/build.sbt +++ /dev/null @@ -1,5 +0,0 @@ -lazy val root = (project in file(".")) - .settings( - scalaVersion := "3.0.0-M3", - resolvers += Resolver.JCenterRepository - ) diff --git a/sbt/src/sbt-test/actions/scala3-doc/test b/sbt/src/sbt-test/actions/scala3-doc/test deleted file mode 100644 index a6edd4dc0..000000000 --- a/sbt/src/sbt-test/actions/scala3-doc/test +++ /dev/null @@ -1,4 +0,0 @@ -> doc -$ exists target/scala-3.0.0-M3/api/index.html -$ exists target/scala-3.0.0-M3/api/api/foo/A$.html -$ exists target/scala-3.0.0-M3/api/api/foo.html \ No newline at end of file