Skip to content

Commit 3db70e6

Browse files
committed
Full bootstrap: Use Dotty as the reference compiler
The non-bootstrapped compiler is now compiled by Dotty 0.14.0-RC1 instead of Scala 2.12.8. The bootstrapped compiler is compiled using the non-bootstrapped compiler as before. For now, we still support compilation with Scala 2.12, this is achieved by having separate `src-2.x` and `src-3.x` directory for the library. To use Scala 2.12 as the reference compiler, run: ++2.12.8 in sbt, or change `referenceVersion` to "2.12.8" in Build.scala.
1 parent d39bca0 commit 3db70e6

File tree

33 files changed

+65
-31
lines changed

33 files changed

+65
-31
lines changed

.drone.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ pipeline:
5252
# sbt scripted tests are slow and only run on nightly or deployment
5353
event: [ tag, deployment ]
5454

55+
test_scala212:
56+
group: test
57+
image: lampepfl/dotty:2019-02-06
58+
commands:
59+
- cp -R . /tmp/5/ && cd /tmp/5/
60+
- ./project/scripts/sbt ";++2.12.8 ;compile ;test"
61+
5562
# DOCUMENTATION:
5663
documentation:
5764
image: lampepfl/dotty:2019-02-06

compiler/test/dotty/tools/TestSources.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ object TestSources {
6565
.map(_.toString)
6666
.toList
6767

68-
assert(sources.nonEmpty)
6968
sources
7069
}
7170
finally files.close()

compiler/test/dotty/tools/dotc/CompilationTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class CompilationTests extends ParallelTesting {
232232
Array("-Ycheck-reentrant", "-Yemit-tasty-in-class")
233233
)
234234

235-
val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-bootstrapped"))
235+
val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-3.x"), Paths.get("library/src-bootstrapped"))
236236
val librarySources = libraryDirs.flatMap(sources(_))
237237

238238
val lib =

0 commit comments

Comments
 (0)