Skip to content

Commit f94494e

Browse files
committed
Move example project to sbt-dotty tests
1 parent 4571518 commit f94494e

21 files changed

+15
-143
lines changed

.github/workflows/scala3doc.yaml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,4 @@ jobs:
4444
run: ./project/scripts/sbt scala3doc/generateScala3Documentation
4545

4646
- name: Generate documentation for example project using dotty-sbt
47-
run: |
48-
./project/scripts/sbt ";sbt-dotty/publishLocal;scala3/publishLocal;publishLocal"
49-
VERSION=$(./project/scripts/sbt "show sbt-dotty/version" | tail -1 | sed 's/\[info\] //')
50-
echo Using sbt-dotty version: $VERSION
51-
echo 'addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "'$VERSION'")' > scala3doc/example-project/project/dotty.sbt
52-
53-
SCALA_VERSION=$(./project/scripts/sbt "show scala3-compiler-bootstrapped/version" | tail -1 | sed 's/\[info\] //')
54-
echo Using scala version: $SCALA_VERSION
55-
echo 'scalaVersion := "'$SCALA_VERSION'"' > scala3doc/example-project/dotty.sbt
56-
57-
cd scala3doc/example-project
58-
sbt doc
47+
run: ./project/scripts/sbt "sbt-dotty/scripted sbt-dotty/scala3doc"

.vscode/settings.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
1+
// Place your settings in this file to overwrite default and user settings.
12
{
3+
"editor.tabSize": 2,
4+
"editor.insertSpaces": true,
5+
6+
"files.trimTrailingWhitespace": true,
7+
8+
"search.exclude": {
9+
"**/*.class": true,
10+
"**/*.hasTasty": true,
11+
"**/target/": true,
12+
"community-build/community-projects": true
13+
},
214
"files.watcherExclude": {
315
"**/target": true
416
}
5-
}
17+
}

sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,12 +356,12 @@ object DottyPlugin extends AutoPlugin {
356356
// Configuration for the doctool
357357
resolvers ++= (if(!useScala3doc.value) Nil else Seq(
358358
Resolver.jcenterRepo,
359-
Resolver.bintrayRepo("kotlin", "kotlin-dev"),
360359
Resolver.bintrayRepo("virtuslab", "dokka"),
361360
)),
362361
useScala3doc := false,
363362
scala3docOptions := Nil,
364363
Compile / doc / scalacOptions := {
364+
// We are passing scala3doc argument list as single argument to scala instance starting with magic prefix "--+DOC+"
365365
val s3dOpts = scala3docOptions.value.map("--+DOC+" + _)
366366
val s3cOpts = (Compile / doc / scalacOptions).value
367367
if (isDotty.value && useScala3doc.value) {

scala3doc/example-project/.gitignore

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

scala3doc/example-project/LICENSE

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

scala3doc/example-project/README.md

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

scala3doc/example-project/default.sbt

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

scala3doc/example-project/project/build.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)