@@ -86,7 +86,7 @@ object DottyJSPlugin extends AutoPlugin {
86
86
object Build {
87
87
import ScaladocConfigs ._
88
88
89
- val referenceVersion = " 3.4.2-RC1 "
89
+ val referenceVersion = " 3.5.0-RC4 "
90
90
91
91
val baseVersion = " 3.6.0"
92
92
// Will be required by some automation later
@@ -617,7 +617,7 @@ object Build {
617
617
// Settings shared between scala3-compiler and scala3-compiler-bootstrapped
618
618
lazy val commonDottyCompilerSettings = Seq (
619
619
// Note: bench/profiles/projects.yml should be updated accordingly.
620
- Compile / scalacOptions ++= Seq (" -Yexplicit-nulls" ),
620
+ Compile / scalacOptions ++= Seq (" -Yexplicit-nulls" , " -Wsafe-init " ),
621
621
622
622
// Use source 3.3 to avoid fatal migration warnings on scalajs-ir
623
623
scalacOptions ++= Seq (" -source" , " 3.3" ),
@@ -894,8 +894,6 @@ object Build {
894
894
}
895
895
896
896
lazy val nonBootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq (
897
- // FIXME revert this to commonDottyCompilerSettings, when we bump reference version to 3.5.0
898
- scalacOptions += " -Ysafe-init" ,
899
897
// packageAll packages all and then returns a map with the abs location
900
898
packageAll := Def .taskDyn { // Use a dynamic task to avoid loops when loading the settings
901
899
Def .task {
@@ -923,8 +921,6 @@ object Build {
923
921
)
924
922
925
923
lazy val bootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq (
926
- // FIXME revert this to commonDottyCompilerSettings, when we bump reference version to 3.5.0
927
- scalacOptions += " -Wsafe-init" ,
928
924
javaOptions ++= {
929
925
val jars = packageAll.value
930
926
Seq (
@@ -1356,7 +1352,7 @@ object Build {
1356
1352
BuildInfoPlugin .buildInfoScopedSettings(Test ) ++
1357
1353
BuildInfoPlugin .buildInfoDefaultSettings
1358
1354
1359
- def presentationCompilerSettings ( implicit mode : Mode ) = {
1355
+ lazy val presentationCompilerSettings = {
1360
1356
val mtagsVersion = " 1.3.2"
1361
1357
Seq (
1362
1358
libraryDependencies ++= Seq (
@@ -1371,11 +1367,7 @@ object Build {
1371
1367
ivyConfigurations += SourceDeps .hide,
1372
1368
transitiveClassifiers := Seq (" sources" ),
1373
1369
scalacOptions ++= Seq (" -source" , " 3.3" ), // To avoid fatal migration warnings
1374
- // FIXME change this to just Seq("-Yexplicit-nulls, "-Wsafe-init") when reference is set to 3.5.0
1375
- Compile / scalacOptions ++= (mode match {
1376
- case Bootstrapped => Seq (" -Yexplicit-nulls" , " -Wsafe-init" )
1377
- case NonBootstrapped => Seq (" -Yexplicit-nulls" , " -Ysafe-init" )
1378
- }),
1370
+ Compile / scalacOptions ++= Seq (" -Yexplicit-nulls" , " -Wsafe-init" ),
1379
1371
Compile / sourceGenerators += Def .task {
1380
1372
val s = streams.value
1381
1373
val cacheDir = s.cacheDirectory
0 commit comments