luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7619 from eed3si9n/wip/doc-scala3 

Update Scala 3 doc test
This commit is contained in:
eugene yokota 2024-08-08 01:01:12 -04:00 committed by GitHub
parent d5a4382e68 7dafcd2df2
commit 2d3dacb46a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbt
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set +e set +e
declare builtin_sbt_version="1.10.0" declare builtin_sbt_version="1.10.1"
declare -a residual_args declare -a residual_args
declare -a java_args declare -a java_args
declare -a scalac_args declare -a scalac_args

0
sbt-app/src/sbt-test/actions/doc-scala3/m3/src/main/scala/foo/A.scala → sbt-app/src/sbt-test/actions/doc-scala3/a/src/main/scala/foo/A.scala
View File

10
sbt-app/src/sbt-test/actions/doc-scala3/build.sbt
View File

@ -1,11 +1,9 @@
lazy val m3 = (project in file("m3"))
.settings(
scalaVersion := "3.0.0-M3",
resolvers += Resolver.JCenterRepository
)
lazy val rc1 = (project in file("rc1")) lazy val rc1 = (project in file("rc1"))
.settings( .settings(
scalaVersion := "3.0.0-RC1" scalaVersion := "3.0.0-RC1"
) )
lazy val a = project
.settings(
scalaVersion := "3.4.2",
)

8
sbt-app/src/sbt-test/actions/doc-scala3/test
View File

@ -6,10 +6,10 @@ $ exists rc1/target/scala-3.0.0-RC1/api/api/index.html
$ exists rc1/target/scala-3.0.0-RC1/api/api/foo/A$.html $ exists rc1/target/scala-3.0.0-RC1/api/api/foo/A$.html
$ exists rc1/target/scala-3.0.0-RC1/api/api/foo.html $ exists rc1/target/scala-3.0.0-RC1/api/api/foo.html
> m3 / doc > a / doc
# there shouldn't be two api/ directories # there shouldn't be two api/ directories
# see https://github.com/lampepfl/dotty/issues/11412 # see https://github.com/lampepfl/dotty/issues/11412
$ exists m3/target/scala-3.0.0-M3/api/index.html $ exists a/target/scala-3.4.2/api/index.html
$ exists m3/target/scala-3.0.0-M3/api/api/foo/A$.html $ exists a/target/scala-3.4.2/api/foo/A$.html
$ exists m3/target/scala-3.0.0-M3/api/api/foo.html $ exists a/target/scala-3.4.2/api/foo.html