Skip to content

Commit e7341f5

Browse files
committed
Follow up on scala3doc rename
Fixes sbt#6307 Ref sbt/librarymanagement#365 Ref scala/scala3#11289 This adds test using M4 nightly, which now uses artifact name `scaladoc_3.0.0-M4` as oposed to `scala3doc_3.0.0-M3`. The change in LM keeps the support for the old artifact name for backward compatibility to build against 3.0.0-M1, -M2, and -M3.
1 parent e80df26 commit e7341f5

File tree

6 files changed

+25
-10
lines changed

6 files changed

+25
-10
lines changed

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object Dependencies {
1414
// sbt modules
1515
private val ioVersion = nightlyVersion.getOrElse("1.5.0-M1")
1616
private val lmVersion =
17-
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.5.0-M4")
17+
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.5.0-M5")
1818
val zincVersion = nightlyVersion.getOrElse("1.5.0-M3")
1919

2020
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
ThisBuild / scalaVersion := "3.0.0-M4-bin-20210212-0273336-NIGHTLY"
2+
// ThisBuild / scalaVersion := "3.0.0-M3",
3+
4+
lazy val root = (project in file("."))
5+
.settings(
6+
resolvers += Resolver.JCenterRepository
7+
)
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
> doc
2+
3+
# there shouldn't be two api/ directories
4+
# see https://github.com/lampepfl/dotty/issues/11412
5+
$ exists target/scala-3.0.0-M4/api/api/index.html
6+
$ exists target/scala-3.0.0-M4/api/api/foo/A$.html
7+
$ exists target/scala-3.0.0-M4/api/api/foo.html
8+
9+
> ++3.0.0-M3!
10+
> clean
11+
> doc
12+
13+
# there shouldn't be two api/ directories
14+
# see https://github.com/lampepfl/dotty/issues/11412
15+
$ exists target/scala-3.0.0-M3/api/index.html
16+
$ exists target/scala-3.0.0-M3/api/api/foo/A$.html
17+
$ exists target/scala-3.0.0-M3/api/api/foo.html

sbt/src/sbt-test/actions/scala3-doc/build.sbt

Lines changed: 0 additions & 5 deletions
This file was deleted.

sbt/src/sbt-test/actions/scala3-doc/test

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)